Added better toString for actor plans to help in debugging. Fixed error in precondition tests for the partitions data manager. Added some debug support for the simulattion's planning queue.

Author: shawnhatch

simulation/src/main/java/gov/hhs/aspr/ms/gcm/simulation/nucleus/ActorPlan.java

@@ -42,4 +42,25 @@ public ActorPlan(double time, boolean active) {
 	 * Executes the actor logic associated with the plan.
 	 */
 	protected abstract void execute(ActorContext context);
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("ActorPlan [actorId=");
+		builder.append(actorId);
+		builder.append(", time=");
+		builder.append(time);
+		builder.append(", planner=");
+		builder.append(planner);
+		builder.append(", isActive=");
+		builder.append(isActive);
+		builder.append(", canceled=");
+		builder.append(canceled);
+		builder.append(", arrivalId=");
+		builder.append(arrivalId);
+		builder.append("]");
+		return builder.toString();
+	}
+	
+	
 }

simulation/src/main/java/gov/hhs/aspr/ms/gcm/simulation/nucleus/Simulation.java

@@ -797,7 +797,7 @@ public void execute() {
 			}
 
 			final Plan plan = planningQueue.poll();
-			// System.out.println(plan);
+//			System.out.println(plan+" at time "+time);
 
 			if (plan.isActive) {
 				activePlanCount--;

simulation/src/main/java/gov/hhs/aspr/ms/gcm/simulation/plugins/partitions/datamanagers/PartitionsDataManager.java

@@ -399,9 +399,13 @@ public void init(DataManagerContext dataManagerContext) {
 		dataManagerContext.subscribe(PersonAdditionEvent.class, this::handlePersonAdditionEvent);
 
 		dataManagerContext.subscribe(PersonRemovalEvent.class, this::handlePersonRemovalEvent);
+		
+		dataManagerContext.subscribe(PartitionAdditionMutationEvent.class, this::handlePartitionAdditionMutationEvent);
+		
 
 		reservedEventClasses.add(PersonAdditionEvent.class);
 		reservedEventClasses.add(PersonRemovalEvent.class);
+		
 
 		if (dataManagerContext.stateRecordingIsScheduled()) {
 			dataManagerContext.subscribeToSimulationClose(this::recordSimulationState);
@@ -468,6 +472,8 @@ private void handlePersonRemovalEvent(final DataManagerContext dataManagerContex
 		}
 
 	}
+	private static record PartitionAdditionMutationEvent(Partition partition,Object key) implements Event {
+	}
 
 	/**
 	 * Adds a population partition for the given key and component id. The key must
@@ -485,6 +491,13 @@ private void handlePersonRemovalEvent(final DataManagerContext dataManagerContex
 	 *                           </ul>
 	 */
 	public void addPartition(final Partition partition, final Object key) {
+		dataManagerContext.releaseMutationEvent(
+				new PartitionAdditionMutationEvent(partition, key));
+	}
+	private void handlePartitionAdditionMutationEvent(DataManagerContext dataManagerContext, PartitionAdditionMutationEvent partitionAdditionMutationEvent) {
+		
+		Partition partition = partitionAdditionMutationEvent.partition;
+		Object key =  partitionAdditionMutationEvent.key;
 
 		validatePopulationPartitionNotNull(partition);
 		validatePopulationPartitionKeyNotNull(key);

simulation/src/test/java/gov/hhs/aspr/ms/gcm/simulation/plugins/partitions/datamanagers/AT_PartitionsDataManager.java

@@ -339,8 +339,7 @@ public void testAddPartition() {
 		// precondition: if the partition is null
 		contractException = assertThrows(ContractException.class, () -> {
 			Factory factory2 = PartitionsTestPluginFactory.factory(0, 7407325994321033161L, (c) -> {
-				PartitionsPluginData partitionsPluginData = PartitionsPluginData.builder().build();
-				PartitionsDataManager partitionsDataManager = new PartitionsDataManager(partitionsPluginData);
+				PartitionsDataManager partitionsDataManager = c.getDataManager(PartitionsDataManager.class);
 				Object key = new Object();
 				partitionsDataManager.addPartition(null, key);
 			});
@@ -351,8 +350,7 @@ public void testAddPartition() {
 		// precondition: if the key is null
 		contractException = assertThrows(ContractException.class, () -> {
 			Factory factory2 = PartitionsTestPluginFactory.factory(0, 530075900162852558L, (c) -> {
-				PartitionsPluginData partitionsPluginData = PartitionsPluginData.builder().build();
-				PartitionsDataManager partitionsDataManager = new PartitionsDataManager(partitionsPluginData);
+				PartitionsDataManager partitionsDataManager = c.getDataManager(PartitionsDataManager.class);
 				partitionsDataManager.addPartition(Partition.builder().build(), null);
 			});
 			TestSimulation.builder().addPlugins(factory2.getPlugins()).build().execute();