diff options
Diffstat (limited to 'frontend/src')
13 files changed, 7 insertions, 39 deletions
diff --git a/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts b/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts index b3d25280..93f71023 100644 --- a/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts +++ b/frontend/src/app/_elements/_charts/box-plot/box-plot.component.ts @@ -29,14 +29,13 @@ export class BoxPlotComponent implements AfterViewInit { /* updatePieChart(uniqueValues: string[], uniqueValuesPercent: number[]){ - //console.log(this.uniqueValues, this.uniqueValuesPercent); + this.pieChartData.datasets = [{ label: "%", backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850", "#000000"], data: uniqueValuesPercent, }]; this.pieChartData.labels = uniqueValues - console.log(this.uniqueValues, this.uniqueValuesPercent); this.myChart?.update() }; */ diff --git a/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts b/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts index 9264e41c..0b0057ea 100644 --- a/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts +++ b/frontend/src/app/_elements/_charts/pie-chart/pie-chart.component.ts @@ -14,14 +14,12 @@ export class PieChartComponent implements AfterViewInit { @Input()uniqueValuesPercent?: number[] = []; updatePieChart(uniqueValues: string[], uniqueValuesPercent: number[]){ - //console.log(this.uniqueValues, this.uniqueValuesPercent); this.pieChartData.datasets = [{ label: "%", backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850", "#000000"], data: uniqueValuesPercent, }]; this.pieChartData.labels = uniqueValues - console.log(this.uniqueValues, this.uniqueValuesPercent); this.myChart?.update() }; diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts index a9057695..4b10401d 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.ts +++ b/frontend/src/app/_elements/column-table/column-table.component.ts @@ -83,7 +83,6 @@ export class ColumnTableComponent implements AfterViewInit { loadDataset(dataset: Dataset) { - console.log("LOADED DATASET"); if (this.route.snapshot.paramMap.get("id") == null && this.route.snapshot.paramMap.get("predictorId") == null) { this.dataset = dataset; @@ -203,7 +202,6 @@ export class ColumnTableComponent implements AfterViewInit { } else { this.experiment.inputColumns = this.experiment.inputColumns.filter(x => x != columnName); - //console.log("Input columns: ", this.experiment.inputColumns); //TODO: da se zatamni kolona koja je unchecked //this.experiment.encodings = this.experiment.encodings.filter(x => x.columnName != columnName); samo na kraju iz enkodinga skloni necekirane let index = this.dataset?.columnInfo.findIndex(x => x.columnName == columnName)!; @@ -235,19 +233,15 @@ export class ColumnTableComponent implements AfterViewInit { changeProblemType() { if (this.experiment != undefined && this.dataset != undefined) { - //console.log(this.experiment.outputColumn); let i = this.dataset.columnInfo.findIndex(x => x.columnName == this.experiment!.outputColumn); if (i == -1 || this.experiment.columnTypes[i] == ColumnType.numerical) { - //console.log("USAO U REGRESIONI"); this.experiment.type = ProblemType.Regression; } else { if (this.dataset.columnInfo[i].uniqueValues!.length == 2) { - //console.log("USAO U BINARY"); this.experiment.type = ProblemType.BinaryClassification; } else { - //console.log("USAO U multi"); this.experiment.type = ProblemType.MultiClassification; } } @@ -260,7 +254,6 @@ export class ColumnTableComponent implements AfterViewInit { this.experiment.encodings = []; for (let i = 0; i < this.dataset.columnInfo.length; i++) { this.experiment.encodings.push(new ColumnEncoding(this.dataset?.columnInfo[i].columnName, encodingType)); - //console.log(this.experiment.encodings); } this.columnTableChangeDetected(); } @@ -293,7 +286,6 @@ export class ColumnTableComponent implements AfterViewInit { if (this.dataset.columnInfo[i].numNulls > 0 && this.dataset.columnInfo[i].columnName != this.experiment.outputColumn) { this.experiment.inputColumns = this.experiment.inputColumns.filter(x => x != this.dataset!.columnInfo[i].columnName); this.columnsChecked[i] = false; - console.log(this.dataset!.columnInfo[i].columnName); this.nullValOption[i] = "Isključi kolonu"; } @@ -327,7 +319,6 @@ export class ColumnTableComponent implements AfterViewInit { if (this.dataset.columnInfo[i].numNulls > 0) { this.experiment.inputColumns = this.experiment.inputColumns.filter(x => x != this.dataset!.columnInfo[i].columnName); this.columnsChecked[i] = false; - console.log(this.dataset!.columnInfo[i].columnName); } }*/ } @@ -369,7 +360,6 @@ export class ColumnTableComponent implements AfterViewInit { Object.assign(this.experiment, experiment); this.experiment._columnsSelected = true; this.experimentChanged.emit(); - console.log(this.experiment); } }); } diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index 93e8ba98..c9252caa 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -203,7 +203,6 @@ export class FolderComponent implements AfterViewInit { refreshDatasets(selectedDatasetId: string | null) { this.datasetsService.getMyDatasets().subscribe((datasets) => { this.folders[TabType.MyDatasets] = datasets; - console.log(this.filteredFiles); if (selectedDatasetId) { this.selectFile(datasets.filter(x => x._id == selectedDatasetId)[0]); } @@ -286,7 +285,6 @@ export class FolderComponent implements AfterViewInit { if (!this.filteredFiles.includes(this.selectedFile)) { if (this.hoverTab === TabType.None && this.getFolderType(this.selectedTab) === this.type) { this.selectFile(undefined); - console.log(this.getFolderType(this.selectedTab), this.type); } } else { //this.selectedFileIndex = this.filteredFiles.indexOf(this.selectedFile); @@ -301,7 +299,6 @@ export class FolderComponent implements AfterViewInit { lastFileData = {}; onFileChange() { - console.log(this.selectedFile, this.lastFileData) setTimeout(() => { this.selectedFileHasChanges = !((this.selectedTab == TabType.NewFile) || isEqual(this.selectedFile, this.lastFileData)); }); @@ -329,6 +326,7 @@ export class FolderComponent implements AfterViewInit { this.selectedFileHasChanges = false; Object.assign(this.lastFileData, this.selectedFile); this.refreshFiles(); + this.selectedFileChanged.emit(this.selectedFile); } deleteFile(file: FolderFile, event: Event, deletePredictor: boolean = false) { @@ -426,7 +424,6 @@ export class FolderComponent implements AfterViewInit { break; case FolderType.Experiment: // this.experimentsService.addExperiment(<Model>file).subscribe((response) => { - // console.log(response); // }); //todo delete za predictor break; diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts index 35d68526..1a29f74e 100644 --- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts +++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts @@ -88,10 +88,12 @@ export class FormDatasetComponent { firstInput = false; update() { - - this.firstInput = true - if (this.files.length < 1) + this.firstInput = true; + if (this.files.length < 1){ + this.loadExisting(); return; + } + const fileReader = new FileReader(); fileReader.onload = (e) => { @@ -157,7 +159,6 @@ export class FormDatasetComponent { } return this.modelsService.uploadData(this.files[0]).subscribe((file) => { - //console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id); this.dataset._id = ""; this.dataset.fileId = file._id; this.dataset.uploaderId = shared.userId; diff --git a/frontend/src/app/_elements/form-model/form-model.component.ts b/frontend/src/app/_elements/form-model/form-model.component.ts index 646af08c..7c84d2ba 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.ts +++ b/frontend/src/app/_elements/form-model/form-model.component.ts @@ -83,7 +83,6 @@ export class FormModelComponent implements AfterViewInit { } updateGraph() { - //console.log(this.newModel.layers); this.graph.update(); } diff --git a/frontend/src/app/_elements/graph/graph.component.ts b/frontend/src/app/_elements/graph/graph.component.ts index da2c7767..04be9f04 100644 --- a/frontend/src/app/_elements/graph/graph.component.ts +++ b/frontend/src/app/_elements/graph/graph.component.ts @@ -43,7 +43,6 @@ export class GraphComponent implements AfterViewInit { window.addEventListener('resize', () => { this.resize() }); this.update(); this.resize(); - //console.log(this.layers); } layers: Node[][] = []; diff --git a/frontend/src/app/_elements/metric-view/metric-view.component.ts b/frontend/src/app/_elements/metric-view/metric-view.component.ts index 65b1ef9b..1f846df8 100644 --- a/frontend/src/app/_elements/metric-view/metric-view.component.ts +++ b/frontend/src/app/_elements/metric-view/metric-view.component.ts @@ -40,7 +40,6 @@ export class MetricViewComponent implements OnInit { myEpochs.push(epoch + 1); for (let key in metrics) { let value = metrics[key]; - //console.log(key, ':::', value, epoch); if (key === 'accuracy') { myAcc.push(parseFloat(value)); } diff --git a/frontend/src/app/_elements/notifications/notifications.component.ts b/frontend/src/app/_elements/notifications/notifications.component.ts index 5716c1e6..81769fde 100644 --- a/frontend/src/app/_elements/notifications/notifications.component.ts +++ b/frontend/src/app/_elements/notifications/notifications.component.ts @@ -24,8 +24,6 @@ export class NotificationsComponent implements OnInit { this.signalRService.hubConnection.on("NotifyEpoch", (mName: string, mId: string, stat: string, totalEpochs: number, currentEpoch: number) => { const existingNotification = this.notifications.find(x => x.id === mId) const progress = ((currentEpoch + 1) / totalEpochs); - //console.log("Ukupno epoha", totalEpochs, "Trenutna epoha:", currentEpoch); - //console.log("stat:", stat); if (!existingNotification) this.notifications.push(new Notification(`Treniranje modela: ${mName}`, mId, progress, true)); else { diff --git a/frontend/src/app/_elements/playlist/playlist.component.ts b/frontend/src/app/_elements/playlist/playlist.component.ts index 7f476178..8d54ea5d 100644 --- a/frontend/src/app/_elements/playlist/playlist.component.ts +++ b/frontend/src/app/_elements/playlist/playlist.component.ts @@ -44,6 +44,5 @@ export class PlaylistComponent implements OnInit { } }); - //console.log(this.tableDatas); } } diff --git a/frontend/src/app/_modals/login-modal/login-modal.component.ts b/frontend/src/app/_modals/login-modal/login-modal.component.ts index 33c17c31..d290bd9a 100644 --- a/frontend/src/app/_modals/login-modal/login-modal.component.ts +++ b/frontend/src/app/_modals/login-modal/login-modal.component.ts @@ -33,7 +33,6 @@ export class LoginModalComponent implements AfterViewInit { ) { } ngAfterViewInit(): void { - //console.log(this.usernameInput); this.usernameInput.nativeElement.focus(); } diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index 398321f2..ec4275fa 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -83,13 +83,11 @@ export class ExperimentComponent implements AfterViewInit { if (this.signalRService.hubConnection) { this.signalRService.hubConnection.on("NotifyEpoch", (mName: string, mId: string, stat: string, totalEpochs: number, currentEpoch: number) => { - console.log(this.modelToTrain?._id, mId); if (currentEpoch == 0) { this.history = []; } if (this.modelToTrain?._id == mId) { stat = stat.replace(/'/g, '"'); - //console.log('JSON', this.trainingResult); this.history.push(JSON.parse(stat)); this.metricView.update(this.history,this.modelToTrain.epochs); } @@ -101,27 +99,21 @@ export class ExperimentComponent implements AfterViewInit { let experimentId = this.route.snapshot.paramMap.get("id"); let predictorId = this.route.snapshot.paramMap.get("predictorId"); - console.log("paramexp: ", experimentId, ", parampredictor: ", predictorId); if (predictorId != null) { this.predictorsService.getPredictor(predictorId!).subscribe((response) => { let predictor = response; - //console.log("predictor: ", predictor); this.experimentsService.getExperimentById(predictor.experimentId).subscribe((response) => { this.experiment = response; - //console.log("experiment: ", this.experiment); this.datasetsService.getDatasetById(this.experiment.datasetId).subscribe((response: Dataset) => { this.dataset = response; - //console.log("dataset: ", this.dataset); this.folderDataset.forExperiment = this.experiment; this.folderDataset.selectFile(this.dataset); //sad 3. i 4. korak da se ucitaju this.modelsService.getModelById(predictor.modelId).subscribe((response) => { let model = response; - //console.log("model: ", model); this.folderModel.formModel.newModel = model; this.step3 = true; let numOfEpochsArray = Array.from({length: model.epochs}, (_, i) => i + 1); - //console.log("metric view1:", this.metricView); setTimeout(() => { this.metricView.linechartComponent.update(numOfEpochsArray, predictor.metricsAcc, predictor.metricsLoss, predictor.metricsMae, predictor.metricsMse, predictor.metricsValAcc, predictor.metricsValLoss, predictor.metricsValMae, predictor.metricsValMse); }) @@ -199,7 +191,6 @@ export class ExperimentComponent implements AfterViewInit { columnTableChangedEvent() { //sta se desi kad se nesto promeni u column-table komponenti... - //console.log("promenio se column-table"); } experimentChangedEvent() { diff --git a/frontend/src/app/_pages/profile/profile.component.ts b/frontend/src/app/_pages/profile/profile.component.ts index aed8e40c..a51a7ea7 100644 --- a/frontend/src/app/_pages/profile/profile.component.ts +++ b/frontend/src/app/_pages/profile/profile.component.ts @@ -137,7 +137,6 @@ export class ProfileComponent implements OnInit { let passwordArray: string[] = [this.oldPass, this.newPass1]; this.userInfoService.changeUserPassword(passwordArray).subscribe((response: any) => { - //console.log("PROMENIO LOZINKU"); this.resetNewPassInputs(); const dialogRef = this.dialog?.open(AlertDialogComponent, { width: '350px', |