Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

2 files changed, 8 insertions, 7 deletions

diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 7ae5c4ab..9efb9f9b 100644
--- a/frontend/src/app/_data/Dataset.ts
+++ b/frontend/src/app/_data/Dataset.ts
@@ -18,7 +18,7 @@ export default class Dataset extends FolderFile {
         public rowCount: number = 0,
         public nullRows: number = 0,
         public nullCols: number = 0,
-        public preview: string[][] = [[]]
+        public cMatrix: string[][] = [[]]
     ) {
         super(name, dateCreated, lastUpdated);
     }
@@ -39,13 +39,13 @@ export class ColumnInfo {
         public max?: number,
         public q1?: number,
         public q3?: number,
-    ) { 
+    ) {
         /*if (isNumber)
             this.columnType = ColumnType.numerical;
         else 
             this.columnType = ColumnType.categorical;*/
     }
-        
+
 }
 
 export enum ColumnType {
diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index 9ad57fc3..05336495 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -16,10 +16,12 @@ export default class Experiment {
         public lastUpdated: Date = new Date(),
         public modelIds: string[] = [],
 
-        
+
 
         public encodings: ColumnEncoding[] = []//[{columnName: "", columnEncoding: Encoding.Label}]
     ) { }
+
+    _columnsSelected: boolean = false;
 }
 
 export enum NullValueOptions {
@@ -67,9 +69,8 @@ export enum Encoding {
 }
 
 export class ColumnEncoding {
-    constructor (
+    constructor(
         public columnName: string,
         public encoding: Encoding
-    ) 
-    {}
+    ) { }
 }
\ No newline at end of file