diff options
Diffstat (limited to 'frontend/src/app/_pages')
| -rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.html | 5 | ||||
| -rw-r--r-- | frontend/src/app/_pages/experiment/experiment.component.ts | 27 |
2 files changed, 11 insertions, 21 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 4c882f42..6bd921fd 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -67,8 +67,9 @@ <button mat-raised-button *ngIf="comparing" (click)="toggleCompare()"><mat-icon>not_interested</mat-icon> Prekini upoređivanje</button> </div> <div class="side-by-side"> - <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="trainModel();" (selectedFileChanged)="setModel($event);"></app-folder> - <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)="trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;" *ngIf="comparing"></app-folder> + <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModel();" (selectedFileChanged)="setModel($event);"></app-folder> + <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;" + *ngIf="comparing"></app-folder> </div> </div> </div> diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index d2904c65..20a3afb0 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -75,10 +75,7 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrain._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); - this.step3 = true; - setTimeout(() => { - this.goToPage(3); - }); + this.step4 = true; } } @@ -87,10 +84,7 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrainCmp._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); - this.step3 = true; - setTimeout(() => { - this.goToPage(3); - }); + this.step4 = true; } } @@ -198,7 +192,6 @@ export class ExperimentComponent implements AfterViewInit { this.folderDataset.forExperiment = this.experiment; this.folderDataset.selectFile(this.dataset); this.goToPage(1); - //this.step3 = false; }); }); } @@ -274,17 +267,13 @@ export class ExperimentComponent implements AfterViewInit { }); } - setDataset(dataset: FolderFile | null | undefined) { - if (dataset == null || dataset == undefined) { + setDataset(dataset: FolderFile | null) { + if (dataset == null) { this.columnTable.loaded = false; - /*this.dataset = undefined; - this.experiment.datasetId = '';*/ - this.step1 = false; - console.log("Desava se"); + this.dataset = undefined; + this.experiment.datasetId = ''; return; } - - this.experiment = new Experiment(); const d = <Dataset>dataset; this.experiment.datasetId = d._id; this.dataset = d; @@ -302,12 +291,12 @@ export class ExperimentComponent implements AfterViewInit { setModel(model: FolderFile) { const m = <Model>model; this.modelToTrain = m; - //this.step3 = true; + this.step3 = true; } setModelCmp(model: FolderFile) { const m = <Model>model; this.modelToTrainCmp = m; - //this.step3 = true; + this.step3 = true; } } |