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

# Conflicts:
#	frontend/src/app/_services/models.service.ts

1 files changed, 11 insertions, 2 deletions

diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 48418d51..32247bbd 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -23,12 +23,14 @@ export default class Model {
         public hiddenLayerNeurons: number = 1,
         public hiddenLayers: number = 1,
         public batchSize: number = 5,
-        public hiddenLayerActivationFunction = [],
+        public hiddenLayerActivationFunctions: string[] = ['sigmoid'],
         //public inputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public username: string = '',
         public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
-        public nullValuesReplacers = []
+        public nullValuesReplacers = [],
+        public metrics: Metric[] = [], // TODO add to add-model form
+        public epochs: number = 5 // TODO add to add-model form
     ) { }
 }
 
@@ -111,4 +113,11 @@ export enum ReplaceWith {
     None = 'Popuni...',
     Mean = 'Srednja vrednost',
     Median = 'Medijana'
+}
+
+export enum Metric {
+    MSE = 'mse',
+    MAE = 'mae',
+    RMSE = 'rmse'
+    //...
 }
\ No newline at end of file