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

# Conflicts:
#	frontend/package-lock.json
#	frontend/src/app/_elements/folder/folder.component.ts
#	frontend/src/app/_elements/form-model/form-model.component.html

1 files changed, 7 insertions, 7 deletions

diff --git a/frontend/src/app/_elements/form-model/form-model.component.ts b/frontend/src/app/_elements/form-model/form-model.component.ts
index d5c497aa..ef456547 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.ts
+++ b/frontend/src/app/_elements/form-model/form-model.component.ts
@@ -13,13 +13,12 @@ import { MatSliderChange } from '@angular/material/slider';
 })
 export class FormModelComponent implements AfterViewInit {
   @ViewChild(GraphComponent) graph!: GraphComponent;
-  @Input() forExperiment?: Experiment;
+  @Input() forExperiment!: Experiment;
   @Output() selectedModelChangeEvent = new EventEmitter<Model>();
   testSetDistribution: number = 70;
   constructor() { }
 
-  ngAfterViewInit(): void {
-  }
+  ngAfterViewInit(): void { }
 
   selectFormControl = new FormControl('', Validators.required);
   nameFormControl = new FormControl('', [Validators.required, Validators.email]);
@@ -34,8 +33,7 @@ export class FormModelComponent implements AfterViewInit {
   selectRegularisationFormControl = new FormControl('', Validators.required);
   selectRRateFormControl = new FormControl('', Validators.required);
 
-  newModel: Model = new Model();
-  myModels?: Model[];
+  newModel!: Model;
 
   selectedModel?: Model;
 
@@ -57,7 +55,9 @@ export class FormModelComponent implements AfterViewInit {
   selectedMetrics = [];
   lossFunction: any = LossFunction;
 
-  showMyModels: boolean = true;
+  loadModel(model: Model) {
+    this.newModel = model;
+  }
 
   updateGraph() {
     //console.log(this.newModel.layers);
@@ -121,7 +121,6 @@ export class FormModelComponent implements AfterViewInit {
     }
   }
   changeAllRegularisationRate() {
-
     for (let i = 0; i < this.newModel.layers.length; i++) {
       this.newModel.layers[i].regularisationRate = this.selectedRegularisationRate;
     }
@@ -132,6 +131,7 @@ export class FormModelComponent implements AfterViewInit {
       this.updateGraph();
     }
   }
+
   updateTestSet(event: MatSliderChange) {
     this.testSetDistribution = event.value!;
   }