2 files changed, 36 insertions, 32 deletions

diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index a5aad218..453f6ca0 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -2,7 +2,7 @@ export default class Experiment {
     _id: string = '';
     uploaderId: string = '';
     constructor(
-        public name: string = 'Novi experiment',
+        public name: string = 'Novi eksperiment',
         public description: string = '',
         public datasetId: string = '',
         public inputColumns: string[] = [],
@@ -10,7 +10,16 @@ export default class Experiment {
         public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
         public nullValuesReplacers: NullValReplacer[] = [],
         public dateCreated: Date = new Date(),
-        public lastUpdated: Date = new Date()
+        public lastUpdated: Date = new Date(),
+        public modelIds: string[] = [],
+
+        // 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
+
+        //TODO - za svaku kolonu se bira enkoding
+        public encoding: Encoding = Encoding.Label
     ) { }
 }
 
@@ -32,4 +41,28 @@ export class NullValReplacer {
     "column": string;
     "option": NullValueOptions;
     "value": string;
+}
+
+export enum Encoding {
+    Label = 'label',
+    OneHot = 'onehot',
+    Ordinal = 'ordinal',
+    Hashing = 'hashing',
+    Binary = 'binary',
+    BaseN = 'baseN'
+    /*
+    BackwardDifference = 'backward difference',
+    CatBoost = 'cat boost',
+    Count = 'count',
+    GLMM = 'glmm',
+    Target = 'target',
+    Helmert = 'helmert',
+    JamesStein = 'james stein',
+    LeaveOneOut = 'leave one out',
+    MEstimate = 'MEstimate',
+    Sum = 'sum',
+    Polynomial = 'polynomial',
+    WOE = 'woe',
+    Quantile = 'quantile'
+    */
 }
\ No newline at end of file
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 9ea437b1..8a85e296 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -7,16 +7,10 @@ export default class Model {
         public description: string = '',
         public dateCreated: Date = new Date(),
         public lastUpdated: Date = new Date(),
-        public experimentId: string = '',
-
-        // 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 experimentId: string = '',
 
         // Neural net training settings
         public type: ProblemType = ProblemType.Regression,
-        public encoding: Encoding = Encoding.Label,
         public optimizer: Optimizer = Optimizer.Adam,
         public lossFunction: LossFunction = LossFunction.MeanSquaredError,
         public inputNeurons: number = 1,
@@ -39,29 +33,6 @@ export enum ProblemType {
 
 // replaceMissing srednja vrednost mean, median, najcesca vrednost (mode)
 // removeOutliers
-export enum Encoding {
-    Label = 'label',
-    OneHot = 'onehot',
-    Ordinal = 'ordinal',
-    Hashing = 'hashing',
-    Binary = 'binary',
-    BaseN = 'baseN'
-    /*
-    BackwardDifference = 'backward difference',
-    CatBoost = 'cat boost',
-    Count = 'count',
-    GLMM = 'glmm',
-    Target = 'target',
-    Helmert = 'helmert',
-    JamesStein = 'james stein',
-    LeaveOneOut = 'leave one out',
-    MEstimate = 'MEstimate',
-    Sum = 'sum',
-    Polynomial = 'polynomial',
-    WOE = 'woe',
-    Quantile = 'quantile'
-    */
-}
 
 export enum ActivationFunction {
     // linear