2 files changed, 12 insertions, 12 deletions
diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 43895863..09ddffc6 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -64,15 +64,15 @@
                         </tr>
                     </thead>
                     <tbody>
-                        <tr *ngFor="let colInfo of dataset.columnInfo; let i = index">
+                        <tr *ngFor="let row of dataset.cMatrix; let i = index">
                             <th [ngClass]="{'header-disabled col-disabled' : !columnsChecked[i]}">
                                 <div class="text-left">
-                                    {{colInfo.columnName}}
+                                    {{dataset.columnInfo[i].columnName}}
                                 </div>
                             </th>
-                            <td *ngFor="let colInfo of dataset.columnInfo; let j = index" [ngClass]="{'text-disabled col-disabled' : !columnsChecked[j] || !columnsChecked[i]}">
+                            <td *ngFor="let corrVal of row; let j = index" [ngClass]="{'text-disabled col-disabled' : !columnsChecked[j] || !columnsChecked[i]}">
                                 <div class="text-overflow">
-                                    0.1
+                                    {{corrVal}}
                                 </div>
                             </td>
                         </tr>
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 7cac3b27..da451d55 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -36,7 +36,7 @@ export class ColumnTableComponent implements AfterViewInit {
   columnsChecked: boolean[] = []; //niz svih kolona
   loaded: boolean = false;
 
- 
+
   constructor(private datasetService: DatasetsService, private experimentService: ExperimentsService, public csvParseService: CsvParseService, public dialog: MatDialog) {
     //ovo mi nece trebati jer primam dataset iz druge komponente
   }
@@ -45,11 +45,11 @@ export class ColumnTableComponent implements AfterViewInit {
     this.dataset = dataset;
 
     this.setColumnTypeInitial();
-      
+
     this.dataset.columnInfo.forEach(column => {
       this.columnsChecked.push(true);
     });
-    
+
     this.resetInputColumns();
     this.resetOutputColumn();
     this.resetColumnEncodings(Encoding.Label);
@@ -69,7 +69,7 @@ export class ColumnTableComponent implements AfterViewInit {
   }
 
   ngAfterViewInit(): void {
-      
+
   }
 
   setColumnTypeInitial() {
@@ -113,7 +113,7 @@ export class ColumnTableComponent implements AfterViewInit {
   columnTypeChanged(columnName: string) {
     if (this.experiment.outputColumn == columnName)
       this.changeOutputColumn(columnName);
-    else 
+    else
       this.columnTableChangeDetected();
   }
 
@@ -147,7 +147,7 @@ export class ColumnTableComponent implements AfterViewInit {
       else {
         if (column.uniqueValues!.length == 2)
           this.experiment.type = ProblemType.BinaryClassification;
-        else 
+        else
           this.experiment.type = ProblemType.MultiClassification;
       }
       this.columnTableChangeDetected();
@@ -199,7 +199,7 @@ export class ColumnTableComponent implements AfterViewInit {
             value: ""
           });
           let numOfRowsToDelete = (this.dataset.columnInfo.filter(x => x.columnName == this.experiment!.inputColumns[i])[0]).numNulls;
-          this.nullValOption[i] = "Obriši redove (" + numOfRowsToDelete  + ")";
+          this.nullValOption[i] = "Obriši redove (" + numOfRowsToDelete + ")";
         }
       }
       this.columnTableChangeDetected();
@@ -228,7 +228,7 @@ export class ColumnTableComponent implements AfterViewInit {
       });
     });
   }
-  
+
   openUpdateExperimentDialog() {
     this.experimentService.updateExperiment(this.experiment).subscribe((response) => {
       Shared.openDialog("Izmena eksperimenta", "Uspešno ste izmenili podatke o eksperimentu.");