From 2477f1796ba88ab1ae7d8aa869a55a8b37d1d8bb Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Thu, 12 May 2022 12:49:06 +0200 Subject: Promeni hovere tako da ne menjaju glavni prikaz komponenti (folder, column-table). Pomerio dugme za pozadinu u centar tako da se ne preklapa sa notifikacijama. --- frontend/src/app/_data/Dataset.ts | 1 - frontend/src/app/_data/Experiment.ts | 14 ++++++++------ frontend/src/app/_data/FolderFile.ts | 1 + frontend/src/app/_data/Model.ts | 7 +++---- 4 files changed, 12 insertions(+), 11 deletions(-) (limited to 'frontend/src/app/_data') 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', -- cgit v1.2.3 From e6ef814ddf9185c1dc1130dbcfe9b9fd7aa9071e Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Thu, 12 May 2022 13:38:52 +0200 Subject: Dodao prikaz treniranih modela u listi experimenta za svaki model. --- frontend/src/app/_data/Predictor.ts | 18 ++-- .../src/app/_elements/folder/folder.component.css | 9 ++ .../src/app/_elements/folder/folder.component.html | 41 ++++++-- .../src/app/_elements/folder/folder.component.ts | 113 +++++++++++++-------- .../src/app/_pages/archive/archive.component.html | 2 +- .../src/app/_pages/archive/archive.component.ts | 2 + .../filter-datasets/filter-datasets.component.ts | 48 --------- .../src/app/_pages/settings/settings.component.css | 0 .../app/_pages/settings/settings.component.html | 1 - .../app/_pages/settings/settings.component.spec.ts | 25 ----- .../src/app/_pages/settings/settings.component.ts | 15 --- 11 files changed, 127 insertions(+), 147 deletions(-) delete mode 100644 frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts delete mode 100644 frontend/src/app/_pages/settings/settings.component.css delete mode 100644 frontend/src/app/_pages/settings/settings.component.html delete mode 100644 frontend/src/app/_pages/settings/settings.component.spec.ts delete mode 100644 frontend/src/app/_pages/settings/settings.component.ts (limited to 'frontend/src/app/_data') diff --git a/frontend/src/app/_data/Predictor.ts b/frontend/src/app/_data/Predictor.ts index e15ae8f9..55d610ed 100644 --- a/frontend/src/app/_data/Predictor.ts +++ b/frontend/src/app/_data/Predictor.ts @@ -1,22 +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(), + 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/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index 62324d62..ada2dba0 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -210,4 +210,13 @@ .form-hidden { display: none; +} + +.predictor { + text-decoration: underline; +} + +.highlight-exp { + /*font-size: 16px;*/ + font-weight: 700; } \ No newline at end of file diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index bff066be..8896e7e5 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -67,17 +67,38 @@
-
-
- {{file.name}} +
+
+
+ {{file.name}} +
+
+ {{file.lastUpdated | date}} +
+
+ +
-
- {{file.lastUpdated | date}} -
-
- +
+
+ +
+
+ subdirectory_arrow_right +
{{predictor.name}}
+
+
+
+ {{predictor.lastUpdated | date}} +
+
+ +
+
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index dbbc55e7..665659a8 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -32,7 +32,7 @@ export class FolderComponent implements AfterViewInit { @Input() type: FolderType = FolderType.Dataset; @Input() forExperiment!: Experiment; @Input() startingTab!: TabType; - + @Input() archive: boolean = false; newFileSelected: boolean = true; selectedFileIndex: number = -1; @@ -136,44 +136,28 @@ export class FolderComponent implements AfterViewInit { this.folders[tab] = []; }); - switch (this.type) { - case FolderType.Dataset: - this.datasetsService.getMyDatasets().subscribe((datasets) => { - this.folders[TabType.MyDatasets] = datasets; - if (selectedDatasetId) { - this.selectFile(datasets.filter(x => x._id == selectedDatasetId)[0]); - } - }); - this.datasetsService.getPublicDatasets().subscribe((datasets) => { - this.folders[TabType.PublicDatasets] = datasets; - }); - break; - - case FolderType.Model: - this.modelsService.getMyModels().subscribe((models) => { - this.folders[TabType.MyModels] = models; - if (selectedModelId) { - this.selectFile(models.filter(x => x._id == selectedModelId)[0]); - } - }); - /*this.modelsService.getMyModels().subscribe((models) => { - this.folders[TabType.PublicModels] = models; - });*/ - this.folders[TabType.PublicModels] = []; - break; - - case FolderType.Experiment: - this.experimentsService.getMyExperiments().subscribe((experiments) => { - this.folders[TabType.MyExperiments] = experiments; - }); - this.predictorsService.getMyPredictors().subscribe((predictors) => { - this.predictors = predictors; - console.log(predictors); - }); - break; - default: - console.error("Bad folder type."); - break; + if (this.archive) { + this.refreshDatasets(selectedDatasetId); + this.refreshModels(selectedModelId); + this.refreshExperiments(); + } else { + switch (this.type) { + case FolderType.Dataset: + this.refreshDatasets(selectedDatasetId); + break; + + case FolderType.Model: + this.refreshModels(selectedModelId); + break; + + case FolderType.Experiment: + this.refreshExperiments(); + break; + + default: + console.error("Bad folder type."); + break; + } } if (!this._initialized) { @@ -182,11 +166,56 @@ export class FolderComponent implements AfterViewInit { this.selectTab(this.startingTab); this._initialized = true; } + } - this.searchTermsChanged(); + refreshModels(selectedModelId: string | null) { + this.modelsService.getMyModels().subscribe((models) => { + this.folders[TabType.MyModels] = models; + if (selectedModelId) { + this.selectFile(models.filter(x => x._id == selectedModelId)[0]); + } + this.searchTermsChanged(); + }); + /*this.modelsService.getMyModels().subscribe((models) => { + this.folders[TabType.PublicModels] = models; + this.searchTermsChanged(); + });*/ + this.folders[TabType.PublicModels] = []; + } + + refreshDatasets(selectedDatasetId: string | null) { + this.datasetsService.getMyDatasets().subscribe((datasets) => { + this.folders[TabType.MyDatasets] = datasets; + if (selectedDatasetId) { + this.selectFile(datasets.filter(x => x._id == selectedDatasetId)[0]); + } + this.searchTermsChanged(); + }); + this.datasetsService.getPublicDatasets().subscribe((datasets) => { + this.folders[TabType.PublicDatasets] = datasets; + this.searchTermsChanged(); + }); } - predictors: Predictor[] = []; + refreshExperiments() { + this.experimentsService.getMyExperiments().subscribe((experiments) => { + this.folders[TabType.MyExperiments] = experiments; + this.predictorsService.getMyPredictors().subscribe((predictors) => { + this.predictorsForExp = {}; + experiments.forEach(exp => { + this.predictorsForExp[exp._id] = predictors.filter(pred => pred.experimentId == exp._id); + /* TODO IZMENI OVO DA SE SETUJE NA BACKU AUTOMATSKI */ + this.predictorsForExp[exp._id].forEach(pred => { + const model = this.folders[TabType.MyModels].find(model => model._id == pred.modelId); + pred.name = model?.name!; + pred.lastUpdated = model?.lastUpdated!; + }) + /* ------------------------------------------------ */ + this.searchTermsChanged(); + }) + }); + }); + } saveNewFile() { switch (this.type) { @@ -212,6 +241,8 @@ export class FolderComponent implements AfterViewInit { } } + predictorsForExp: { [expId: string]: Predictor[] } = {} + clearSearchTerm() { this.searchTerm = ''; this.searchTermsChanged(); diff --git a/frontend/src/app/_pages/archive/archive.component.html b/frontend/src/app/_pages/archive/archive.component.html index fc3c4763..f9cce56b 100644 --- a/frontend/src/app/_pages/archive/archive.component.html +++ b/frontend/src/app/_pages/archive/archive.component.html @@ -1,5 +1,5 @@
- +