diff options
| author | Ivan Ljubisavljevic <ivan996sk@gmail.com> | 2022-05-02 23:34:21 +0200 |
|---|---|---|
| committer | Ivan Ljubisavljevic <ivan996sk@gmail.com> | 2022-05-02 23:34:21 +0200 |
| commit | bcc7e43809ed6f7a99f75576457a726b9d86194a (patch) | |
| tree | fb43038dbbbad33eebad3c47f9d7e6fd8c850803 /frontend/src/app/_data | |
| parent | 36c90f66c9e869f4f9b2ba4dd70a431c57a84999 (diff) | |
| parent | f9b96fc9234802ba78a64be094ebc4b4525cde8e (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
# Conflicts:
# backend/api/api/Models/Dataset.cs
# backend/api/api/Services/FillAnEmptyDb.cs
Diffstat (limited to 'frontend/src/app/_data')
| -rw-r--r-- | frontend/src/app/_data/Dataset.ts | 6 | ||||
| -rw-r--r-- | frontend/src/app/_data/Experiment.ts | 5 | ||||
| -rw-r--r-- | frontend/src/app/_data/Model.ts | 7 |
3 files changed, 10 insertions, 8 deletions
diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts index c3e9056b..21b4b9ef 100644 --- a/frontend/src/app/_data/Dataset.ts +++ b/frontend/src/app/_data/Dataset.ts @@ -40,10 +40,10 @@ export class ColumnInfo { public q1?:number, public q3?:number, ) { - if (isNumber) - columnType = ColumnType.numerical; + /*if (isNumber) + this.columnType = ColumnType.numerical; else - columnType = ColumnType.categorical; + this.columnType = ColumnType.categorical;*/ } } diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts index 23fd77d4..ab87e3ca 100644 --- a/frontend/src/app/_data/Experiment.ts +++ b/frontend/src/app/_data/Experiment.ts @@ -13,10 +13,7 @@ export default class Experiment { public lastUpdated: Date = new Date(), public modelIds: string[] = [], - // Test set settings - public randomOrder: boolean = true, - 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 + public encodings: ColumnEncoding[] = []//[{columnName: "", columnEncoding: Encoding.Label}] ) { } diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts index 6281748c..185e2257 100644 --- a/frontend/src/app/_data/Model.ts +++ b/frontend/src/app/_data/Model.ts @@ -23,7 +23,12 @@ export default class Model extends FolderFile { public epochs: number = 5, // TODO add to add-model form public inputColNum: number = 5, public learningRate: LearningRate = LearningRate.LR1, - public layers: Layer[] = [new Layer()] + public layers: Layer[] = [new Layer()], + + // Test set settings + public randomOrder: boolean = true, + 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 ) { super(name, dateCreated, lastUpdated); |