Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

2 files changed, 53 insertions, 60 deletions

diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index 9dde9afe..662d34de 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -40,7 +40,9 @@
                     Dodajte novi dataset
                 </button>
             </div>
-            <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+            <div class="px-5 my-2">
+                <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+            </div>
             <div class="px-5">
                 <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;">
                     <ul class="list-group">
@@ -71,7 +73,8 @@
                         <br>
                         <div *ngFor="let item of selectedDataset.header; let i = index">
                             <input class="form-check-input" type="checkbox" value="{{item}}" id="cb_{{item}}"
-                                name="cbsNew" [checked] = "this.selectedOutputColumnVal != item" [disabled]="this.selectedOutputColumnVal == item">&nbsp;
+                                name="cbsNew" [checked]="this.selectedOutputColumnVal != item"
+                                [disabled]="this.selectedOutputColumnVal == item">&nbsp;
                             <label class="form-check-label" for="cb_{{item}}">
                                 {{item}}
                             </label>
@@ -93,7 +96,7 @@
                 </div>
 
 
-                <div class="my-2" *ngIf="datasetFile">
+                <div class="mt-5" *ngIf="datasetFile">
                     <h2>Popunjavanje nedostajućih vrednosti:</h2>
                     <div class="form-check">
                         <input type="radio" [(ngModel)]="newModel.nullValues" [value]="NullValueOptions.DeleteRows"
@@ -163,7 +166,8 @@
                 </div>
                 <div class="col-2">
                     <select id=typeOptions class="form-control" name="type" [(ngModel)]="newModel.type">
-                        <option *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)"
+                        <option
+                            *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)"
                             [value]="option">
                             {{ optionName }}
                         </option>
@@ -176,7 +180,8 @@
                 </div>
                 <div class="col-1">
                     <input type="number" min="1" class="form-control" name="hiddenLayers"
-                        [(ngModel)]="newModel.hiddenLayers">
+                        [(ngModel)]="newModel.hiddenLayers"
+                        (change)="newModel.hiddenLayerActivationFunctions = [].constructor(newModel.hiddenLayers).fill(newModel.hiddenLayerActivationFunctions[0])">
                 </div>
             </div>
 
@@ -258,56 +263,36 @@
             </div>
 
             <div class="row p-2">
-                
-                 <!--   <div class="col-1">
-                </div>
+                <div class="col-3"></div>
                 <div class="col-3">
-                    <label for="inputLayerActivationFunction" class="col-form-label">Funkcija aktivacije ulaznog
-                        sloja:</label>
+                    <label for="hiddenLayerActivationFunction" class="col-form-label">Funkcija aktivacije skrivenih
+                        slojeva:</label>
                 </div>
-               
-                <div class="col-2">
-                    <select id=inputLayerActivationFunctionOptions class="form-control"
-                        name="inputLayerActivationFunction" [(ngModel)]="newModel.inputLayerActivationFunction">
-                        <option
-                            *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
-                            [value]="option">
-                            {{ optionName }}
-                        </option>
-                    </select>
+                <div class="col-3">
+                    <div *ngFor="let item of [].constructor(newModel.hiddenLayers); let i = index">
+                        <select [id]="'hiddenLayerActivationFunctionOption_'+i" class="form-control"
+                            [(ngModel)]="newModel.hiddenLayerActivationFunctions[i]">
+                            <option
+                                *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
+                                [value]="option">
+                                {{ optionName }}
+                            </option>
+                        </select>
+                    </div>
                 </div>
+                <div class="col-3"></div>
+            </div>
+
+            <div class="row p-2">
                 <div class="col-1">
                 </div>
-                 -->
-                
-                <div class="col-5">
+                <div class="col-3">
                     <label for="splitYesNo" class="form-check-label">Podela test skupa:&nbsp;&nbsp;
                         <input id="splitYesNo" class="form-check-input" type="checkbox"
                             [checked]="newModel.randomTestSet"
                             (change)="newModel.randomTestSet = !newModel.randomTestSet">
                     </label>
                 </div>
-                <div class="col">
-                </div>
-            </div>
-
-            <div class="row p-2">
-                <div class="col-1">
-                </div>
-                <div class="col-3">
-                    <label for="hiddenLayerActivationFunction" class="col-form-label">Funkcija aktivacije skrivenih
-                        slojeva:</label>
-                </div>
-                <div class="col-2">
-                    <select id=hiddenLayerActivationFunctionOptions class="form-control"
-                        name="hiddenLayerActivationFunction" [(ngModel)]="newModel.hiddenLayerActivationFunction">
-                        <option
-                            *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
-                            [value]="option">
-                            {{ optionName }}
-                        </option>
-                    </select>
-                </div>
                 <div class="col-1">
                 </div>
                 <div class="col-2">
@@ -357,7 +342,7 @@
             <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"
                 (click)="addModel();">Sačuvaj model</button>
             <div class="col"></div>
-            <button class="btn btn-lg col-4 disabled" style="background-color:#003459; color:white;"
+            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"
                 (click)="trainModel();">Treniraj model</button>
             <div class="col"></div>
         </div>
diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts
index 37672d0a..77a506d5 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -53,7 +53,7 @@ export class AddModelComponent implements OnInit {
   constructor(private models: ModelsService, private datasets: DatasetsService, private csv: CsvParseService) {
     this.newModel = new Model();
 
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }
@@ -76,19 +76,28 @@ export class AddModelComponent implements OnInit {
 
   addModel() {
     if (!this.showMyDatasets)
-      this.saveModelWithNewDataset();
+      this.saveModelWithNewDataset(_ => { console.log('MODEL ADDED (with new dataset).') });
     else
-      this.saveModelWithExistingDataset();
+      this.saveModelWithExistingDataset(_ => { console.log('MODEL ADDED (with existing dataset).') });
   }
 
   trainModel() {
-    this.saveModelWithNewDataset().subscribe((modelId: any) => {
-      if (modelId)
-        this.models.trainModel(modelId);
-    }); //privremeno cuvanje modela => vraca id sacuvanog modela koji cemo da treniramo sad
+    let saveFunc;
+
+    if (!this.showMyDatasets)
+      saveFunc = (x: (arg0: any) => void) => { this.saveModelWithNewDataset(x) };
+    else
+      saveFunc = (x: (arg0: any) => void) => { this.saveModelWithExistingDataset(x) };
+
+    saveFunc(((model: any) => {
+      console.log('Saved, training model...', model);
+      this.models.trainModel(model).subscribe(response => {
+        console.log('Train model complete!', response);
+      });
+    })); //privremeno cuvanje modela => vraca id sacuvanog modela koji cemo da treniramo sad
   }
 
-  saveModelWithNewDataset(): any {
+  saveModelWithNewDataset(callback: ((arg0: any) => void)) {
 
     this.getCheckedInputCols();
     this.getCheckedOutputCol();
@@ -103,7 +112,7 @@ export class AddModelComponent implements OnInit {
             this.datasetLoadComponent.dataset.fileId = file._id;
             this.datasetLoadComponent.dataset.username = shared.username;
 
-            this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
+            this.datasets.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
               console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id);
               this.newModel.datasetId = dataset._id;
 
@@ -117,7 +126,7 @@ export class AddModelComponent implements OnInit {
               this.newModel.username = shared.username;
 
               this.models.addModel(this.newModel).subscribe((response) => {
-                console.log('ADD MODEL: DONE! REPLY:\n', response);
+                callback(response);
               }, (error) => {
                 alert("Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.");
               }); //kraj addModel subscribe
@@ -133,8 +142,7 @@ export class AddModelComponent implements OnInit {
     } //kraj prvog ifa
   }
 
-  saveModelWithExistingDataset(): any {
-
+  saveModelWithExistingDataset(callback: ((arg0: any) => void)): any {
     if (this.selectedDataset) { //dataset je izabran
       this.getCheckedInputCols();
       this.getCheckedOutputCol();
@@ -147,7 +155,7 @@ export class AddModelComponent implements OnInit {
         this.newModel.username = shared.username;
 
         this.models.addModel(this.newModel).subscribe((response) => {
-          console.log('ADD MODEL: DONE! REPLY:\n', response);
+          callback(response);
         }, (error) => {
           alert("Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.");
         });
@@ -226,7 +234,7 @@ export class AddModelComponent implements OnInit {
         for (let i = this.datasetFile.length - 1; i >= 0; i--) {  //moguce da je vise redova na kraju fajla prazno i sl.
           if (this.datasetFile[i].length != this.datasetFile[0].length)
             this.datasetFile[i].pop();
-          else 
+          else
             break; //nema potrebe dalje
         }
         console.log(this.datasetFile);
@@ -279,7 +287,7 @@ export class AddModelComponent implements OnInit {
   }
 
   refreshMyDatasetList() {
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }