1 files changed, 9 insertions, 29 deletions

diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index 64adce3f..2d0f6ec5 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -6,9 +6,6 @@ import { ModelsService } from '../_services/models.service';
 import Shared from '../Shared';
 import { ExperimentsService } from '../_services/experiments.service';
 import { ColumnEncoding } from '../_data/Experiment';
-import { Router } from '@angular/router';
-import { TrainingComponent } from '../training/training.component';
-import { NEVER, retryWhen } from 'rxjs';
 
 @Component({
   selector: 'app-experiment',
@@ -32,9 +29,8 @@ export class ExperimentComponent implements OnInit {
   selectedNotNullColumnsArray: string[] = [];
 
   tempTestSetDistribution = 90;
-  carouselIndex: number = 0;
 
-  constructor(private experimentsService: ExperimentsService, private router: Router) {
+  constructor(private modelsService: ModelsService, private experimentsService: ExperimentsService) {
   }
 
   ngOnInit(): void {
@@ -47,6 +43,7 @@ export class ExperimentComponent implements OnInit {
     this.experiment.outputColumn = this.selectedDataset.columnInfo[this.selectedDataset.columnInfo.length - 1].columnName;
 
     this.resetColumnEncodings();
+    console.log(this.experiment.encodings);
   }
 
   resetColumnEncodings() {
@@ -169,7 +166,7 @@ export class ExperimentComponent implements OnInit {
   }
 
   saveExperiment() {
-      if (this.selectedDataset == undefined) {
+    if (this.selectedDataset == undefined) {
       Shared.openDialog("Greška", "Izvor podataka nije izabran!");
       return;
     }
@@ -195,14 +192,16 @@ export class ExperimentComponent implements OnInit {
 
     this.experiment.randomTestSetDistribution = 1 - Math.round(this.tempTestSetDistribution / 100 * 10) / 10;
 
-    //console.log("Eksperiment:", this.experiment);
+    console.log("Eksperiment:", this.experiment);
 
     this.experimentsService.addExperiment(this.experiment).subscribe((response) => {
       this.experiment = response;
 
-      Shared.openYesNoDialog("Obaveštenje", "Eksperiment je uspešno kreiran. Da li želite da pređete na treniranje modela?", () => {
-        this.router.navigate(['/training', this.experiment._id]);
-      });
+      this.selectedColumnsInfoArray = []; 
+      this.selectedNotNullColumnsArray = [];
+      this.experiment.encodings = [];
+
+      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.");
@@ -220,23 +219,4 @@ export class ExperimentComponent implements OnInit {
     }
     return counter;
   }
-
-  updateCarouselIndex(newIndex: number) {
-    if (newIndex > 2)
-      newIndex = 2;
-    else if (newIndex < 0)
-      newIndex = 0; 
-
-    if (this.carouselIndex == 0 && (newIndex == 1 || newIndex == 2))
-      this.checkRequiredData();
-    this.carouselIndex = newIndex;
-  }
-
-  checkRequiredData() {
-      if (this.selectedDataset == undefined) {
-        (<HTMLAnchorElement>document.getElementById("firstStep")).click();
-        Shared.openDialog("Pažnja", "Potrebno je da dodate ili izabere izvor podataka kako biste prešli na naredni korak (preprocesiranje).");
-        return;
-      }
-  }
 }