Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Guest-Koristik-Ispravka-FrontEnd

3 files changed, 18 insertions, 17 deletions

diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 7ae5c4ab..4ff0a471 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: number[][] = []
     ) {
         super(name, dateCreated, lastUpdated);
     }
@@ -27,7 +27,6 @@ export default class Dataset extends FolderFile {
 export class ColumnInfo {
     constructor(
         public columnName: string = '',
-        public columnType: ColumnType,
         public isNumber: boolean = false,
         public numNulls: number = 0,
         public uniqueValues?: string[],
@@ -39,16 +38,12 @@ 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 {
-    categorical = "Kategorijski",
-    numerical = "Numerički"
-}
\ No newline at end of file
diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index 31816c19..cff77535 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -14,11 +14,11 @@ export default class Experiment {
         public dateCreated: Date = new Date(),
         public lastUpdated: Date = new Date(),
         public modelIds: string[] = [],
-
-        
-
+        public columnTypes: ColumnType[] = [],
         public encodings: ColumnEncoding[] = []//[{columnName: "", columnEncoding: Encoding.Label}]
     ) { }
+
+    _columnsSelected: boolean = false;
 }
 
 export enum NullValueOptions {
@@ -44,11 +44,11 @@ export class NullValReplacer {
 export enum Encoding {
     Label = 'label',
     OneHot = 'onehot',
-    Ordinal = 'ordinal',
+    /*Ordinal = 'ordinal',
     Hashing = 'hashing',
     Binary = 'binary',
     BaseN = 'baseN'
-    /*
+    
     BackwardDifference = 'backward difference',
     CatBoost = 'cat boost',
     Count = 'count',
@@ -66,9 +66,13 @@ export enum Encoding {
 }
 
 export class ColumnEncoding {
-    constructor (
+    constructor(
         public columnName: string,
         public encoding: Encoding
-    ) 
-    {}
+    ) { }
+}
+
+export enum ColumnType {
+    categorical = "categorical",
+    numerical = "numerical"
 }
\ No newline at end of file
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 185e2257..526a8290 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -28,8 +28,10 @@ export default class Model extends FolderFile {
         // Test set settings
         public randomOrder: boolean = true,
         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
+        public randomTestSetDistribution: number = 0.1, //0.1-0.9 (10% - 90%) JESTE OVDE ZAKUCANO 10, AL POSLATO JE KAO 0.1 BACK-U
 
+        public isPublic: boolean = false,
+        public accessibleByLink: boolean = false
     ) {
         super(name, dateCreated, lastUpdated);
     }