From dac8e0f3a723a43013d6412def50ca04e7976b1f Mon Sep 17 00:00:00 2001 From: TAMARA JERINIC Date: Mon, 16 May 2022 00:54:23 +0200 Subject: Promenjen font i naziv arhive. --- frontend/src/app/_pages/experiment/experiment.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'frontend/src/app/_pages/experiment/experiment.component.html') diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index a2ede838..4c9d0222 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -38,8 +38,8 @@

Odaberite parametre i trenirajte model

- Pregled rezultata treniranja -

Pregledajte tok treniranja i grafički prikaz rezultata

+ Pregled rezultata
treniranja +

Pregledajte tok treniranja i
grafički prikaz rezultata

 -- cgit v1.2.3 From 743646bb658911b0d89fa08815fbc3872e4223a0 Mon Sep 17 00:00:00 2001 From: Sonja Galovic Date: Mon, 16 May 2022 17:57:01 +0200 Subject: Form-model: stopa ucenja postavljena na 0.01 difoltno. Home-page: izmenjeni neki fontovi i velicina, tekst vise ne izgleda kao link. --- frontend/src/app/_data/Model.ts | 2 +- .../_elements/form-model/form-model.component.html | 6 +- .../_pages/experiment/experiment.component.html | 82 +++++++++++----------- frontend/src/app/_pages/home/home.component.css | 10 +++ frontend/src/app/_pages/home/home.component.html | 8 +-- 5 files changed, 59 insertions(+), 49 deletions(-) (limited to 'frontend/src/app/_pages/experiment/experiment.component.html') diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts index 05d17e01..8fc36a31 100644 --- a/frontend/src/app/_data/Model.ts +++ b/frontend/src/app/_data/Model.ts @@ -21,7 +21,7 @@ export default class Model extends FolderFile { public metrics: string[] = [], // TODO add to add-model form public epochs: number = 5, // TODO add to add-model form public inputColNum: number = 5, - public learningRate: LearningRate = LearningRate.LR1, + public learningRate: LearningRate = LearningRate.LR3, public layers: Layer[] = [new Layer()], // Test set settings diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html index 1db6195b..97e38cf1 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.html +++ b/frontend/src/app/_elements/form-model/form-model.component.html @@ -11,12 +11,12 @@
Tip problema - + {{ optionName }} - + {{ optionName }} @@ -102,7 +102,7 @@
Trening Test
-
+
Nasumični redosled podataka
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 4c9d0222..20ff33d1 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -1,47 +1,47 @@
-
-
- Novi Eksperiment -
-
- {{experiment.name}} -
+
+
+ Novi Eksperiment +
+
+ {{experiment.name}} +
-
- - - - - Izvor podataka - {{dataset.name}} - - -

Izaberite vas izvor podataka

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

Pripremite podatke i izaberite izlazne kolone

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

Odaberite parametre i trenirajte model

- - - Pregled rezultata
treniranja -

Pregledajte tok treniranja i
grafički prikaz rezultata

- - +
+ + + + + Izvor podataka + {{dataset.name}} + + +

Izaberite izvor podataka

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

Pripremite podatke i izaberite izlazne kolone

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

Odaberite parametre i trenirajte model

+ + + Pregled rezultata
treniranja +

Pregledajte tok treniranja i
grafički prikaz rezultata

+ +
@@ -66,4 +66,4 @@
- + \ No newline at end of file diff --git a/frontend/src/app/_pages/home/home.component.css b/frontend/src/app/_pages/home/home.component.css index 906f5728..51f22320 100644 --- a/frontend/src/app/_pages/home/home.component.css +++ b/frontend/src/app/_pages/home/home.component.css @@ -11,10 +11,20 @@ h1 { font-weight: 900 !important; margin-top: 1rem; margin-bottom: 2.5rem; + font-family: /*'Garamond',*/ + 'Courier New', Courier, monospace; } .card { margin: 2.5rem !important; padding: 1.5rem; width: 26rem !important; +} + +a { + text-decoration: none; +} + +.subtitle-class { + letter-spacing: 0.2rem; } \ No newline at end of file diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html index 2825b3bf..9b559bc9 100644 --- a/frontend/src/app/_pages/home/home.component.html +++ b/frontend/src/app/_pages/home/home.component.html @@ -11,9 +11,9 @@
model_training -

Experimentiši

+

Eksperimentiši

- U tri koraka napravite novu neuronsku mrežu. Koristite postojeće izvore podataka, modele, itd. + U tri koraka napravite novu neuronsku mrežu. Koristite postojeće izvore podataka, modele, itd.

@@ -21,9 +21,9 @@
storage -

Arhiva

+

Arhiva

- Upravljajte izvorima podataka, eksperimentima, modelima, i rezultatima treniranja. Pogledajte podatke koje su podelili drugi korisnici. + Upravljajte izvorima podataka, eksperimentima, modelima i rezultatima treniranja. Pogledajte podatke koje su podelili drugi korisnici.

-- cgit v1.2.3 From db8cfdd644511f47bf473d8f9efd6f6cebc65519 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Tue, 17 May 2022 22:16:31 +0200 Subject: Zabranjeno korisniku da prelazi na sledece korake ukoliko ne ispuni prethodni. --- .../_pages/experiment/experiment.component.html | 23 +++++++++++++--------- .../app/_pages/experiment/experiment.component.ts | 9 +++++++++ 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'frontend/src/app/_pages/experiment/experiment.component.html') diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 20ff33d1..8b8e7181 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -10,35 +10,40 @@ - - + + - Izvor podataka + Izvor podataka {{dataset.name}}

Izaberite izvor podataka

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

Pripremite podatke i izaberite izlazne kolone

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

Odaberite parametre i trenirajte model

 - - Pregled rezultata
treniranja + + + lock + Pregled rezultata
treniranja +

Pregledajte tok treniranja i
grafički prikaz rezultata

 diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index abf4b697..ee9cca8c 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -32,6 +32,12 @@ export class ExperimentComponent implements AfterViewInit { @ViewChild("folderModel") folderModel!: FolderComponent; @ViewChild("metricView") metricView!: MetricViewComponent; + step1:boolean=false; + //step2:boolean=false; + step3:boolean=false; + step4:boolean=false; + + constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService, private signalRService: SignalRService) { this.experiment = new Experiment("exp1"); } @@ -49,6 +55,7 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrain._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); + this.step4=true; } } @@ -157,6 +164,7 @@ export class ExperimentComponent implements AfterViewInit { this.dataset = d; this.columnTable.loadDataset(this.dataset); + this.step1=true; } @@ -165,5 +173,6 @@ export class ExperimentComponent implements AfterViewInit { setModel(model: FolderFile) { const m = model; this.modelToTrain = m; + this.step3=true; } } -- cgit v1.2.3 From 8b539c658eda714a9886e169f7cd37953efff762 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Tue, 17 May 2022 22:17:32 +0200 Subject: Lock centriran vertikalno. --- frontend/src/app/_pages/experiment/experiment.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'frontend/src/app/_pages/experiment/experiment.component.html') diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 8b8e7181..e521ce23 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -24,7 +24,7 @@ Predvideti:{{experiment.outputColumn}} - lock + lock Odabir kolona @@ -33,7 +33,7 @@ - lock + lock {{modelToTrain.name}} Treniranje @@ -41,7 +41,7 @@ - lock + lock Pregled rezultata
treniranja

Pregledajte tok treniranja i
grafički prikaz rezultata

-- cgit v1.2.3 From 7c0c09c94246441bca36d873769fc420feb00937 Mon Sep 17 00:00:00 2001 From: Danijel Anđelković Date: Wed, 18 May 2022 20:49:57 +0200 Subject: Podesio korake eksperimenta tako da korisnik ne moze da skroluje do koraka koje nije otkljucao. Promenio slajdere za trening, test, validacione skupove tako da se vide minimumi od 10%. Popravio skrolove koji nisu trebali da se pojavljuju, i dimenzije nekih elemenata. --- .../src/app/_elements/folder/folder.component.css | 9 +++--- .../src/app/_elements/folder/folder.component.ts | 4 ++- .../_elements/form-model/form-model.component.css | 34 +++++++++++++++++--- .../_elements/form-model/form-model.component.html | 37 ++++++++++++++-------- .../src/app/_elements/graph/graph.component.html | 2 +- .../app/_pages/experiment/experiment.component.css | 16 ++++++---- .../_pages/experiment/experiment.component.html | 6 ++-- .../app/_pages/experiment/experiment.component.ts | 25 +++++++++------ 8 files changed, 88 insertions(+), 45 deletions(-) (limited to 'frontend/src/app/_pages/experiment/experiment.component.html') diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index 3ecba343..4a06faa4 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -1,7 +1,5 @@ #folder { - /*position: absolute; - left: 50%; - transform: translateX(-50%);*/ + width: 100%; } #tabs { @@ -167,12 +165,13 @@ align-items: center; flex-grow: 1; height: 100%; + padding: 50px; } .folder-inside { width: 100%; - height: 40rem; - overflow-y: auto; + min-height: 40rem; + max-height: 100%; } .file-content { diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index b09cb543..735bfdaa 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -434,7 +434,9 @@ export class FolderComponent implements AfterViewInit { updateExperiment() { if (this.formModel) { - this.formModel.updateGraph(); + setTimeout(() => { + this.formModel.updateGraph(); + }); } } diff --git a/frontend/src/app/_elements/form-model/form-model.component.css b/frontend/src/app/_elements/form-model/form-model.component.css index 95ace1ef..34c1a5c5 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.css +++ b/frontend/src/app/_elements/form-model/form-model.component.css @@ -86,12 +86,12 @@ hr { max-height: 20 rem; } -mat-slider { - width: 50%; -} - .slider { background-color: transparent; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; } .center-center { @@ -102,3 +102,29 @@ mat-slider { font-size: 20px !important; font-weight: 600; } + +.slider-pad { + min-width: 10%; + background-color: gray; + height: 2px; +} + +.slider-pad:first-child { + margin-right: -8px; +} + +.slider-pad:last-child { + margin-left: -8px; +} + +.slider-extended { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + width: 95%; +} + +.slide { + width: 80%; +} \ No newline at end of file diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html index 1b4eb834..c7a9d5ca 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.html +++ b/frontend/src/app/_elements/form-model/form-model.component.html @@ -91,24 +91,33 @@
-
-
+
+ +
+
+ Trening {{testSetDistribution}}% : Test i validacija {{100-testSetDistribution}}% +
+
+
+ +
+
+
+ Test {{validationSize}}% : Validacija {{100-validationSize}}% +
+
+
+ +
+
-
-
- {{validationSize}} % - +
+ Nasumični redosled podataka
- -
diff --git a/frontend/src/app/_elements/graph/graph.component.html b/frontend/src/app/_elements/graph/graph.component.html index 35753d40..411e8b53 100644 --- a/frontend/src/app/_elements/graph/graph.component.html +++ b/frontend/src/app/_elements/graph/graph.component.html @@ -1,4 +1,4 @@ -
+
- Izvor podataka - {{dataset.name}} + Izvor podataka + {{dataset.name}} -

Izaberite izvor podataka

+

Izaberite izvor podataka

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

Pripremite podatke i izaberite izlazne kolone

+

Pripremite podatke i izaberite izlazne kolone

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

Odaberite parametre i trenirajte model

+

Odaberite parametre i trenirajte model

 lock - Pregled rezultata
treniranja + Pregled rezultata
treniranja -

Pregledajte tok treniranja i
grafički prikaz rezultata

+

Pregledajte tok treniranja i
grafički prikaz rezultata
-- cgit v1.2.3 From 8ce1b7f95b1464587b4f2d9518aaa714d4f76915 Mon Sep 17 00:00:00 2001 From: Ognjen Cirkovic Date: Thu, 19 May 2022 20:21:59 +0200 Subject: Centriran katanac na koraku 4. --- frontend/src/app/_pages/experiment/experiment.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontend/src/app/_pages/experiment/experiment.component.html') diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index e807dd06..17a6539d 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -42,7 +42,7 @@ lock - Pregled rezultata
treniranja + Pregled rezultata
treniranja

Pregledajte tok treniranja i
grafički prikaz rezultata

 -- cgit v1.2.3