From 07b11e07fc62d9ea9765595812ab68209be99a3a Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 18 Apr 2022 00:20:08 +0200
Subject: Omogucen izbor enkodiranja za svaku kolonu. Izmenjena klasa
 Experiment da sadrzi niz parova naziv kolone - enkoding. Ispravljen bag kod
 menjanja dugmica "izaberi" i "dodaj dataset".

---
 frontend/src/app/_data/Experiment.ts               |  11 +-
 .../dataset-load/dataset-load.component.ts         |   6 +-
 .../src/app/experiment/experiment.component.html   | 297 ++++++++++-----------
 .../src/app/experiment/experiment.component.ts     |  17 +-
 4 files changed, 168 insertions(+), 163 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index 453f6ca0..23fd77d4 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -18,8 +18,7 @@ export default class Experiment {
         public randomTestSet: boolean = true,
         public randomTestSetDistribution: number = 0.1, //0.1-0.9 (10% - 90%) JESTE OVDE ZAKUCANO 10, AL POSLATO JE KAO 0.1 BACK-U
 
-        //TODO - za svaku kolonu se bira enkoding
-        public encoding: Encoding = Encoding.Label
+        public encodings: ColumnEncoding[] = []//[{columnName: "", columnEncoding: Encoding.Label}]
     ) { }
 }
 
@@ -65,4 +64,12 @@ export enum Encoding {
     WOE = 'woe',
     Quantile = 'quantile'
     */
+}
+
+export class ColumnEncoding {
+    constructor (
+        public columnName: string,
+        public encoding: Encoding
+    ) 
+    {}
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
index 62cca456..73dbf2d2 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -41,12 +41,14 @@ export class DatasetLoadComponent implements OnInit {
 
   viewMyDatasetsForm() {
     this.showMyDatasets = true;
-    this.resetSelectedDataset();
+    if (this.selectedDataset != undefined)
+      this.resetSelectedDataset();
     //this.resetCbsAndRbs();        //TREBA DA SE DESI
   }
   viewNewDatasetForm() {
     this.showMyDatasets = false;
-    this.resetSelectedDataset();
+    if (this.selectedDataset != undefined)
+      this.resetSelectedDataset();
     //this.resetCbsAndRbs();        //TREBA DA SE DESI
   }
 
diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html
index e46f5bd9..5b3b2c43 100644
--- a/frontend/src/app/experiment/experiment.component.html
+++ b/frontend/src/app/experiment/experiment.component.html
@@ -13,150 +13,131 @@
         </div>
 
         <div id="carouselExampleControls" class="carousel slide px-5 mt-5" data-bs-wrap="false" data-bs-ride="carousel" data-bs-interval="false">
-        <div class="carousel-inner">
-            <div class="carousel-item active mt-2">
-                <h2 class="mb-5">1. Izvor podataka</h2>
-                <app-dataset-load (selectedDatasetChangeEvent)="updateDataset($event)"></app-dataset-load>
-            </div>
+            <div class="carousel-inner">
+                <div class="carousel-item active mt-2">
+                    <h2 class="mb-5">1. Izvor podataka</h2>
+                    <app-dataset-load (selectedDatasetChangeEvent)="updateDataset($event)"></app-dataset-load>
+                </div>
 
-            <div class="carousel-item mt-2">
-                <h2 class="mb-4">2. Preprocesiranje</h2>
+                <div class="carousel-item mt-2">
+                    <h2 class="mb-4">2. Preprocesiranje</h2>
 
-                <div class="px-5">
-                    <h3>Biranje ulaznih i izlaznih kolona:</h3>
-                    <div *ngIf="selectedDataset">
-                        <div class="row">
-                            <div class="col d-flex justify-content-center">
-                                <h3>Izaberite ulazne kolone:</h3>
-                                <div id="divInputs" class="form-check mt-2">
-                                    <br>
-                                    <div *ngFor="let item of selectedDataset.columnInfo; let i = index">
-                                        <input class="form-check-input" type="checkbox" value="{{item.columnName}}"
-                                            id="cb_{{item.columnName}}" name="cbsNew"
-                                            [checked]="experiment.outputColumn != item.columnName"
-                                            [disabled]="experiment.outputColumn == item.columnName"
-                                            (click)="checkedColumnsChanged(item, 0)">&nbsp;
-                                        <label class="form-check-label" for="cb_{{item.columnName}}">
+                    <div class="px-5">
+                        <h3>Biranje ulaznih i izlaznih kolona:</h3>
+                        <div *ngIf="selectedDataset">
+                            <div class="row">
+                                <div class="col d-flex justify-content-center">
+                                    <h3>Izaberite ulazne kolone:</h3>
+                                    <div id="divInputs" class="form-check mt-2">
+                                        <br>
+                                        <div *ngFor="let item of selectedDataset.columnInfo; let i = index">
+                                            <input class="form-check-input" type="checkbox" value="{{item.columnName}}" id="cb_{{item.columnName}}" name="cbsNew" [checked]="experiment.outputColumn != item.columnName" [disabled]="experiment.outputColumn == item.columnName" (change)="resetColumnEncodings()"
+                                                (click)="checkedColumnsChanged(item, 0)">&nbsp;
+                                            <label class="form-check-label" for="cb_{{item.columnName}}">
                                             {{item.columnName}}
                                         </label>
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
-                            <div class="col d-flex justify-content-left">
-                                <h3>Izaberite izlaznu kolonu:</h3>
-                                <div id="divOutputs" class="form-check mt-2">
-                                    <br>
-                                    <div *ngFor="let item of selectedDataset.columnInfo; let i = index">
-                                        <input class="form-check-input" type="radio" value="{{item.columnName}}"
-                                            id="rb_{{item.columnName}}" name="rbsNew"
-                                            [(ngModel)]="this.experiment.outputColumn"
-                                            (change)="experiment.outputColumn = item.columnName"
-                                            (click)="checkedColumnsChanged(item, 1);">&nbsp;
-                                        <label class="form-check-label" for="rb_{{item.columnName}}">
+                                <div class="col d-flex justify-content-left">
+                                    <h3>Izaberite izlaznu kolonu:</h3>
+                                    <div id="divOutputs" class="form-check mt-2">
+                                        <br>
+                                        <div *ngFor="let item of selectedDataset.columnInfo; let i = index">
+                                            <input class="form-check-input" type="radio" value="{{item.columnName}}" id="rb_{{item.columnName}}" name="rbsNew" [(ngModel)]="this.experiment.outputColumn" (change)="experiment.outputColumn = item.columnName; resetColumnEncodings();" (click)="checkedColumnsChanged(item, 1);">&nbsp;
+                                            <label class="form-check-label" for="rb_{{item.columnName}}">
                                             {{item.columnName}}
                                         </label>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    
-                    <h3 class="mt-5">Popunjavanje nedostajućih vrednosti:</h3>
-                    <div class="form-check" *ngIf="selectedDataset">
-                        <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteRows"
-                            class="form-check-input" value="deleteRows" name="fillMissing" id="delRows" checked
-                            data-bs-toggle="collapse" data-bs-target="#fillMissingCustom.show">
-                        <label for="delRows" class="form-check-label">Obriši sve
+
+                        <h3 class="mt-5">Popunjavanje nedostajućih vrednosti:</h3>
+                        <div class="form-check" *ngIf="selectedDataset">
+                            <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteRows" class="form-check-input" value="deleteRows" name="fillMissing" id="delRows" checked data-bs-toggle="collapse" data-bs-target="#fillMissingCustom.show">
+                            <label for="delRows" class="form-check-label">Obriši sve
                             redove sa nedostajućim vrednostima ({{selectedDataset.nullRows}} od {{selectedDataset.rowCount}})</label><br>
-                        <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteColumns"
-                            class="form-check-input" value="deleteCols" name="fillMissing" id="delCols" data-bs-toggle="collapse"
-                            data-bs-target="#fillMissingCustom.show">
-                        <label for="delCols" class="form-check-label">Obriši sve
+                            <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteColumns" class="form-check-input" value="deleteCols" name="fillMissing" id="delCols" data-bs-toggle="collapse" data-bs-target="#fillMissingCustom.show">
+                            <label for="delCols" class="form-check-label">Obriši sve
                             kolone sa nedostajućim vrednostima ({{countSelectedNullCols()}} od {{selectedDataset.columnInfo.length}})</label><br>
-                        <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.Replace"
-                            class="form-check-input" name="fillMissing" id="replace" data-bs-toggle="collapse"
-                            data-bs-target="#fillMissingCustom:not(.show)">
-                        <label for="replace" class="form-check-label">Izabraću
+                            <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.Replace" class="form-check-input" name="fillMissing" id="replace" data-bs-toggle="collapse" data-bs-target="#fillMissingCustom:not(.show)">
+                            <label for="replace" class="form-check-label">Izabraću
                             vrednosti koje će da zamene nedostajuće vrednosti za svaku kolonu...</label><br><br>
-                        <div class="collapse" id="fillMissingCustom">
-                            <div>
-                                <label for="columnReplacers" class="form-label">Unesite zamenu za svaku kolonu:</label>
-                                <div class="my-3" *ngIf="getSelectedColumnsArrayWithoutNullVals().length > 0" >
-                                    <label class="text-center form-control mx-3 text-secondary">
+                            <div class="collapse" id="fillMissingCustom">
+                                <div>
+                                    <label for="columnReplacers" class="form-label">Unesite zamenu za svaku kolonu:</label>
+                                    <div class="my-3" *ngIf="getSelectedColumnsArrayWithoutNullVals().length > 0">
+                                        <label class="text-center form-control mx-3 text-secondary">
                                         Kolone <span style="font-style: italic;" *ngFor="let colname of getSelectedColumnsArrayWithoutNullVals(); let i = index">
                                             <span *ngIf="i != getSelectedColumnsArrayWithoutNullVals().length - 1">{{colname}}, </span> 
                                             <span *ngIf="i == getSelectedColumnsArrayWithoutNullVals().length - 1">{{colname}} </span> 
                                         </span>
                                         nemaju nedostajućih vrednosti za popunjavanje.
                                     </label>
-                                </div>
-                                <div id="columnReplacers">
-                                    <div *ngFor="let column of selectedColumnsInfoArray; let i = index" class="my-3">
-                                        <div *ngIf="column.numNulls > 0">
-                                            <span class="w-20 mx-3">
+                                    </div>
+                                    <div id="columnReplacers">
+                                        <div *ngFor="let column of selectedColumnsInfoArray; let i = index" class="my-3">
+                                            <div *ngIf="column.numNulls > 0">
+                                                <span class="w-20 mx-3">
                                                 {{column.columnName}}&nbsp;<span class="small" style="color:gray;">({{column.numNulls}} null)
                                                 </span>
-                                            </span>
-    
-                                            <label *ngIf="column.numNulls <= 0"
-                                                class="text-center form-control mx-3 text-secondary">
+                                                </span>
+
+                                                <label *ngIf="column.numNulls <= 0" class="text-center form-control mx-3 text-secondary">
                                                 Ova kolona nema
                                                 nedostajućih
                                                 vrednosti.
                                             </label>
-    
-                                            <div *ngIf="column.numNulls > 0" class="d-flex flex-row justify-content-end">
-                                                <div class="flex-grow-3 mx-3 me-auto">
-                                                    <div class="input-group">
-                                                        <div class="input-group-prepend">
-                                                            <label [for]="'fillCol_'+column.columnName" class="form-control">
+
+                                                <div *ngIf="column.numNulls > 0" class="d-flex flex-row justify-content-end">
+                                                    <div class="flex-grow-3 mx-3 me-auto">
+                                                        <div class="input-group">
+                                                            <div class="input-group-prepend">
+                                                                <label [for]="'fillCol_'+column.columnName" class="form-control">
                                                                 Zameni
                                                                 <input type="radio" [id]="'fillCol_'+column.columnName"
                                                                     [name]="'delOp_'+column.columnName">
                                                             </label>
-                                                        </div>
-                                                        <input type="text" class="form-control" [id]="'fillText_'+column.columnName"
-                                                            (keyup)="checkFillColRadio(column.columnName)"
-                                                            placeholder="Unesi vrednost...">
-    
-                                                        <div class="input-group-append">
-                                                            <select [id]="'replaceOptions'+i" class="form-control btn-primary"
-                                                                *ngIf="column.isNumber" (change)="replace($event, column); checkFillColRadio(column.columnName);">
+                                                            </div>
+                                                            <input type="text" class="form-control" [id]="'fillText_'+column.columnName" (keyup)="checkFillColRadio(column.columnName)" placeholder="Unesi vrednost...">
+
+                                                            <div class="input-group-append">
+                                                                <select [id]="'replaceOptions'+i" class="form-control btn-primary" *ngIf="column.isNumber" (change)="replace($event, column); checkFillColRadio(column.columnName);">
                                                                 <option
                                                                     *ngFor="let option of Object.keys(ReplaceWith); let optionName of Object.values(ReplaceWith)"
                                                                     [value]="option">
                                                                     {{ optionName }}
                                                                 </option>
                                                             </select>
-                                                            <select [id]="'replaceOptions'+i"
-                                                                class="form-control btn-outline-primary"
-                                                                *ngIf="!column.isNumber && column.numNulls > 0"
-                                                                (change)="replace($event, column); checkFillColRadio(column.columnName);">
+                                                                <select [id]="'replaceOptions'+i" class="form-control btn-outline-primary" *ngIf="!column.isNumber && column.numNulls > 0" (change)="replace($event, column); checkFillColRadio(column.columnName);">
                                                                 <option *ngFor="let option of column.uniqueValues" [value]="option">
                                                                     {{ option }}
                                                                 </option>
                                                             </select>
+                                                            </div>
                                                         </div>
                                                     </div>
-                                                </div>
-    
-                                                <div class="flex-shrink-1 mx-3">
-                                                    <div class="input-group">
-                                                        <label class="form-control" [for]="'delCol_'+column.columnName">Izbriši
+
+                                                    <div class="flex-shrink-1 mx-3">
+                                                        <div class="input-group">
+                                                            <label class="form-control" [for]="'delCol_'+column.columnName">Izbriši
                                                             kolonu
                                                             <input type="radio" [id]="'delCol_'+column.columnName"
                                                                 [name]="'delOp_'+column.columnName"
                                                                 (change)="emptyFillTextInput(column.columnName)"></label>
+                                                        </div>
                                                     </div>
-                                                </div>
-    
-                                                <div class="flex-shrink-1 mx-3">
-                                                    <div class="input-group">
-                                                        <label class="form-control" [for]="'delRows_'+column.columnName">Izbriši
+
+                                                    <div class="flex-shrink-1 mx-3">
+                                                        <div class="input-group">
+                                                            <label class="form-control" [for]="'delRows_'+column.columnName">Izbriši
                                                             redove
                                                             <input type="radio" [id]="'delRows_'+column.columnName"
                                                                 [name]="'delOp_'+column.columnName" checked
                                                                 (change)="emptyFillTextInput(column.columnName)"></label>
+                                                        </div>
                                                     </div>
                                                 </div>
                                             </div>
@@ -165,96 +146,98 @@
                                 </div>
                             </div>
                         </div>
-                    </div>
-    
-                    <div id="randomOptions" class="mt-5">
-                        <div class="p-2 m-2">
-                            <label for="type" class="form-check-label">Želite li da redosled podataka bude nasumičan?</label>
-                            <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="experiment.randomOrder"
-                            type="checkbox" value="" checked>
-                        </div>
-                        <div class="border m-3">
-                            <div class="row p-2 m-2">
-                                <div class="col-4">
-                                    <label for="splitYesNo" class="form-check-label">
+
+                        <div id="randomOptions" class="mt-5">
+                            <div class="p-2 m-2">
+                                <label for="type" class="form-check-label">Želite li da redosled podataka bude nasumičan?</label>
+                                <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="experiment.randomOrder" type="checkbox" value="" checked>
+                            </div>
+                            <div class="border m-3">
+                                <div class="row p-2 m-2">
+                                    <div class="col-4">
+                                        <label for="splitYesNo" class="form-check-label">
                                         <h3>Podela test skupa:&nbsp;&nbsp;
                                             <input id="splitYesNo" class="form-check-input" type="checkbox"
                                                 [checked]="experiment.randomTestSet"
                                                 (change)="experiment.randomTestSet = !experiment.randomTestSet">
                                         </h3>
                                     </label>
+                                    </div>
+                                    <div class="col-8">
+                                        trening
+                                        <mat-slider style="width: 85%;" min="10" max="90" step="10" value="10" name="randomTestSetDistribution" thumbLabel [disabled]="!experiment.randomTestSet" [(ngModel)]="tempTestSetDistribution">
+                                        </mat-slider>
+                                        test
+                                    </div>
                                 </div>
-                                <div class="col-8">
-                                    trening
-                                    <mat-slider style="width: 85%;" min="10" max="90" step="10" value="10"
-                                        name="randomTestSetDistribution" thumbLabel [disabled]="!experiment.randomTestSet"
-                                        [(ngModel)]="tempTestSetDistribution">
-                                    </mat-slider>
-                                    test
-                                </div>
-                            </div>
-            
-                            <div class="row p-2 m-2">
-                                <label for="percentage" class="form-label">Procenat podataka koji se uzima za trening
+
+                                <div class="row p-2 m-2">
+                                    <label for="percentage" class="form-label">Procenat podataka koji se uzima za trening
                                     skup:</label>
-                                <input id="percentage" type="number" class="form-control mx-3" style=" max-width: 15%" min="10" max="90" step="10" value="90"
-                                    [(ngModel)]="tempTestSetDistribution" [disabled]="!experiment.randomTestSet">
+                                    <input id="percentage" type="number" class="form-control mx-3" style=" max-width: 15%" min="10" max="90" step="10" value="90" [(ngModel)]="tempTestSetDistribution" [disabled]="!experiment.randomTestSet">
+                                </div>
                             </div>
                         </div>
-                    </div>
-    
-                    <div id="encodingForColumns" class="row px-3 my-5">
-                        <div class="col-1">
-                            <label for="encoding" class="col-form-label">Enkoding: </label>
-                        </div>
-                        <div class="col-2">
-                            <select id=encodingOptions class="form-control" name="encoding" [(ngModel)]="experiment.encoding">
-                                <option *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)"
-                                    [value]="option">
-                                    {{ optionName }}
-                                </option>
-                            </select>
+
+                        <div id="encodingsForColumns" class="px-3 my-5">
+                            <label for="encoding" class="col-form-label mb-2">Enkoding za izabrane kolone:</label>
+
+                            <div class="row d-flex flex-row justify-content-between align-items-center">
+                                <div class="col-5" *ngFor="let item of [].constructor(selectedColumnsInfoArray.length); let i = index">
+                                    <div class="input-group mb-2">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text">{{selectedColumnsInfoArray[i].columnName}}</span>
+                                        </div>
+                                        <select [id]="'encodingOption_'+i" class="form-control" [(ngModel)]="experiment.encodings[i].encoding">
+                                        <option
+                                            *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)"
+                                            [value]="option">
+                                            {{ optionName }}
+                                        </option>
+                                    </select>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
+
                     </div>
-    
-                </div>
 
 
-            </div>
+                </div>
 
-            <div class="carousel-item mt-2">
-                <h2 class="mb-4">3. Dodaj eskperiment</h2>
+                <div class="carousel-item mt-2">
+                    <h2 class="mb-4">3. Dodaj eskperiment</h2>
 
-                <div class="row">
-                    <div class="col"></div>
-                    <div class="col-8">
-                        <label for="name" class="col-form-label">Naziv eksperimenta:</label>
-                        <input type="text" class="form-control mb-3" name="name" placeholder="Naziv..." [(ngModel)]="experiment.name">
-        
-                        <label for="desc" class="col-sm-2 col-form-label">Opis:</label>
-                        <div>
-                            <textarea class="form-control" name="desc" rows="3" [(ngModel)]="experiment.description"></textarea>
-                        </div>
-                        <div class="form-group row mt-5 mb-3">
-                            <div class="col"></div>
-                            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;" (click)="saveExperiment();">Sačuvaj
+                    <div class="row">
+                        <div class="col"></div>
+                        <div class="col-8">
+                            <label for="name" class="col-form-label">Naziv eksperimenta:</label>
+                            <input type="text" class="form-control mb-3" name="name" placeholder="Naziv..." [(ngModel)]="experiment.name">
+
+                            <label for="desc" class="col-sm-2 col-form-label">Opis:</label>
+                            <div>
+                                <textarea class="form-control" name="desc" rows="3" [(ngModel)]="experiment.description"></textarea>
+                            </div>
+                            <div class="form-group row mt-5 mb-3">
+                                <div class="col"></div>
+                                <button class="btn btn-lg col-4" style="background-color:#003459; color:white;" (click)="saveExperiment();">Sačuvaj
                                 eksperiment</button>
-                            <div class="col"></div>
+                                <div class="col"></div>
+                            </div>
                         </div>
+                        <div class="col"></div>
                     </div>
-                    <div class="col"></div>
                 </div>
-            </div>
 
-        </div>
-        <div class="m-3 d-flex flex-row justify-content-between align-items-center" style=" margin-left: auto;">
-            <button mat-fab color="primary" data-bs-target="#carouselExampleControls" data-bs-slide="prev">
+            </div>
+            <div class="m-3 d-flex flex-row justify-content-between align-items-center" style=" margin-left: auto;">
+                <button mat-fab color="primary" data-bs-target="#carouselExampleControls" data-bs-slide="prev">
                 <mat-icon>arrow_backward</mat-icon>
             </button>
-            <button mat-fab color="primary" data-bs-target="#carouselExampleControls" data-bs-slide="next">
+                <button mat-fab color="primary" data-bs-target="#carouselExampleControls" data-bs-slide="next">
                 <mat-icon>arrow_forward</mat-icon>
             </button>
-        </div>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index b5e1d1f4..036db326 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -5,6 +5,7 @@ import Dataset, { ColumnInfo } from '../_data/Dataset';
 import { ModelsService } from '../_services/models.service';
 import Shared from '../Shared';
 import { ExperimentsService } from '../_services/experiments.service';
+import { ColumnEncoding } from '../_data/Experiment';
 
 @Component({
   selector: 'app-experiment',
@@ -21,6 +22,7 @@ export class ExperimentComponent implements OnInit {
   NullValueOptions = NullValueOptions;
   ReplaceWith = ReplaceWith;
   Encoding = Encoding;
+  ColumnEncoding = ColumnEncoding;
   Object = Object;
 
   selectedColumnsInfoArray: ColumnInfo[] = [];
@@ -38,6 +40,16 @@ export class ExperimentComponent implements OnInit {
     this.selectedDataset = dataset;
     this.selectedColumnsInfoArray = this.selectedDataset.columnInfo;
     this.selectedNotNullColumnsArray = [];
+
+    this.resetColumnEncodings();
+    console.log(this.experiment.encodings);
+  }
+
+  resetColumnEncodings() {
+    this.experiment.encodings = [];
+    for (let i = 0; i < this.selectedColumnsInfoArray.length; i++) {
+      this.experiment.encodings.push(new ColumnEncoding(this.selectedColumnsInfoArray[i].columnName, Encoding.Label));
+    }
   }
 
   getInputById(id: string): HTMLInputElement {
@@ -179,13 +191,14 @@ 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;
 
-      this.selectedColumnsInfoArray = [];
+      this.selectedColumnsInfoArray = []; 
       this.selectedNotNullColumnsArray = [];
+      this.experiment.encodings = [];
 
       Shared.openDialog("Obaveštenje", "Eksperiment je uspešno kreiran.");
     }, (error) => {
-- 
cgit v1.2.3