correcting simutools2016 results

xtend-epsilon-standalone/src/epsilonStandalone/DNIRunner_Simutools2016.xtend

@@ -13,12 +13,13 @@ class DNIRunner_Simutools2016 extends DNIRunner {
 	  	a.reset()
 //	  	a.start_experiment1(true)
 	  	a.reset()
-//	  	a.start_experiment2()
+	  	a.start_experiment2()
 	  	a.reset()
 //	  	a.start_experiment3_2920()
 	  	a.reset()
 //	  	a.start_experiment3_3500()
 	  	a.reset()
+//	  	a.start_experiment3_3500_new()
 //	  	new DNIRunner_Simutools2016().start_experiment2()
 //	  	new DNIRunner_Simutools2016().start_experiment3_2920()
 //	  	new DNIRunner_Simutools2016().start_experiment3_3500()
@@ -142,7 +143,7 @@ class DNIRunner_Simutools2016 extends DNIRunner {
 		}
 		{
 			var String expName = expNamePrefix+"3500_SW_10Kpps_101.8Gbps_30us";		
-			var param_SdnSwSwitchingLatency = 30
+			var param_SdnSwSwitchingLatency = 90
 			var param_SdnSwSwitchingperfPPS = 10000
 			var boolean param_goOverSdnSW = true
 			var param_SdnHwSwitchingLatency = 3.3
@@ -244,7 +245,7 @@ class DNIRunner_Simutools2016 extends DNIRunner {
 		
 		var int i = 0
 		for(goOverSdnSW : #[true]){
-			for(swlatency : #[10,20,30,40,50]){ //currently in us
+			for(swlatency : #[80,90,100]){ //currently in us
 				for(Integer mtu : mtus){
 					i+=1
 					var param_MTUsize = mtu //1500; //B
@@ -386,6 +387,82 @@ class DNIRunner_Simutools2016 extends DNIRunner {
 		cleanup
 	}
 	
+	public def start_experiment3_3500_new(){
+		
+		simQpnParser.interestingPlaces = newLinkedList("rx_of_Receiver")//, "SW_SDN_Switching_QP_SwitchSDN(HP3500)", "HW_SDN_Switching_QP_SwitchSDN(HP3500)")
+  		simQpnParser.interestingColors = newLinkedList("Flow-iperf_to_iperf-destination")
+  		simQpnParser.interestingMetrics = newLinkedList("arrivThrPut")//, "deptThrPut")
+
+		epsilonTransformationParameters.clear
+		var expNamePrefix = "Experiment3_3500_NEW";
+		
+		var ppsList = (1..10).map[v|v*1000]
+		
+		var int i = 0
+		for(goOverSdnSW : #[true]){
+			for(swlatency : #[70, 80, 90]){ //currently in us
+				for(Integer pps : ppsList){
+					i+=1
+					var param_MTUsize = 1500
+					var param_SdnSwSwitchingLatency = swlatency
+					var param_SdnSwSwitchingperfPPS = pps 
+					
+					var boolean param_goOverSdnSW = goOverSdnSW
+					var param_SdnHwSwitchingLatency = 3.4
+					var param_SdnHwSwitchingperfPPS = 7.57E7
+					var param_SdnHwSwitchingperfBPS = 101.8// prefix G is default *1000*1000*1000
+					
+					var String expName = expNamePrefix+".mtu."+param_MTUsize+".SWlatency."+param_SdnSwSwitchingLatency+".SWpps."+param_SdnSwSwitchingperfPPS+".HWlatency."+param_SdnHwSwitchingLatency+".HWpps."+param_SdnHwSwitchingperfPPS+".goOverSwSDN."+param_goOverSdnSW;
+					
+					
+					var List<Variable> list = newLinkedList()
+					list.add(new Variable("param_goOverSdnSW", param_goOverSdnSW, EolPrimitiveType.Boolean))
+					list.add(new Variable("param_MTUsize", param_MTUsize, EolPrimitiveType.Integer))
+					list.add(new Variable("param_SdnSwSwitchingLatency", param_SdnSwSwitchingLatency, EolPrimitiveType.Real))
+					list.add(new Variable("param_SdnSwSwitchingperfPPS", param_SdnSwSwitchingperfPPS, EolPrimitiveType.Integer))
+					
+					list.add(new Variable("param_SdnHwSwitchingLatency", param_SdnHwSwitchingLatency, EolPrimitiveType.Real))
+					list.add(new Variable("param_SdnHwSwitchingperfPPS", param_SdnHwSwitchingperfPPS, EolPrimitiveType.Integer))
+					list.add(new Variable("param_SdnHwSwitchingperfBPS", param_SdnHwSwitchingperfBPS, EolPrimitiveType.Real))
+					epsilonTransformationParameters.put(expName, list)
+					
+					
+					
+					generateDniModel(dni_base_model_file, list, i, expName)
+				}
+			}
+		}
+		
+		//from here, the expName is accessible only via linked lists!!
+		
+		
+		//dniModels is filled
+		checkDniModels		// eol //optional
+		transformAll		// etl
+		//qpmeModels is filled
+		generateQpeFiles	//egl
+		//qpmeFiles is filled 
+		println("Starting run of "+i+" simulations.")
+		simulateAll			//bash SimQPN simulation
+		//qpmeSimulationResultFiles is filled
+		
+		println("pwdURI "+pwdURI)
+		println("pwdUnix "+pwdUnix)
+		
+		
+				
+				
+		parseAllResults(expNamePrefix+getCurrentTimeStamp+"_final.txt")
+		//qpmeSimulationProcessedResults is filled
+		
+		qpmeSimulationResultFiles.forEach[pair, placeIndex|
+			var p = pair as ExperimentModel
+			println("EXP "+p.experiment+" FILE "+p.modelURI)
+		]
+
+		///cleanup
+		cleanup
+	}
 	public def start_experiment3_2920(){
 		
 		simQpnParser.interestingPlaces = newLinkedList("rx_of_Receiver")//, "SW_SDN_Switching_QP_SwitchSDN(HP3500)", "HW_SDN_Switching_QP_SwitchSDN(HP3500)")