Merge branch 'remove_package_size' into 'master'

remove package size parameters

See merge request !155

VadereManager/src/org/vadere/manager/traci/commandHandler/SimulationCommandHandler.java

@@ -211,10 +211,9 @@ public class SimulationCommandHandler extends CommandHandler<SimulationVar> {
 		try {
 			CompoundObject cfg = (CompoundObject) cmd.getVariableValue();
 			//remoteManager.setSimCfg(cfg);
-			packet_size = (int) cfg.getData(0,TraCIDataType.INTEGER);
-			specify_id = Integer.parseInt((String) cfg.getData(1,TraCIDataType.STRING));
-			model_name = (String)  cfg.getData(2,TraCIDataType.STRING);
-			msg_content = (String) cfg.getData(3,TraCIDataType.STRING);
+			specify_id = Integer.parseInt((String) cfg.getData(0,TraCIDataType.STRING));
+			model_name = (String)  cfg.getData(1,TraCIDataType.STRING);
+			msg_content = (String) cfg.getData(2,TraCIDataType.STRING);
 
 			if (!iControlModelHashMap.containsKey(model_name)) {
 				logger.infof("Model" + model_name + " not found. Try to initialize from model name.");

VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java

@@ -123,11 +123,10 @@ public class SimulationCommandHandlerTest extends CommandHandlerTest {
 
 			// set up control command
 			CompoundObject data = CompoundObjectBuilder.builder()
-					.add(TraCIDataType.INTEGER) // packet size
 					.add(TraCIDataType.STRING) // sending node
 					.add(TraCIDataType.STRING) // model name
 					.add(TraCIDataType.STRING) // command
-					.build(-1, "10", "RouteChoice" , "{'time': 8.0}");
+					.build("10", "RouteChoice" , "{'time': 8.0}");
 
 			TraCISetCommand cmd = (TraCISetCommand) getFirstCommand(TraCISetCommand.build(
 					TraCICmd.SET_SIMULATION_STATE, elementID, varID, varType, data));