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

1 files changed, 68 insertions, 4 deletions

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 3cb47d61..01e8ade9 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -1,6 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Observable, of } from 'rxjs';
 import Model from 'src/app/_data/Model';
 import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer } from 'src/app/_data/Model';
+import { DatasetLoadComponent } from 'src/app/_elements/dataset-load/dataset-load.component';
+import { ModelsService } from 'src/app/_services/models.service';
+
 
 @Component({
   selector: 'app-add-model',
@@ -9,7 +13,10 @@ import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer } from '
 })
 export class AddModelComponent implements OnInit {
 
-  newModel: Model
+  @ViewChild(DatasetLoadComponent) datasetLoadComponent?: DatasetLoadComponent;
+  datasetLoaded: boolean = false;
+
+  newModel: Model;
 
   ANNType = ANNType;
   Encoding = Encoding;
@@ -18,7 +25,7 @@ export class AddModelComponent implements OnInit {
   Optimizer = Optimizer;
   Object = Object;
 
-  constructor() {
+  constructor(private models: ModelsService) {
     this.newModel = new Model();
   }
 
@@ -26,7 +33,64 @@ export class AddModelComponent implements OnInit {
   }
 
   addModel() {
-    //TODO
+    this.saveModel(false); //trajno cuvanje
+  }
+  trainModel() {
+    this.saveModel(true).subscribe((modelId : any) => {
+      if (modelId)
+        this.models.trainModel(modelId);
+    }); //privremeno cuvanje modela => vraca id sacuvanog modela koji cemo da treniramo sad
+  }
+  saveModel(temporary: boolean) : any {
+    if (this.datasetLoadComponent)
+      this.models.addDataset(this.datasetLoadComponent?.dataset).subscribe((response) => {//id dataseta je response
+        this.newModel.datasetId = response;
+
+        this.getCheckedInputCols();
+        this.getCheckedOutputCol();
+        if (this.validationInputsOutput()) 
+          return this.models.addModel(this.newModel); //id modela
+        return of(null);
+      });
+  }
+
+  getCheckedInputCols() {
+    this.newModel.inputColumns = [];
+    let checkboxes = document.getElementsByName("cbs");
+
+    for (let i = 0; i < checkboxes.length; i++) {
+      let thatCb = <HTMLInputElement>checkboxes[i];
+      if (thatCb.checked)
+        this.newModel.inputColumns.push(thatCb.value);
+    }
+    //console.log(this.checkedInputCols);
+  }
+  getCheckedOutputCol() {
+    this.newModel.columnToPredict = '';
+    let radiobuttons = document.getElementsByName("rbs");
+
+    for (let i = 0; i < radiobuttons.length; i++) {
+      let thatRb = <HTMLInputElement>radiobuttons[i];
+      if (thatRb.checked) {
+        this.newModel.columnToPredict = thatRb.value;
+        break; 
+      }
+    }
+    //console.log(this.checkedOutputCol);
+  }
+  validationInputsOutput() : boolean {
+    if (this.newModel.inputColumns.length == 0) {
+      alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.")
+      return false;
+    } 
+    for (let i = 0; i < this.newModel.inputColumns.length; i++) {  
+      if (this.newModel.inputColumns[i] == this.newModel.columnToPredict) {
+        let colName = this.newModel.columnToPredict;
+        alert("Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor.");
+        return false;
+      }
+    }
+    return true;
   }
 
 }