Add model stranica zamenjena sa eksperiment stranicom.

3 files changed, 39 insertions, 6 deletions

diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index c5b56957..dd751947 100644
--- a/frontend/src/app/_data/Dataset.ts
+++ b/frontend/src/app/_data/Dataset.ts
@@ -12,6 +12,22 @@ export default class Dataset {
         public lastUpdated: Date = new Date(),
         public username: string = '',
         public delimiter: string = '',
-        public hasHeader: boolean = true
+        public hasHeader: boolean = true,
+
+        public columnInfo: ColumnInfo[] = [],
+        public preview: string[][] = [[]]
+    ) { }
+}
+
+export class ColumnInfo {
+    constructor(
+        public name: string = '',
+        public isNumber: boolean = false,
+        public numNull: number = 0,
+        public uniqueValues?: string[],
+        public median?: number,
+        public mean?: number,
+        public min?: number,
+        public max?: number
     ) { }
 }
\ No newline at end of file
diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index 706231c7..10320ab6 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -6,7 +6,29 @@ export default class Experiment {
         public datasetId: string = '',
         public inputColumns: string[] = [],
         public columnToPredict: string = '',
+        public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
+        public nullValuesReplacers: NullValReplacer[] = [],
         public dateCreated: Date = new Date(),
         public lastUpdated: Date = new Date()
     ) { }
+}
+
+export enum NullValueOptions {
+    DeleteRows = 'delete_rows',
+    DeleteColumns = 'delete_columns',
+    Replace = 'replace'
+}
+
+export enum ReplaceWith {
+    None = 'Popuni...',
+    Mean = 'Srednja vrednost',
+    Median = 'Medijana',
+    Min = 'Minimum',
+    Max = 'Maksimum'
+}
+
+export class NullValReplacer {
+    "column": string;
+    "option": NullValueOptions;
+    "value": string;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 85b6db2b..9ea437b1 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -24,11 +24,8 @@ export default class Model {
         public hiddenLayers: number = 1,
         public batchSize: number = 5,
         public hiddenLayerActivationFunctions: string[] = ['sigmoid'],
-        //public inputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public username: string = '',
-        public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
-        public nullValuesReplacers: NullValReplacer[] = [],
         public metrics: string[] = [], // TODO add to add-model form
         public epochs: number = 5 // TODO add to add-model form
     ) { }
@@ -83,7 +80,6 @@ export enum ActivationFunction {
     Linear = 'linear',
     //Sigmoid='sigmoid',
     Softmax = 'softmax',
-
 }
 /*
 export enum ActivationFunctionHiddenLayer
@@ -115,7 +111,6 @@ export enum LossFunction {
     MeanSquaredError = 'mean_squared_error',
     MeanSquaredLogarithmicError = 'mean_squared_logarithmic_error',
     HuberLoss = 'Huber'
-
 }
 export enum LossFunctionRegression {
     MeanAbsoluteError = 'mean_absolute_error',