1 files changed, 70 insertions, 10 deletions

diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 216e1c36..f6e01d08 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -1,15 +1,18 @@
 export default class Model {
+    _id: string = '';
     constructor(
         public name: string = 'Novi model',
         public description: string = '',
         public dateCreated: Date = new Date(),
-        public datasetId?: number,
+        public lastUpdated: Date = new Date(),
+        public datasetId: string = '',
 
-        //Test set settings
-        public inputColumns: number[] = [0],
-        public columnToPredict: number = 1,
+        // Test set settings
+        public inputColumns: string[] = [],
+        public columnToPredict: string = '',
+        public randomOrder: boolean = true,
         public randomTestSet: boolean = true,
-        public randomTestSetDistribution: number = 0.10, //0.1-0.9 (10% - 90%)
+        public randomTestSetDistribution: number = 0.1, //0.1-0.9 (10% - 90%) JESTE OVDE ZAKUCANO 10, AL POSLATO JE KAO 0.1 BACK-U
 
         // Neural net training settings
         public type: ANNType = ANNType.FullyConnected,
@@ -22,7 +25,10 @@ export default class Model {
         public batchSize: number = 5,
         public inputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public hiddenLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
-        public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid
+        public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
+        public username: string = '',
+        public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
+        public nullValuesReplacers = []
     ) { }
 }
 
@@ -31,23 +37,77 @@ export enum ANNType {
     Convolutional = 'konvoluciona'
 }
 
+// replaceMissing srednja vrednost mean, median, najcesca vrednost (mode)
+// removeOutliers
 export enum Encoding {
     Label = 'label',
-    OneHot = 'one hot'
+    OneHot = 'one hot',
+    BackwardDifference = 'backward difference',
+    BaseN = 'baseN',
+    Binary = 'binary',
+    CatBoost = 'cat boost',
+    Count = 'count',
+    GLMM = 'glmm',
+    Hashing = 'hashing',
+    Helmert = 'helmert',
+    JamesStein = 'james stein',
+    LeaveOneOut = 'leave one out',
+    MEstimate = 'MEstimate',
+    Ordinal = 'ordinal',
+    Sum = 'sum',
+    Polynomial = 'polynomial',
+    Target = 'target',
+    WOE = 'woe',
+    Quantile = 'quantile'
 }
 
 export enum ActivationFunction {
+    // linear
+    Binary_Step = 'binaryStep',
+    Linear = 'linear',
+    // non-linear
     Relu = 'relu',
+    Leaky_Relu = 'leakyRelu',
+    Parameterised_Relu = 'parameterisedRelu',
+    Exponential_Linear_Unit = 'exponentialLinearUnit',
+    Swish = 'swish',
     Sigmoid = 'sigmoid',
     Tanh = 'tanh',
-    Linear = 'linear'
+    Softmax = 'softmax'
 }
 
 export enum LossFunction {
+    // binary classification loss functions
     BinaryCrossEntropy = 'binary_crossentropy',
-    MeanSquaredError = 'mean_squared_error'
+    HingeLoss = 'hinge_loss',
+    // multi-class classiication loss functions
+    CategoricalCrossEntropy = 'categorical_crossentropy',
+    KLDivergence = 'kullback_leibler_divergence',
+    // regression loss functions
+    MeanSquaredError = 'mean_squared_error',
+    MeanAbsoluteError = 'mean_absolute_error',
+    HuberLoss = 'Huber',
 }
 
 export enum Optimizer {
-    Adam = 'adam'
+    Adam = 'Adam',
+    Adadelta = 'Adadelta',
+    Adagrad = 'Adagrad',
+    Ftrl = 'Ftrl',
+    Nadam = 'Nadam',
+    SGD = 'SGD',
+    SGDMomentum = 'SGDMomentum',
+    RMSprop = 'RMSprop'
+}
+
+export enum NullValueOptions {
+    DeleteRows = 'delete_rows',
+    DeleteColumns = 'delete_columns',
+    Replace = 'replace'
+}
+
+export enum ReplaceWith {
+    None = 'Popuni...',
+    Mean = 'Srednja vrednost',
+    Median = 'Medijana'
 }
\ No newline at end of file