From 345fec466c4b20ca18f8470c0fdc84ca07137648 Mon Sep 17 00:00:00 2001 From: Tobias Meuser Date: Fri, 30 Nov 2018 14:15:38 +0100 Subject: [PATCH] Added stuff for Dennis --- .../kom/p2psim/impl/topology/DefaultTopologyComponent.java | 4 ++-- .../p2psim/impl/topology/movement/VehicleMovementModel.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java b/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java index a61e1b0b..8b404fb7 100644 --- a/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java +++ b/src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java @@ -90,7 +90,7 @@ public class DefaultTopologyComponent implements TopologyComponent { private MovementModel movementModel; private PlacementModel placementModel; - + private final boolean registerAsInformationProviderInSiS; /** @@ -131,7 +131,7 @@ public class DefaultTopologyComponent implements TopologyComponent { /* * Legacy support for placement models. */ - position.set(placementModel.place(this)); + updateCurrentLocation(placementModel.place(this)); } if (registerAsInformationProviderInSiS) { diff --git a/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java b/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java index cf68609c..27ed3b19 100644 --- a/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java +++ b/src/de/tud/kom/p2psim/impl/topology/movement/VehicleMovementModel.java @@ -409,7 +409,9 @@ public class VehicleMovementModel implements MovementModel, EventHandler { idComponentMatcher.put(vehicle, simLocationActuator); hostVehicleIDMatching.put(simLocationActuator.getHost().getId(), vehicle); } 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); -- GitLab