Browse Source

Adds basic Evaluation Scenario

Andreas T. Meyer-Berg 3 years ago
parent
commit
61ddf95991

+ 4 - 5
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/menuBar/MenuBarNetworkExamples.java

@@ -961,7 +961,7 @@ public class MenuBarNetworkExamples extends JMenu{
 			
 			long new_time = System.currentTimeMillis();
 			long elapsed_time = new_time-currentTime;
-			System.out.println("Training data generation: "+elapsed_time+"ms");
+			System.out.println("Training data generation took: "+elapsed_time+"ms");
 			currentTime = new_time;
 			
 			/*
@@ -972,7 +972,7 @@ public class MenuBarNetworkExamples extends JMenu{
 			//collectorHC.setMode(true);
 			new_time = System.currentTimeMillis();
 			elapsed_time = new_time-currentTime;
-			System.out.println("Training of algorithm: "+elapsed_time+"ms");
+			System.out.println("Training of algorithm took: "+elapsed_time+"ms");
 			currentTime = new_time;
 			
 			
@@ -990,9 +990,8 @@ public class MenuBarNetworkExamples extends JMenu{
 			System.out.println("Test witout anomalies took: "+elapsed_time+"ms");
 			currentTime = new_time;
 			
-			System.out.println("DDoS:");
-			
 			/**
+			 * Light != Sensor
 			 * Value Anomaly 1h
 			 * TODO: Do more complex Anomaly Scenario
 			 */
@@ -1004,7 +1003,7 @@ public class MenuBarNetworkExamples extends JMenu{
 			heaterDevice.setFSval(18.5f);
 			heaterDevice.setFSmax(24);
 			heaterDevice.setLabel((short)-1);//-1 Value anomaly
-			for(int i=27; i<28; i++)
+			for(int i=25; i<26; i++)
 				sim.getSimulationManager().simulateTimeIntervall(hour*i, hour);
 			heaterDevice.setFSmin(min);
 			heaterDevice.setFSmax(max);