From cc3118ecac17539607f34ce3467347abc56f0240 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Thu, 7 Apr 2022 15:10:28 +0200 Subject: Tokom eksperimenta korisnik moze da izabere postojeci model ili da doda novi. Izmenjena model-load i experiment.component. Radi dodavanje dataseta i modela --- .../_elements/model-load/model-load.component.ts | 35 +++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) (limited to 'frontend/src/app/_elements/model-load/model-load.component.ts') diff --git a/frontend/src/app/_elements/model-load/model-load.component.ts b/frontend/src/app/_elements/model-load/model-load.component.ts index 1d38de68..6db40916 100644 --- a/frontend/src/app/_elements/model-load/model-load.component.ts +++ b/frontend/src/app/_elements/model-load/model-load.component.ts @@ -2,6 +2,9 @@ import { Component, OnInit } from '@angular/core'; import Shared from 'src/app/Shared'; import Model, { ActivationFunction, Encoding, LossFunction, LossFunctionBinaryClassification, LossFunctionMultiClassification, LossFunctionRegression, Metrics, MetricsBinaryClassification, MetricsMultiClassification, MetricsRegression, NullValueOptions, Optimizer, ProblemType } from 'src/app/_data/Model'; import { ModelsService } from 'src/app/_services/models.service'; +import { Output } from '@angular/core'; +import { EventEmitter } from '@angular/core'; + @Component({ selector: 'app-model-load', @@ -10,7 +13,11 @@ import { ModelsService } from 'src/app/_services/models.service'; }) export class ModelLoadComponent implements OnInit { + @Output() selectedModelChangeEvent = new EventEmitter(); + newModel: Model = new Model(); + myModels?: Model[]; + selectedModel?: Model; ProblemType = ProblemType; Encoding = Encoding; @@ -28,7 +35,13 @@ export class ModelLoadComponent implements OnInit { tempTestSetDistribution = 90; lossFunction: any = LossFunction; - constructor(private models: ModelsService) { } + showMyModels: boolean = true; + + constructor(private modelsService: ModelsService) { + this.modelsService.getMyModels().subscribe((models) => { + this.myModels = models; + }); + } ngOnInit(): void { } @@ -44,17 +57,18 @@ export class ModelLoadComponent implements OnInit { } } - addModel() { + uploadModel() { //console.log(this.selectedModel); this.getMetrics(); this.newModel.randomTestSetDistribution = 1 - Math.round(this.tempTestSetDistribution / 100 * 10) / 10; this.newModel.username = Shared.username; - this.models.addModel(this.newModel).subscribe((response) => { + this.modelsService.addModel(this.newModel).subscribe((response) => { Shared.openDialog('Model dodat', 'Model je uspešno dodat u bazu.'); // treba da se selektuje nov model u listi modela + //this.selectedModel = }, (error) => { - Shared.openDialog('Greška', 'Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.'); + Shared.openDialog('Greška', 'Model sa unetim nazivom već postoji u Vašoj kolekciji. Promenite naziv modela i nastavite sa kreiranim datasetom.'); }); } @@ -76,4 +90,17 @@ export class ModelLoadComponent implements OnInit { break; } } + + viewMyModelsForm() { + this.showMyModels = true; + } + viewNewModelForm() { + this.showMyModels = false; + } + + selectThisModel(model: Model) { + this.selectedModel = model; + this.selectedModelChangeEvent.emit(this.selectedModel); + } + } -- cgit v1.2.3