From 681f851a6b3663285f32bc380b48a8e80c6e7ade Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Tue, 12 Apr 2022 20:52:09 +0200
Subject: "Napravi eskperiment" stranica podesena da radi. Biranje/dodavanje
 dataseta -> preprocesiranje -> cuvanje eskperimenta

---
 frontend/src/app/experiment/experiment.component.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'frontend/src/app/experiment/experiment.component.ts')

diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index 7ccca528..74ee9ee7 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import Experiment, { NullValReplacer, NullValueOptions, ReplaceWith } from '../_data/Experiment';
+import Experiment, { NullValReplacer, NullValueOptions, ReplaceWith, Encoding } from '../_data/Experiment';
 import Model from '../_data/Model';
 import Dataset, { ColumnInfo } from '../_data/Dataset';
 import { ModelsService } from '../_services/models.service';
@@ -20,12 +20,15 @@ export class ExperimentComponent implements OnInit {
 
   NullValueOptions = NullValueOptions;
   ReplaceWith = ReplaceWith;
+  Encoding = Encoding;
   Object = Object;
 
   selectedColumnsInfoArray: ColumnInfo[] = [];
-  selectedOutputColumnVal: string = '';
+  //selectedOutputColumnVal: string = '';
   selectedNullColumnsArray: string[] = [];
 
+  tempTestSetDistribution = 90;
+
   constructor(private modelsService: ModelsService, private experimentsService: ExperimentsService) { }
 
   ngOnInit(): void {
@@ -179,10 +182,13 @@ export class ExperimentComponent implements OnInit {
     for (let i = 0; i < pom.length; i++)
       this.experiment.inputColumns.push(pom[i].columnName);
 
-    this.selectedColumnsInfoArray = this.selectedColumnsInfoArray.filter(x => x.numNulls > 0);
-    //TREBAJU MI NULLVALUESREPLACERI  
+    //this.experiment.outputColumn = this.selectedOutputColumnVal;
+
+    this.selectedColumnsInfoArray = this.selectedColumnsInfoArray.filter(x => x.numNulls > 0); //obavezno
     this.experiment.nullValuesReplacers = this.getNullValuesReplacersArray();
 
+    this.experiment.randomTestSetDistribution = 1 - Math.round(this.tempTestSetDistribution / 100 * 10) / 10;
+
     console.log("Eksperiment:", this.experiment);
     
     this.experimentsService.addExperiment(this.experiment).subscribe((response) => {
@@ -193,7 +199,9 @@ export class ExperimentComponent implements OnInit {
 
       Shared.openDialog("Obaveštenje", "Eksperiment je uspešno kreiran.");
     }, (error) => {
-
+      if (error.error == "Experiment with this name exists") {
+        Shared.openDialog("Greška", "Eksperiment sa unetim nazivom već postoji u Vašoj kolekciji. Unesite neki drugi naziv.");
+      }
     });
   }
 
-- 
cgit v1.2.3