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

# Conflicts:
#	frontend/src/app/_pages/add-model/add-model.component.html

3 files changed, 29 insertions, 1 deletions

diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
new file mode 100644
index 00000000..aaee50eb
--- /dev/null
+++ b/frontend/src/app/_data/Dataset.ts
@@ -0,0 +1,13 @@
+export default class Dataset {
+    constructor(
+        public name: string = 'Novi izvor podataka',
+        public description: string = '',
+        public header: string[] = [],
+        public fileId?: number,
+        public extension: string = '.csv',
+        public isPublic: boolean = false,
+        public accessibleByLink: boolean = false,
+        public dateCreated: Date = new Date(),
+        public lastUpdated: Date = new Date()
+    ) { }
+}
\ No newline at end of file
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 216e1c36..1a120ca7 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -3,11 +3,13 @@ export default class Model {
         public name: string = 'Novi model',
         public description: string = '',
         public dateCreated: Date = new Date(),
+        public lastUpdated: Date = new Date(),
         public datasetId?: number,
 
-        //Test set settings
+        // Test set settings
         public inputColumns: number[] = [0],
         public columnToPredict: number = 1,
+        public randomOrder: boolean = true,
         public randomTestSet: boolean = true,
         public randomTestSetDistribution: number = 0.10, //0.1-0.9 (10% - 90%)
 
@@ -31,6 +33,8 @@ export enum ANNType {
     Convolutional = 'konvoluciona'
 }
 
+// replaceMissing srednja vrednost mean, median, najcesca vrednost (mode)
+// removeOutliers
 export enum Encoding {
     Label = 'label',
     OneHot = 'one hot'
diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts
new file mode 100644
index 00000000..05b993f1
--- /dev/null
+++ b/frontend/src/app/_data/Predictor.ts
@@ -0,0 +1,11 @@
+export default class Predictor {
+    constructor(
+        public 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()
+    ) { }
+}
\ No newline at end of file