diff options
Diffstat (limited to 'frontend/src/app')
| -rw-r--r-- | frontend/src/app/_data/Model.ts | 2 | ||||
| -rw-r--r-- | frontend/src/app/_elements/form-model/form-model.component.html | 18 | ||||
| -rw-r--r-- | frontend/src/app/_elements/form-model/form-model.component.ts | 5 |
3 files changed, 16 insertions, 9 deletions
diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts index d1e89e84..7780dc45 100644 --- a/frontend/src/app/_data/Model.ts +++ b/frontend/src/app/_data/Model.ts @@ -29,7 +29,7 @@ export default class Model extends FolderFile { public randomOrder: boolean = true, public randomTestSet: boolean = true, public randomTestSetDistribution: number = 0.1, //0.1-0.9 (10% - 90%) JESTE OVDE ZAKUCANO 10, AL POSLATO JE KAO 0.1 BACK-U - + public validationSize:number=0.1, public isPublic: boolean = false, public accessibleByLink: boolean = false ) { 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 09e44a99..1db6195b 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.html +++ b/frontend/src/app/_elements/form-model/form-model.component.html @@ -97,16 +97,20 @@ <div class="m-2"> <div class="row"> <div class="col-sm-3 rounded" style="border:1px solid var(--ns-primary);margin-top: 10px;"> - <div class="row slider rounded mb-3" style="margin-left: 10px;"> - + <div class="row slider rounded" style="margin-left: 10px;margin-bottom: 0;"> <div class="text-center pt-3 pb-0 mb-0"><b>{{testSetDistribution}}%</b> : <b>{{100-testSetDistribution}}%</b></div> - <div class="text-center pt-0 mt-0">Trening - <mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider> + <div class="text-center pt-0 mt-0 p-0">Trening + <mat-slider min="10" max="90" step="5" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider> Test</div> - + </div> + <div class="row p-0" style="margin-left: 10px;margin-bottom: 0; padding: 0;"> + <mat-checkbox color="accent">Nasumični redosled podataka</mat-checkbox> </div> - <div class="row slider rounded text-offwhite justify-content-center align-items-center" style="margin-left: 10px;"> - <mat-checkbox class="pt-4 mb-3" color="accent">Nasumični redosled podataka</mat-checkbox> + <hr style="color:accent;"> + <div class="row "> + <label>Veličina skupa za validaciju: </label><b>{{validationSize}} %</b> + <mat-slider class="text-center justify-content-center " style="margin-left:80px;" min="10" max="90" step="5" [(ngModel)]="validationSize" (input)="updateValidation($event)"></mat-slider> + </div> 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 e01c2339..c8822992 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.ts +++ b/frontend/src/app/_elements/form-model/form-model.component.ts @@ -18,6 +18,7 @@ export class FormModelComponent implements AfterViewInit { @Input() hideProblemType:boolean; @Input() forProblemType:ProblemType; testSetDistribution: number = 70; + validationSize:number=15; constructor() { this.hideProblemType=false; this.forProblemType=ProblemType.BinaryClassification; @@ -148,4 +149,6 @@ export class FormModelComponent implements AfterViewInit { getInputColumns() { return this.forExperiment.inputColumns.filter(x => x != this.forExperiment.outputColumn); } -} +updateValidation(event: MatSliderChange) { + this.validationSize = event.value!; +}} |