Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/_pages/add-model/add-model.component.html
#	frontend/src/app/_pages/add-model/add-model.component.ts

1 files changed, 27 insertions, 32 deletions

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 62468b2d..97b35b7a 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -287,6 +287,8 @@
             </div>
 
             <div class="row p-2">
+                <!--***********************************ENKODER*********************************************-->
+
                 <div class="col-1">
                 </div>
                 <div class="col-3">
@@ -300,6 +302,9 @@
                         </option>
                     </select>
                 </div>
+
+                <!--***********************************BROJ NEURONA SKRIVENOG SLOJA*********************************************-->
+
                 <div class="col-1">
                 </div>
                 <div class="col-3">
@@ -310,6 +315,7 @@
                         [(ngModel)]="newModel.hiddenLayerNeurons">
                 </div>
             </div>
+            <!--***********************************OPTIMIZACIJA*********************************************-->
 
             <div class="row p-2">
                 <div class="col-1">
@@ -335,7 +341,6 @@
                     <input type="number" min="1" class="form-control" name="batchSize" [(ngModel)]="newModel.batchSize">
                 </div>
             </div>
-            <!--***********************************LOSS FUNCTION*********************************************-->
             <div class="row p-2">
                 <div class="col-1">
                 </div>
@@ -344,7 +349,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">
@@ -352,40 +357,14 @@
                         </option>
                     </select>
                 </div>
-                <div class="col-1">
-                </div>
-
-                <!-- ************************************************************************************************** -->
+                <div class="col-1"></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"
                         type="checkbox" value="" checked>
                 </div>
-                <div class="col-1">
-                </div>
             </div>
-
-            <!--<div class="row p-2">
-                <div class="col-3"></div>
-                <div class="col-3">
-                    <label for="hiddenLayerActivationFunction" class="col-form-label">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="border m-3">
                 <div class="row p-2 m-2">
                     <div class="col-4">
@@ -465,10 +444,26 @@
             </div>
         </div>
 
-
         <br><br>
+        <!--**********************************************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>
         <!--<app-annvisual [model]="newModel"></app-annvisual>-->
-        <br><br>
         <div class="form-group row mt-5 mb-3">
             <div class="col"></div>
             <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"