1 files changed, 55 insertions, 12 deletions

diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index 4499196c..01e4e564 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -1,13 +1,13 @@
 import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChildren } from '@angular/core';
-import Dataset from 'src/app/_data/Dataset';
+import Dataset, { ColumnType } from 'src/app/_data/Dataset';
 import Experiment, { ColumnEncoding, Encoding, NullValReplacer, NullValueOptions } from 'src/app/_data/Experiment';
 import { DatasetsService } from 'src/app/_services/datasets.service';
 import { EncodingDialogComponent } from 'src/app/_modals/encoding-dialog/encoding-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
 import { MissingvaluesDialogComponent } from 'src/app/_modals/missingvalues-dialog/missingvalues-dialog.component';
-import { MatSliderChange } from '@angular/material/slider';
 import { MatCheckboxChange } from '@angular/material/checkbox';
 import { CsvParseService } from 'src/app/_services/csv-parse.service';
+import { ProblemType } from 'src/app/_data/Model';
 
 @Component({
   selector: 'app-column-table',
@@ -20,22 +20,28 @@ export class ColumnTableComponent implements AfterViewInit {
   @Input() experiment?: Experiment;
   @ViewChildren("nullValMenu") nullValMenus!: ElementRef[];
   @Output() okPressed: EventEmitter<string> = new EventEmitter();
+  @Output() columnTableChanged = new EventEmitter();
+
   Object = Object;
   Encoding = Encoding;
   NullValueOptions = NullValueOptions;
+  ColumnType = ColumnType;
+  ProblemType = ProblemType;
   tableData?: any[][];
   nullValOption: string[] = [];
 
   columnsChecked: boolean[] = []; //niz svih kolona
 
-  testSetDistribution: number = 70;
+ 
   constructor(private datasetService: DatasetsService, public csvParseService: CsvParseService, public dialog: MatDialog) {
     //ovo mi nece trebati jer primam dataset iz druge komponente
   }
 
   ngAfterViewInit(): void {
     this.datasetService.getMyDatasets().subscribe((datasets) => {
-      this.dataset = datasets[0];
+      this.dataset = datasets[2];
+
+      this.setColumnTypeInitial();
       this.experiment = new Experiment();
       this.dataset.columnInfo.forEach(column => {
         this.columnsChecked.push(true);
@@ -44,8 +50,9 @@ export class ColumnTableComponent implements AfterViewInit {
       for (let i = 0; i < this.dataset?.columnInfo.length; i++) {
         this.experiment?.inputColumns.push(this.dataset.columnInfo[i].columnName);
       }
+      this.experiment.outputColumn = this.experiment.inputColumns[0];
       this.resetColumnEncodings(Encoding.Label);
-      this.setDeleteColumnsForMissingValTreatment();
+      this.setDeleteRowsForMissingValTreatment();
 
       this.nullValOption = [].constructor(this.dataset.columnInfo.length).fill('Obriši redove');
 
@@ -57,7 +64,15 @@ export class ColumnTableComponent implements AfterViewInit {
     });
   }
 
-  setDeleteColumnsForMissingValTreatment() {
+  setColumnTypeInitial() {
+    if (this.dataset != undefined) {
+      for (let i = 0; i < this.dataset.columnInfo.length; i++) {
+        this.dataset.columnInfo[i].columnType = (this.dataset.columnInfo[i].isNumber) ? ColumnType.numerical : ColumnType.categorical;
+      }
+    }
+  }
+
+  setDeleteRowsForMissingValTreatment() {
     if (this.experiment != undefined) {
       this.experiment.nullValues = NullValueOptions.DeleteRows;
       this.experiment.nullValuesReplacers = [];
@@ -71,8 +86,13 @@ export class ColumnTableComponent implements AfterViewInit {
     }
   }
 
+  columnTableChangeDetected() {
+    this.columnTableChanged.emit();
+  }
+
   changeInputColumns(targetMatCheckbox: MatCheckboxChange, columnName: string) {
     if (this.experiment != undefined) {
+
       if (targetMatCheckbox.checked) {
         if (this.experiment.inputColumns.filter(x => x == columnName)[0] == undefined) {
           this.experiment.inputColumns.push(columnName);
@@ -84,7 +104,26 @@ export class ColumnTableComponent implements AfterViewInit {
         //TODO: da se zatamni kolona koja je unchecked
         //this.experiment.encodings = this.experiment.encodings.filter(x => x.columnName != columnName); samo na kraju iz enkodinga skloni necekirane
         this.experiment.nullValuesReplacers = this.experiment.nullValuesReplacers.filter(x => x.column != columnName);
+        if (columnName == this.experiment.outputColumn)
+          this.experiment.outputColumn = this.experiment.inputColumns[0];
       }
+      this.columnTableChangeDetected();
+    }
+  }
+
+  changeOutputColumn() {
+    if (this.experiment != undefined && this.dataset != undefined) {
+      let column = this.dataset.columnInfo.filter(x => x.columnName == this.experiment!.outputColumn)[0];
+      if (column.columnType == ColumnType.numerical) {
+        this.experiment.type = ProblemType.Regression;
+      }
+      else {
+        if (column.uniqueValues!.length == 2)
+          this.experiment.type = ProblemType.BinaryClassification;
+        else 
+          this.experiment.type = ProblemType.MultiClassification;
+      }
+      this.columnTableChangeDetected();
     }
   }
 
@@ -95,6 +134,7 @@ export class ColumnTableComponent implements AfterViewInit {
         this.experiment.encodings.push(new ColumnEncoding(this.dataset?.columnInfo[i].columnName, encodingType));
         //console.log(this.experiment.encodings);
       }
+      this.columnTableChangeDetected();
     }
   }
   openEncodingDialog() {
@@ -131,9 +171,11 @@ export class ColumnTableComponent implements AfterViewInit {
             option: NullValueOptions.DeleteRows,
             value: ""
           });
-          this.nullValOption[i] = "Obriši redove";
+          let numOfRowsToDelete = (this.dataset.columnInfo.filter(x => x.columnName == this.experiment!.inputColumns[i])[0]).numNulls;
+          this.nullValOption[i] = "Obriši redove (" + numOfRowsToDelete  + ")";
         }
       }
+      this.columnTableChangeDetected();
     }
   }
   openMissingValuesDialog() {
@@ -145,13 +187,11 @@ export class ColumnTableComponent implements AfterViewInit {
         this.resetMissingValuesTreatment(selectedMissingValuesOption);
     });
   }
-  updateTestSet(event: MatSliderChange) {
-    this.testSetDistribution = event.value!;
-  }
+ 
 
 
   MissValsDeleteClicked(event: Event, replacementType: NullValueOptions, index: number) {
-    if (this.experiment != undefined) {
+    if (this.experiment != undefined && this.dataset != undefined) {
       let columnName = (<HTMLInputElement>event.currentTarget).value;
       let arrayElement = this.experiment.nullValuesReplacers.filter(x => x.column == columnName)[0];
 
@@ -167,7 +207,9 @@ export class ColumnTableComponent implements AfterViewInit {
         arrayElement.value = "";
       }
 
-      this.nullValOption[index] = (replacementType == NullValueOptions.DeleteColumns) ? "Obriši kolonu" : "Obriši redove";
+      let numOfRowsToDelete = (this.dataset.columnInfo.filter(x => x.columnName == this.experiment!.inputColumns[index])[0]).numNulls;
+      this.nullValOption[index] = (replacementType == NullValueOptions.DeleteColumns) ? "Obriši kolonu" : "Obriši redove (" + numOfRowsToDelete + ")";
+      this.columnTableChangeDetected();
     }
   }
 
@@ -189,6 +231,7 @@ export class ColumnTableComponent implements AfterViewInit {
       }
 
       this.nullValOption[index] = "Popuni sa: " + fillValue;
+      this.columnTableChangeDetected();
     }
   }
   getValue(columnName: string): string {