diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-04-07 15:29:19 +0200 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-04-07 15:29:19 +0200 |
| commit | 5e9bba412ed721c095693592ef7379797eb3a110 (patch) | |
| tree | 48e2b2c960f5c5ec801f74143c1b155527e76f39 /frontend/src/app/experiment | |
| parent | 9174136e033421beec30eb3cc574d6e37d090857 (diff) | |
| parent | cc3118ecac17539607f34ce3467347abc56f0240 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/_elements/model-load/model-load.component.html
# frontend/src/app/_elements/model-load/model-load.component.ts
Diffstat (limited to 'frontend/src/app/experiment')
| -rw-r--r-- | frontend/src/app/experiment/experiment.component.html | 12 | ||||
| -rw-r--r-- | frontend/src/app/experiment/experiment.component.ts | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html index ac0735fb..504a1bb0 100644 --- a/frontend/src/app/experiment/experiment.component.html +++ b/frontend/src/app/experiment/experiment.component.html @@ -66,11 +66,9 @@ <label for="columnReplacers" class="form-label">Unesite zamenu za svaku kolonu:</label> <div id="columnReplacers"> <div *ngFor="let column of selectedDataset.columnInfo; let i = index" class="my-3"> - <div *ngIf="getInputById('cb_'+column.columnName).checked" class=""> + <div *ngIf="getInputById('cb_'+column.columnName).checked || selectedOutputColumnVal == column.columnName" class=""> <span class="w-20 mx-3"> - {{column.columnName}} <span class="small" style="color:gray;">( - {{column.numNulls}} - null) + {{column.columnName}} <span class="small" style="color:gray;">({{column.numNulls}} null) </span> </span> @@ -138,6 +136,7 @@ </div> </div> </div> + <!-- <div *ngFor="let column of selectedDataset.columnInfo; let i = index" class="my-3"> <div class="input-group row" *ngIf="getInputById('rb_'+column.columnName).checked"> <span class="input-group-text col-2 text-center"> @@ -160,7 +159,6 @@ <select [id]="'replaceOptions'+i" class="form-control col-2" *ngIf="!column.isNumber" (change)="replace($event, column);"> <option *ngFor="let option of []" [value]="option"> - <!--/*arrayColumn(datasetFile, i)*/--> {{ option }} </option> </select> @@ -182,7 +180,7 @@ (change)="emptyFillTextInput(column.columnName)" checked></label> </div> </div> - + --> </div> </div> </div> @@ -190,7 +188,7 @@ <h2>3. Podešavanja mreže</h2> - <app-model-load></app-model-load> + <app-model-load (selectedModelChangeEvent)="updateModel($event)"></app-model-load> <h2>4. Treniraj model</h2> diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts index ada0484e..6af5d686 100644 --- a/frontend/src/app/experiment/experiment.component.ts +++ b/frontend/src/app/experiment/experiment.component.ts @@ -29,10 +29,15 @@ export class ExperimentComponent implements OnInit { } updateDataset(dataset: Dataset) { - console.log(dataset); + //console.log(dataset); this.selectedDataset = dataset; } + updateModel(model: Model) { + //console.log(model); + this.selectedModel = model; + } + getInputById(id: string): HTMLInputElement { return document.getElementById(id) as HTMLInputElement; } |