6 files changed, 46 insertions, 39 deletions
diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 4ff0a471..a962fe6b 100644
--- a/frontend/src/app/_data/Dataset.ts
+++ b/frontend/src/app/_data/Dataset.ts
@@ -1,7 +1,6 @@
 import { FolderFile } from "./FolderFile";
 
 export default class Dataset extends FolderFile {
-    _id: string = '';
     constructor(
         name: string = 'Novi izvor podataka',
         public description: string = '',
@@ -29,15 +28,15 @@ export class ColumnInfo {
         public columnName: string = '',
         public isNumber: boolean = false,
         public numNulls: number = 0,
-        public uniqueValues?: string[],
-        public uniqueValuesCount?: number[],
-        public uniqueValuesPercent?: number[],
-        public median?: number,
-        public mean?: number,
-        public min?: number,
-        public max?: number,
-        public q1?: number,
-        public q3?: number,
+        public uniqueValues: string[]=[],
+        public uniqueValuesCount: number[]=[],
+        public uniqueValuesPercent: number[]=[],
+        public median: number=0,
+        public mean: number=0,
+        public min: number=0,
+        public max: number=0,
+        public q1: number=0,
+        public q3: number=0,
     ) {
         /*if (isNumber)
             this.columnType = ColumnType.numerical;
diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index cff77535..c140e100 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -1,9 +1,9 @@
+import { FolderFile } from "./FolderFile";
 import { ProblemType } from "./Model";
-export default class Experiment {
-    _id: string = '';
+export default class Experiment extends FolderFile {
     uploaderId: string = '';
     constructor(
-        public name: string = 'Novi eksperiment',
+        name: string = 'Novi eksperiment',
         public description: string = '',
         public type: ProblemType = ProblemType.Regression,
         public datasetId: string = '',
@@ -11,12 +11,14 @@ export default class Experiment {
         public outputColumn: string = '',
         public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
         public nullValuesReplacers: NullValReplacer[] = [],
-        public dateCreated: Date = new Date(),
-        public lastUpdated: Date = new Date(),
+        dateCreated: Date = new Date(),
+        lastUpdated: Date = new Date(),
         public modelIds: string[] = [],
         public columnTypes: ColumnType[] = [],
         public encodings: ColumnEncoding[] = []//[{columnName: "", columnEncoding: Encoding.Label}]
-    ) { }
+    ) {
+        super(name, dateCreated, lastUpdated)
+    }
 
     _columnsSelected: boolean = false;
 }
diff --git a/frontend/src/app/_data/FolderFile.ts b/frontend/src/app/_data/FolderFile.ts
index c228f25e..4d1844fd 100644
--- a/frontend/src/app/_data/FolderFile.ts
+++ b/frontend/src/app/_data/FolderFile.ts
@@ -1,4 +1,5 @@
 export class FolderFile {
+    public _id: string = "";
     constructor(
         public name: string,
         public dateCreated: Date,
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 526a8290..cc25c91b 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -2,7 +2,6 @@ import { NgIf } from "@angular/common";
 import { FolderFile } from "./FolderFile";
 
 export default class Model extends FolderFile {
-    _id: string = '';
     constructor(
         name: string = 'Novi model',
         public description: string = '',
@@ -13,7 +12,7 @@ export default class Model extends FolderFile {
         // Neural net training settings
         public type: ProblemType = ProblemType.Regression,
         public optimizer: Optimizer = Optimizer.Adam,
-        public lossFunction: LossFunction = LossFunction.MeanSquaredError,
+        public lossFunction: LossFunction = LossFunctionRegression[0],
         public inputNeurons: number = 1,
         public hiddenLayers: number = 1,
         public batchSize: BatchSize = BatchSize.O3,
@@ -132,21 +131,10 @@ export enum LossFunction {
     MeanSquaredLogarithmicError = 'mean_squared_logarithmic_error',
     HuberLoss = 'Huber'
 }
-export enum LossFunctionRegression {
-    MeanAbsoluteError = 'mean_absolute_error',
-    MeanSquaredError = 'mean_squared_error',
-    MeanSquaredLogarithmicError = 'mean_squared_logarithmic_error',
-}
-export enum LossFunctionBinaryClassification {
-    BinaryCrossEntropy = 'binary_crossentropy',
-    SquaredHingeLoss = 'squared_hinge_loss',
-    HingeLoss = 'hinge_loss',
-}
-export enum LossFunctionMultiClassification {
-    CategoricalCrossEntropy = 'categorical_crossentropy',
-    SparseCategoricalCrossEntropy = 'sparse_categorical_crossentropy',
-    KLDivergence = 'kullback_leibler_divergence',
-}
+export const LossFunctionRegression = [LossFunction.MeanAbsoluteError, LossFunction.MeanSquaredError, LossFunction.MeanSquaredLogarithmicError]
+export const LossFunctionBinaryClassification = [LossFunction.BinaryCrossEntropy, LossFunction.SquaredHingeLoss, LossFunction.HingeLoss]
+
+export const LossFunctionMultiClassification = [LossFunction.CategoricalCrossEntropy, LossFunction.SparseCategoricalCrossEntropy, LossFunction.KLDivergence]
 
 export enum Optimizer {
     Adam = 'Adam',
diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts
index 8aa2b6cb..55d610ed 100644
--- a/frontend/src/app/_data/Predictor.ts
+++ b/frontend/src/app/_data/Predictor.ts
@@ -1,13 +1,28 @@
-export default class Predictor {
-    _id: string = '';
+import { FolderFile } from "./FolderFile";
+
+export default class Predictor extends FolderFile {
     constructor(
-        public name: string = 'Novi prediktor',
+        name: string = 'Novi prediktor',
         public description: string = '',
         public inputs: string[] = [],
         public output: string = '',
         public isPublic: boolean = false,
         public accessibleByLink: boolean = false,
-        public dateCreated: Date = new Date(),
-        public uploaderId: string = ''
+        dateCreated: Date = new Date(),
+        lastUpdated: Date = new Date(),
+        public uploaderId: string = '',
+        //public finalMetrics: Metric[] = []
+        public experimentId: string = "",
+        public modelId: string = "",
+    ) {
+        super(name, dateCreated, lastUpdated);
+    }
+}
+
+export class Metric {
+    constructor(
+        public name: string = '',
+        public jsonValue: string = ''
     ) { }
+
 }
 \ No newline at end of file
diff --git a/frontend/src/app/_data/User.ts b/frontend/src/app/_data/User.ts
index be42ed0a..527bac77 100644
--- a/frontend/src/app/_data/User.ts
+++ b/frontend/src/app/_data/User.ts
@@ -6,6 +6,8 @@ export default class User {
         public password: string = '',
         public firstName: string = '',
         public lastName: string = '',
-        public photoId: string = '1' //difoltna profilna slika
+        public photoId: string = '1', //difoltna profilna slika
+        public isPermament:boolean=false,
+        public dateCreated:Date=new Date()
     ) { }
 }
 \ No newline at end of file