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

6 files changed, 30 insertions, 33 deletions

diff --git a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts
index 34df38bc..655db9ec 100644
--- a/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts
+++ b/frontend/src/app/_elements/_charts/line-chart/line-chart.component.ts
@@ -9,12 +9,12 @@ import { Chart } from 'chart.js';
 
 export class LineChartComponent implements AfterViewInit {
 
-  dataAcc: number[] = [2,3,5,5,6,7,8,8,4,6,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97];
-  dataMAE: number[] = [2,3,5,5,6,7,8,8,4,6,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97];
-  dataMSE: number[] = [2,3,5,5,6,7,8,8,4,6,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97];
-  dataLOSS: number[] =[2,3,5,5,6,7,8,8,4,6,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97];
+  dataAcc: number[] = [];
+  dataMAE: number[] = [];
+  dataMSE: number[] = [];
+  dataLOSS: number[] = [];
 
-  dataEpoch: number[] = [2,3,5,5,6,7,8,8,4,6,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97,2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97];
+  dataEpoch: number[] = [];
 
   constructor() {
     /*let i = 0;
@@ -77,28 +77,28 @@ export class LineChartComponent implements AfterViewInit {
         },
         options: {
           scales: {
-              x:{
-                ticks: {
-                  color: 'white'
-                },
-                grid: {
-                  color: "rgba(0, 99, 171, 0.5)"
-                }
+            x: {
+              ticks: {
+                color: 'white'
               },
-              y: {
-                  beginAtZero: true,
-                  ticks: {
-                    color: 'white'
-                  },
-                  grid: {
-                    color: "rgba(0, 99, 171, 0.5)"
-                  }
+              grid: {
+                color: "rgba(0, 99, 171, 0.5)"
               }
-              
+            },
+            y: {
+              beginAtZero: true,
+              ticks: {
+                color: 'white'
+              },
+              grid: {
+                color: "rgba(0, 99, 171, 0.5)"
+              }
+            }
+
           }
-          
-          
-      }
+
+
+        }
       }
     );
   }
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index b3c70d1d..fabb524c 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -238,15 +238,12 @@ export class FolderComponent implements AfterViewInit {
 
   deleteFile(file: FolderFile, event: Event) {
     event.stopPropagation();
-    console.log('delete');
+    //console.log('delete');
     switch (this.type) {
       case FolderType.Dataset:
         this.datasetsService.deleteDataset(<Dataset>file).subscribe((response) => {
-          console.log(this.files, this.filteredFiles)
           this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
-          console.log(this.files, this.filteredFiles)
           this.refreshFiles(null);
-          console.log(this.files, this.filteredFiles)
         });
         break;
       case FolderType.Model:
diff --git a/frontend/src/app/_elements/graph/graph.component.ts b/frontend/src/app/_elements/graph/graph.component.ts
index 73c3b1ab..da2c7767 100644
--- a/frontend/src/app/_elements/graph/graph.component.ts
+++ b/frontend/src/app/_elements/graph/graph.component.ts
@@ -43,7 +43,7 @@ export class GraphComponent implements AfterViewInit {
     window.addEventListener('resize', () => { this.resize() });
     this.update();
     this.resize();
-    console.log(this.layers);
+    //console.log(this.layers);
   }
 
   layers: Node[][] = [];
diff --git a/frontend/src/app/_elements/metric-view/metric-view.component.ts b/frontend/src/app/_elements/metric-view/metric-view.component.ts
index 3840692a..6fd2f320 100644
--- a/frontend/src/app/_elements/metric-view/metric-view.component.ts
+++ b/frontend/src/app/_elements/metric-view/metric-view.component.ts
@@ -28,7 +28,7 @@ export class MetricViewComponent implements OnInit {
       myEpochs.push(epoch + 1);
       for (let key in metrics) {
         let value = metrics[key];
-        console.log(key, ':::', value, epoch);
+        //console.log(key, ':::', value, epoch);
         if (key === 'accuracy') {
           myAcc.push(parseFloat(value));
         }
diff --git a/frontend/src/app/_elements/notifications/notifications.component.ts b/frontend/src/app/_elements/notifications/notifications.component.ts
index d64530b9..5716c1e6 100644
--- a/frontend/src/app/_elements/notifications/notifications.component.ts
+++ b/frontend/src/app/_elements/notifications/notifications.component.ts
@@ -24,8 +24,8 @@ export class NotificationsComponent implements OnInit {
       this.signalRService.hubConnection.on("NotifyEpoch", (mName: string, mId: string, stat: string, totalEpochs: number, currentEpoch: number) => {
         const existingNotification = this.notifications.find(x => x.id === mId)
         const progress = ((currentEpoch + 1) / totalEpochs);
-        console.log("Ukupno epoha", totalEpochs, "Trenutna epoha:", currentEpoch);
-        console.log("stat:", stat);
+        //console.log("Ukupno epoha", totalEpochs, "Trenutna epoha:", currentEpoch);
+        //console.log("stat:", stat);
         if (!existingNotification)
           this.notifications.push(new Notification(`Treniranje modela: ${mName}`, mId, progress, true));
         else {
diff --git a/frontend/src/app/_elements/playlist/playlist.component.ts b/frontend/src/app/_elements/playlist/playlist.component.ts
index 7529b36b..7f476178 100644
--- a/frontend/src/app/_elements/playlist/playlist.component.ts
+++ b/frontend/src/app/_elements/playlist/playlist.component.ts
@@ -44,6 +44,6 @@ export class PlaylistComponent implements OnInit {
       }
     });
 
-    console.log(this.tableDatas);
+    //console.log(this.tableDatas);
   }
 }