aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_data
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/src/app/_data')
-rw-r--r--frontend/src/app/_data/Dataset.ts1
-rw-r--r--frontend/src/app/_data/Experiment.ts14
-rw-r--r--frontend/src/app/_data/FolderFile.ts1
-rw-r--r--frontend/src/app/_data/Model.ts7
4 files changed, 12 insertions, 11 deletions
diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 87b09c6f..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 = '',
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 d1e89e84..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 = '',
@@ -132,10 +131,10 @@ export enum LossFunction {
MeanSquaredLogarithmicError = 'mean_squared_logarithmic_error',
HuberLoss = 'Huber'
}
-export const LossFunctionRegression =[LossFunction.MeanAbsoluteError,LossFunction.MeanSquaredError,LossFunction.MeanSquaredLogarithmicError]
-export const LossFunctionBinaryClassification=[LossFunction.BinaryCrossEntropy,LossFunction.SquaredHingeLoss,LossFunction.HingeLoss]
+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 const LossFunctionMultiClassification = [LossFunction.CategoricalCrossEntropy, LossFunction.SparseCategoricalCrossEntropy, LossFunction.KLDivergence]
export enum Optimizer {
Adam = 'Adam',