From 355d4b6f2b2bfe6037533253d8d3e8428d59d992 Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Thu, 31 Mar 2022 13:55:39 +0200
Subject: Dodat je automatski izbor metrika.

---
 .../app/_pages/add-model/add-model.component.html  | 73 +++++++++++-----------
 1 file changed, 35 insertions(+), 38 deletions(-)

(limited to 'frontend/src/app/_pages/add-model/add-model.component.html')

diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index 593d52b7..5e8372c9 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -234,6 +234,8 @@
             </div>
 
             <div class="row p-2">
+                <!--***********************************ENKODER*********************************************-->
+
                 <div class="col-1">
                 </div>
                 <div class="col-3">
@@ -247,6 +249,9 @@
                         </option>
                     </select>
                 </div>
+                
+                <!--***********************************BROJ NEURONA SKRIVENOG SLOJA*********************************************-->
+
                 <div class="col-1">
                 </div>
                 <div class="col-3">
@@ -256,7 +261,8 @@
                     <input type="number" min="1" class="form-control" name="hiddenLayerNeurons"
                         [(ngModel)]="newModel.hiddenLayerNeurons">
                 </div>
-            </div>
+            </div>  
+<!--***********************************OPTIMIZACIJA*********************************************-->
 
             <div class="row p-2">
                 <div class="col-1">
@@ -283,7 +289,7 @@
                 </div>
             </div>
 <!--***********************************LOSS FUNCTION*********************************************-->
-            <div class="row p-2">
+            <div class="row justify-content-center">
                 <div class="col-1">
                 </div>
                 <div class="col-3">
@@ -291,7 +297,7 @@
                 </div>
                 <div class="col-2">
                     <select id=lossFunctionOptions class="form-control" name="lossFunction"
-                        [(ngModel)]="newModel.lossFunction">
+                        [(ngModel)]="newModel.lossFunction" aria-checked="true">
                         <option
                             *ngFor="let option of Object.keys(lossFunction); let optionName of Object.values(lossFunction)"
                             [value]="option">
@@ -301,8 +307,27 @@
                 </div>
                 <div class="col-1">
                 </div>
-
+            </div>
 <!-- ************************************************************************************************** -->
+
+<!--**********************************************METRIKE ZA KOMPAJLER I GRAFIKE***********************************************-->
+
+<hr>
+                <div class="form-check form-check-inline overflow-auto " style="width: max-content;">
+                    <h3>Izaberite metrike:</h3>
+                    <div id="divMetricsinput"  >
+                        
+                        <div *ngFor="let option of Object.keys(metrics); let optionName of Object.values(metrics) "class="form-check form-check-inline">
+                            
+                            <input name="cbmetrics" class="form-check-input" type="checkbox" value="{{option}}" id="metrics_{{option}}" style="float: left;"> 
+                            <label class="form-check-label" for="metrics_{{option}}" for="inlineCheckbox2">
+                                {{optionName}}
+                            </label>
+                        </div>
+                    </div>
+                </div>
+<!--************************************************************************************************* -->
+
                 <div class="col-3 mt-2">
                     <label for="type" class="form-check-label">Nasumičan redosled podataka?</label>
                     <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="newModel.randomOrder"
@@ -310,9 +335,9 @@
                 </div>
                 <div class="col-1">
                 </div>
-            </div>
+            
 
-            <!--<div class="row p-2">
+            <div class="row p-2 justify-content-left">
                 <div class="col-3"></div>
                 <div class="col-3">
                     <label for="hiddenLayerActivationFunction" class="col-form-label">Funkcija aktivacije skrivenih
@@ -332,7 +357,7 @@
                 </div>
                 <div class="col-3"></div>
             </div>
-        -->
+        
             <div class="row p-2">
                 <div class="col-1">
                 </div>
@@ -353,36 +378,8 @@
                         [(ngModel)]="tempTestSetDistribution" [disabled]="!newModel.randomTestSet">
                 </div>
             </div>
-            <div class="col">
-                trening
-                <mat-slider min="10" max="90" step="10" value="10" name="randomTestSetDistribution" thumbLabel
-                    [disabled]="!newModel.randomTestSet" [(ngModel)]="tempTestSetDistribution">
-                </mat-slider>
-                test
-            </div>
+ 
 <!--***********************************AKTIVACIONE FUNKCIJE*********************************************-->            
-<h3 >Aktivacione funkcije</h3>
-           
-            <div class="row p-2" style="align-self: center;">
-                <div class="col-3"></div>
-                <div class="col-3">
-                    <label for="hiddenLayerActivationFunction" class="col-form-label" style="text-align: center;">Funkcija aktivacije skrivenih
-                        slojeva:</label>
-                </div>
-                <div class="col-3">
-                    <div *ngFor="let item of [].constructor(newModel.hiddenLayers); let i = index">
-                        <select [id]="'hiddenLayerActivationFunctionOption_'+i" class="form-control"
-                            [(ngModel)]="newModel.hiddenLayerActivationFunctions[i]">
-                            <option
-                                *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
-                                [value]="option">
-                                {{ optionName }}
-                            </option>
-                        </select>
-                    </div>
-                </div>
-                <div class="col-3"></div>
-            </div>
 
             <div class="row p-2" style="align-self: center;">
                 <div class="col-1">
@@ -405,13 +402,13 @@
                 </div>
 
 
-                <!--<div class="col">
+                <div class="col">
                     trening
                     <mat-slider min="10" max="90" step="10" value="10" name="randomTestSetDistribution" thumbLabel
                         [disabled]="!newModel.randomTestSet" [(ngModel)]="tempTestSetDistribution">
                     </mat-slider>
                     test
-                </div>-->
+                </div>
                 <div class="col">
                 </div>
             </div>
-- 
cgit v1.2.3