Merge branch 'dev' into 'master'

Merge master

See merge request igrannonica/neuronstellar!27

5 files changed, 19 insertions, 10 deletions

diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 732d1c56..766040a3 100644
--- a/frontend/src/app/_data/Dataset.ts
+++ b/frontend/src/app/_data/Dataset.ts
@@ -10,7 +10,7 @@ export default class Dataset {
         public accessibleByLink: boolean = false,
         public dateCreated: Date = new Date(),
         public lastUpdated: Date = new Date(),
-        public username: string = '',
+        public uploaderId: string = '',
         public delimiter: string = '',
         public hasHeader: boolean = true,
 
diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index 453f6ca0..95ef6e1e 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -1,3 +1,4 @@
+import { ProblemType } from "./Model";
 export default class Experiment {
     _id: string = '';
     uploaderId: string = '';
@@ -18,8 +19,8 @@ export default class Experiment {
         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
+        public encodings: ColumnEncoding[] = [],
+        public type: ProblemType = ProblemType.Regression
     ) { }
 }
 
@@ -65,4 +66,12 @@ export enum Encoding {
     WOE = 'woe',
     Quantile = 'quantile'
     */
+}
+
+export class ColumnEncoding {
+    constructor (
+        public columnName: string,
+        public encoding: Encoding
+    ) 
+    {}
 }
\ No newline at end of file
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 8a85e296..7d383584 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -16,10 +16,10 @@ export default class Model {
         public inputNeurons: number = 1,
         public hiddenLayerNeurons: number = 1,
         public hiddenLayers: number = 1,
-        public batchSize: number = 5,
+        public batchSize: number = 4,
         public hiddenLayerActivationFunctions: string[] = ['sigmoid'],
         public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
-        public username: string = '',
+        public uploaderId: string = '',
         public metrics: string[] = [], // TODO add to add-model form
         public epochs: number = 5 // TODO add to add-model form
     ) { }
@@ -73,7 +73,7 @@ export enum LossFunction {
     HingeLoss = 'hinge_loss',
     // multi-class classification loss functions
     CategoricalCrossEntropy = 'categorical_crossentropy',
-    SparseCategoricalCrossEntropy = 'sparse_categorical_crosentropy',
+    SparseCategoricalCrossEntropy = 'sparse_categorical_crossentropy',
     KLDivergence = 'kullback_leibler_divergence',
 
     // regression loss functions
@@ -94,8 +94,8 @@ export enum LossFunctionBinaryClassification {
     HingeLoss = 'hinge_loss',
 }
 export enum LossFunctionMultiClassification {
-    CategoricalCrossEntropy = 'categorical_crossentropy',
-    SparseCategoricalCrossEntropy = 'sparse_categorical_crosentropy',
+    //CategoricalCrossEntropy = 'categorical_crossentropy',
+    SparseCategoricalCrossEntropy = 'sparse_categorical_crossentropy',
     KLDivergence = 'kullback_leibler_divergence',
 }
 
diff --git a/frontend/src/app/_data/Notification.ts b/frontend/src/app/_data/Notification.ts
index c505d399..94a3be1d 100644
--- a/frontend/src/app/_data/Notification.ts
+++ b/frontend/src/app/_data/Notification.ts
@@ -1,5 +1,4 @@
 export default class Notification {
-    _id: string = '';
     constructor(
         public title: string = 'Treniranje u toku...',
         public id: string = '042',
diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts
index 7e902eae..8aa2b6cb 100644
--- a/frontend/src/app/_data/Predictor.ts
+++ b/frontend/src/app/_data/Predictor.ts
@@ -7,6 +7,7 @@ export default class Predictor {
         public output: string = '',
         public isPublic: boolean = false,
         public accessibleByLink: boolean = false,
-        public dateCreated: Date = new Date()
+        public dateCreated: Date = new Date(),
+        public uploaderId: string = ''
     ) { }
 }
\ No newline at end of file