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

2 files changed, 12 insertions, 4 deletions

diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 8fc36a31..f527dc7f 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -117,8 +117,8 @@ export enum ActivationFunctionOutputLayer
 export enum LossFunction {
     // binary classification loss functions
     BinaryCrossEntropy = 'binary_crossentropy',
-    SquaredHingeLoss = 'squared_hinge_loss',
-    HingeLoss = 'hinge_loss',
+    SquaredHingeLoss = 'squared_hinge',
+    HingeLoss = 'hinge',
     // multi-class classification loss functions
     CategoricalCrossEntropy = 'categorical_crossentropy',
     SparseCategoricalCrossEntropy = 'sparse_categorical_crossentropy',
diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts
index c839a635..8de4cd17 100644
--- a/frontend/src/app/_data/Predictor.ts
+++ b/frontend/src/app/_data/Predictor.ts
@@ -13,8 +13,16 @@ export default class Predictor extends FolderFile {
         public experimentId: string = "",
         public modelId: string = "",
         public h5FileId: string = "",
-        public metrics: Metric[] = [],
-        public finalMetrics: Metric[] = []
+        public metricsLoss:number[]=[],
+		public metricsValLoss:number []=[], 
+		public metricsAcc:number[]=[],
+		public metricsValAcc: number[]=[],
+        public metricsMae :number []=[],
+		public metricsValMae :number []=[],
+		public metricsMse : number[]=[],
+		public metricsValMse : number[]=[],
+        //public metrics: Metric[] = [],
+        //public finalMetrics: Metric[] = []
     ) {
         super(name, dateCreated, dateCreated);
     }