From 1d79dffb6ab020f46e9626687a34ecec4acf6a9c Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Wed, 11 May 2022 18:24:16 +0200 Subject: Dodat mehanizam da obavestava korisnika o unetoj informaciji na navbaru. --- .../src/app/_pages/experiment/experiment.component.html | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 28bacf1f..17881347 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -3,19 +3,28 @@ - Izvor podataka + + {{dataset.name}} + Izvor podataka +

Izaberite vas izvor podataka

 - Odabir kolona + + {{experiment.name}} + Odabir kolona +

Pripremite podatke i izaberite izlazne kolone

 - Treniranje + + {{modelToTrain.name}} + Treniranje +

Odaberite parametre i trenirajte model

 -- cgit v1.2.3 From 3669f032c1077480d33c55a1eadae5999ab8250f Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Wed, 11 May 2022 19:10:46 +0200 Subject: Dodato ime eksperimenta. --- frontend/src/app/_pages/experiment/experiment.component.css | 4 ++++ frontend/src/app/_pages/experiment/experiment.component.html | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_pages/experiment/experiment.component.css b/frontend/src/app/_pages/experiment/experiment.component.css index 36c35484..a709c98e 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.css +++ b/frontend/src/app/_pages/experiment/experiment.component.css @@ -52,4 +52,8 @@ mat-stepper { width: 98%; height: 98%; overflow-y: auto; +} +.ekspName{ + font-weight: bold; + font-size: large; } \ No newline at end of file diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 17881347..08c6cd06 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -1,5 +1,7 @@
+
+
Eskperiment:{{experiment.name}}
@@ -32,6 +34,7 @@

Pregledajte tok treniranja i grafički prikaz rezultata

 +
@@ -55,4 +58,4 @@
- \ No newline at end of file + -- cgit v1.2.3 From f0428d044ae81da1021caf4eab25ef7f460d8a81 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Wed, 11 May 2022 19:18:59 +0200 Subject: Promenjene informacije koje se prikazuju. --- frontend/src/app/_pages/experiment/experiment.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 08c6cd06..edae1fc2 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -6,8 +6,8 @@ - {{dataset.name}} Izvor podataka + Izvor podataka:{{dataset.name}}

Izaberite vas izvor podataka

@@ -15,7 +15,7 @@ - {{experiment.name}} + Predvideti:{{experiment.outputColumn}} Odabir kolona @@ -24,7 +24,7 @@ - {{modelToTrain.name}} + Model:{{modelToTrain.name}} Treniranje

Odaberite parametre i trenirajte model

-- cgit v1.2.3 From 8e1c8a20a1c098188245552abb2629135c807558 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Wed, 11 May 2022 22:36:22 +0200 Subject: Promenjen stil i dizajn. Dodat naziv u slucaju da je novi eksperiment. --- .../app/_pages/experiment/experiment.component.css | 10 ++++++++- .../_pages/experiment/experiment.component.html | 26 ++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) (limited to 'frontend/src/app/_pages') diff --git a/frontend/src/app/_pages/experiment/experiment.component.css b/frontend/src/app/_pages/experiment/experiment.component.css index a709c98e..4c063f87 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.css +++ b/frontend/src/app/_pages/experiment/experiment.component.css @@ -56,4 +56,12 @@ mat-stepper { .ekspName{ font-weight: bold; font-size: large; -} \ No newline at end of file +} + + +.addedElement{ + color:var(--ns-accent); +} +.text-overflow { + overflow-wrap: break-word; +} diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index edae1fc2..a2ede838 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -1,37 +1,45 @@
-
Eskperiment:{{experiment.name}}
+
+
+ Novi Eksperiment +
+
+ {{experiment.name}} +
+ +
Izvor podataka - Izvor podataka:{{dataset.name}} + {{dataset.name}} -

Izaberite vas izvor podataka

+

Izaberite vas izvor podataka

 - - Predvideti:{{experiment.outputColumn}} + + Predvideti:{{experiment.outputColumn}} Odabir kolona -

Pripremite podatke i izaberite izlazne kolone

+

Pripremite podatke i izaberite izlazne kolone

 - Model:{{modelToTrain.name}} + {{modelToTrain.name}} Treniranje -

Odaberite parametre i trenirajte model

+

Odaberite parametre i trenirajte model

 Pregled rezultata treniranja -

Pregledajte tok treniranja i grafički prikaz rezultata

+

Pregledajte tok treniranja i grafički prikaz rezultata
-- cgit v1.2.3 From fc273e5c9b5b6c9b845b6dbac093873f56e17495 Mon Sep 17 00:00:00 2001 From: Nevena Bojovic Date: Wed, 11 May 2022 22:55:17 +0200 Subject: Pie Chart - korekcija. --- .../_charts/pie-chart/pie-chart.component.ts | 39 ++++++++++++++-------- .../column-table/column-table.component.ts | 17 ++++++++-- .../app/_pages/experiment/experiment.component.ts | 1 + 3 files changed, 40 insertions(+), 17 deletions(-) (limited to 'frontend/src/app/_pages') 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 932ed963..c2bd3262 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 @@ -12,21 +12,34 @@ export class PieChartComponent implements AfterViewInit { @Input()height?: number; @Input()uniqueValues?: string[] = []; @Input()uniqueValuesPercent?: number[] = []; + + updatePieChart(uniqueValues: string[], uniqueValuesPercent: number[]){ + console.log(this.uniqueValues, this.uniqueValuesPercent); + const newPieChartData = { + datasets: [{ + label: "Population (millions)", + backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850"], + data: [2478,5267,734,784,433], + }] + + } + }; @ViewChild('piechart') chartRef!: ElementRef; constructor() { } + pieChartData = { + datasets: [{ + label: "Population (millions)", + backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850"], + data: [2478,5267,734,784,433] + }] +} + ngAfterViewInit(): void { const myChart = new Chart(this.chartRef.nativeElement, { type: 'pie', - data: { - labels: ["Africa", "Asia", "Europe", "Latin America", "North America"], - datasets: [{ - label: "Population (millions)", - backgroundColor: ["#3e95cd", "#8e5ea2","#3cba9f","#e8c3b9","#c45850"], - data: [2478,5267,734,784,433], - }] - }, + data: this.pieChartData, options: { /*title: { display: true, @@ -38,11 +51,9 @@ export class PieChartComponent implements AfterViewInit { }, }, layout: { - padding: 15} + padding: 15 + } } -}); - - } + });} - -} +} \ No newline at end of file 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 8010c30f..4150a704 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.ts +++ b/frontend/src/app/_elements/column-table/column-table.component.ts @@ -58,9 +58,22 @@ export class ColumnTableComponent implements AfterViewInit { }); } + updatePieChart(){ + //min: number, max: number, q1: number, q3: number, median: number + let i=0; + this.dataset?.columnInfo.forEach(colInfo => + { if (this.experiment.columnTypes[i] == ColumnType.categorical) + { + this.piechartComp[i].updatePieChart(colInfo!.uniqueValues, colInfo.uniqueValuesPercent); + i++; + } + }); + } + loadDataset(dataset: Dataset) { this.dataset = dataset; this.updateCharts(); + this.updatePieChart(); this.setColumnTypeInitial(); this.dataset.columnInfo.forEach(column => { @@ -384,7 +397,5 @@ export class Tab { public value: Table ) { } } -function BoxplotComponent(BoxplotComponent: any) { - throw new Error('Function not implemented.'); -} + diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index 97029565..abf4b697 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -157,6 +157,7 @@ export class ExperimentComponent implements AfterViewInit { this.dataset = d; this.columnTable.loadDataset(this.dataset); + } modelToTrain?: Model; -- cgit v1.2.3