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

1 files changed, 58 insertions, 7 deletions

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 396d40c6..33ec85de 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -15,7 +15,6 @@
                         {{ optionName }}
                     </mat-option>
                 </mat-select>
-
             </mat-form-field>
         </div>
 
@@ -93,7 +92,10 @@
 <hr>
 <div class="m-2">
     <app-graph [model]="newModel" [inputCols]="newModel.inputColNum"></app-graph>
-    <div id="layers-control">
+</div>
+<div class="ns-row">
+   
+    <div class ="ns-col" id="layers-control">
         <div>Broj Skrivenih Slojeva</div>
         <button class="btn-clear btn-icon" (click)="addLayer()">
             <mat-icon>add</mat-icon>
@@ -102,18 +104,67 @@
         <button class="btn-clear btn-icon" (click)="removeLayer()">
             <mat-icon>remove</mat-icon>
         </button>
+   
+    </div>
+    <div class="break-1"></div>
+    <div class="ns-col">
+        <mat-form-field appearance="fill">
+            <mat-label>Aktivaciona funkcija svih slojeva</mat-label>
+            
+            <mat-select  [(ngModel)]="selectedActivation" (selectionChange)="changeAllActivation()"  >
+                <mat-option *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)" [value]="option">
+                    {{ optionName }}
+                </mat-option>
+            </mat-select>
+        </mat-form-field>
+    </div>
+   
+    <div class="ns-col">
+        <mat-form-field appearance="fill">
+            <mat-label>Broj Neurona svih slojeva</mat-label>
+            <input matInput type="number" [(ngModel)]="selectedNumberOfNeurons" (change)="changeAllNumberOfNeurons()">
+        </mat-form-field>
+    </div>
+    <div class="break-2"></div>
+    <div class="ns-col">
+        <mat-form-field appearance="fill">
+            <mat-label>Regularizacija svih slojeva</mat-label>
+            <mat-select [(ngModel)]="selectedRegularisation" (selectionChange)="changeAllRegularisation()">
+                <mat-option *ngFor="let option of Object.keys(Regularisation); let optionName of Object.values(Regularisation)" [value]="option">
+                    {{ optionName }}
+                </mat-option>
+            </mat-select>
+        </mat-form-field>
     </div>
+    
+    <div class="ns-col">
+        <mat-form-field appearance="fill">
+            <mat-label>Stopa regularizacije svih slojeva</mat-label>
+            <mat-select [(ngModel)]="selectedRegularisationRate" (selectionChange)="changeAllRegularisationRate()">
+                <mat-option *ngFor="let option of Object.keys(RegularisationRate); let optionName of Object.values(RegularisationRate)" [value]="option">
+                    {{ optionName }}
+                </mat-option>
+            </mat-select>
+        </mat-form-field>
+        </div>
+
+
 </div>
+
+<!--kraj selectall**********************************************************************************-->
 <hr>
 <div id="layers">
 
     <div class="layer" *ngFor="let item of newModel.layers; let i=index">
-        <div class="text-center">
-            #{{i+1}}
-        </div>
+
 
         <mat-form-field appearance="fill">
-            <mat-label>Aktivaciona funkcija</mat-label>
+            <mat-label>Aktivacija</mat-label>
+            <button matPrefix class="btn-clear center-center text-offwhite">        
+                <div>
+                    #{{i+1}}
+                </div>
+            </button>
             <mat-select [(ngModel)]="newModel.layers[i].activationFunction">
                 <mat-option *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)" [value]="option">
                     {{ optionName }}
@@ -126,7 +177,7 @@
             <button class="btn-clear btn-icon" (click)="addNeuron(i)">
                 <mat-icon>add</mat-icon>
             </button>
-            <div class="col-1">{{newModel.layers[i].neurons}}</div>
+            <div class="col-2 text-center" >{{newModel.layers[i].neurons}}</div>
             <button class="btn-clear btn-icon" (click)="removeNeuron(i)">
                 <mat-icon>remove</mat-icon>
             </button>