Commit 345fec46 authored by Tobias Meuser's avatar Tobias Meuser
Browse files

Added stuff for Dennis

parent 60d7fca3
...@@ -90,7 +90,7 @@ public class DefaultTopologyComponent implements TopologyComponent { ...@@ -90,7 +90,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
private MovementModel movementModel; private MovementModel movementModel;
private PlacementModel placementModel; private PlacementModel placementModel;
private final boolean registerAsInformationProviderInSiS; private final boolean registerAsInformationProviderInSiS;
/** /**
...@@ -131,7 +131,7 @@ public class DefaultTopologyComponent implements TopologyComponent { ...@@ -131,7 +131,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
/* /*
* Legacy support for placement models. * Legacy support for placement models.
*/ */
position.set(placementModel.place(this)); updateCurrentLocation(placementModel.place(this));
} }
if (registerAsInformationProviderInSiS) { if (registerAsInformationProviderInSiS) {
......
...@@ -409,7 +409,9 @@ public class VehicleMovementModel implements MovementModel, EventHandler { ...@@ -409,7 +409,9 @@ public class VehicleMovementModel implements MovementModel, EventHandler {
idComponentMatcher.put(vehicle, simLocationActuator); idComponentMatcher.put(vehicle, simLocationActuator);
hostVehicleIDMatching.put(simLocationActuator.getHost().getId(), vehicle); hostVehicleIDMatching.put(simLocationActuator.getHost().getId(), vehicle);
} else { } else {
throw new RuntimeException("Unable to assign new components. Please increase node amount" + (_reuseComponents?".":" or enable the reuse of components.")); if (idComponentMatcher.size() != 0) {
throw new RuntimeException("Unable to assign new components. Please increase node amount" + (_reuseComponents?".":" or enable the reuse of components."));
}
} }
} }
return idComponentMatcher.get(vehicle); return idComponentMatcher.get(vehicle);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment