From f21885e7cbb68ef444ff9efc27483e2036e26bb0 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Tue, 19 Apr 2022 19:51:54 +0200
Subject: Pravljenje modela: automatski selektovan tip problema kog je i taj
 eskperiment, zmenjen batch size. Izbaceni neki resetovi u experiment.comp.
 Backend: u klasu Experiment dodat properti type.

---
 frontend/src/app/training/training.component.html | 18 ++++++++----------
 frontend/src/app/training/training.component.ts   | 13 +++++++++----
 2 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'frontend/src/app/training')

diff --git a/frontend/src/app/training/training.component.html b/frontend/src/app/training/training.component.html
index 672e75fb..2bee3b12 100644
--- a/frontend/src/app/training/training.component.html
+++ b/frontend/src/app/training/training.component.html
@@ -9,29 +9,27 @@
 
             <h2>1. Izaberite eksperiment iz kolekcije</h2>
             <div class="px-5 mt-5 mb-3">
-                <input type="text" class="form-control" placeholder="Pretraga"
-                    [(ngModel)]="term">
+                <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
             </div>
             <div class="overflow-auto px-5" style="max-height: 500px;">
                 <ul class="list-group">
-                    <li class="list-group-item p-3" *ngFor="let experiment of myExperiments|filter:term"
-                        [ngClass]="{'selectedExperimentClass': this.selectedExperiment == experiment}">
-                        <app-item-experiment [experiment]="experiment"
-                            (click)="selectThisExperiment(experiment);"></app-item-experiment>
+                    <li class="list-group-item p-3" *ngFor="let experiment of myExperiments|filter:term" [ngClass]="{'selectedExperimentClass': this.selectedExperiment == experiment}">
+                        <app-item-experiment [experiment]="experiment" (click)="selectThisExperiment(experiment);"></app-item-experiment>
                     </li>
                 </ul>
             </div>
-    
+
             <h2 class="mt-5 mb-2">2. Izaberite model</h2>
-            <app-model-load (selectedModelChangeEvent)="selectModel($event)" [forExperiment]="selectedExperiment"></app-model-load>
-    
+            <app-model-load *ngIf="selectedExperiment" (selectedModelChangeEvent)="selectModel($event)" [forExperiment]="selectedExperiment"></app-model-load>
+            <h3 *ngIf="!selectedExperiment">Morate prvo izabrati eksperiment.</h3>
+
             <h2 class="my-5">3. Treniranje modela</h2>
 
             <div class="d-flex flex-row justify-content-center align-items-center my-3">
                 <button class="btn btn-lg col-4" style="background-color:#003459; color:white;" (click)="trainModel();">Treniraj
                     model</button>
             </div>
-    
+
             <h2 class="mt-5">Rezultati treniranja</h2>
             <div class="m-3" *ngIf="trainingResult">
                 <h2 class="my-2">Rezultati treniranja:</h2>
diff --git a/frontend/src/app/training/training.component.ts b/frontend/src/app/training/training.component.ts
index 2640b513..c82a6b79 100644
--- a/frontend/src/app/training/training.component.ts
+++ b/frontend/src/app/training/training.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import Shared from '../Shared';
 import Experiment from '../_data/Experiment';
-import Model from '../_data/Model';
+import Model, { ProblemType } from '../_data/Model';
+import { ModelLoadComponent } from '../_elements/model-load/model-load.component';
 import { ExperimentsService } from '../_services/experiments.service';
 import { ModelsService } from '../_services/models.service';
 
@@ -13,6 +14,8 @@ import { ModelsService } from '../_services/models.service';
 })
 export class TrainingComponent implements OnInit{
 
+  @ViewChild(ModelLoadComponent) modelLoadComponent?: ModelLoadComponent;
+
   myExperiments?: Experiment[];
   selectedExperiment?: Experiment;
   selectedModel?: Model;
@@ -30,14 +33,16 @@ export class TrainingComponent implements OnInit{
 
       this.experimentsService.getMyExperiments().subscribe((experiments) => {
         this.myExperiments = experiments;
-        if (experimentId != undefined) 
-          this.selectedExperiment = this.myExperiments.filter(x => x._id == experimentId)[0];
+
+        this.selectedExperiment = this.myExperiments.filter(x => x._id == experimentId)[0];
+        console.log("selektovan exp u training comp: ", this.selectedExperiment);
       });
     });
   }
 
   selectThisExperiment(experiment: Experiment) {
     this.selectedExperiment = experiment;
+    this.modelLoadComponent!.newModel.type = this.selectedExperiment.type;
   }
 
   selectModel(model: Model) {
-- 
cgit v1.2.3