Backup before adding instrumentation interfaces

Author: Admin

JSimpleSim/src/org/simplesim/core/scheduling/MultiLevelEventQueue.java

@@ -48,7 +48,7 @@ public class MultiLevelEventQueue<E> implements EventQueue<E> {
 
 	private final static int TIER2_DEFAULT_CHUNK_SIZE=128;
 
-	private Queue<EventQueueEntry<E>> tier1=new PriorityQueue<>(); // current events, sorted
+	private final Queue<EventQueueEntry<E>> tier1=new PriorityQueue<>(TIER2_DEFAULT_CHUNK_SIZE); // current events, sorted
 	private final List<Collection<EventQueueEntry<E>>> tier2=new ArrayList<>();// near future events, partly sorted
 	private final Collection<EventQueueEntry<E>> tier3=new ArrayList<>(); // far future events, unsorted
 
@@ -187,7 +187,7 @@ public Time getTime(E event) {
 
 	private void refillTier1() {
 		if (indexTier2>=maxIndexTier2) refillTier2();
-		tier1=new PriorityQueue<>(tier2.get(indexTier2)); // heapify() only called once when init with a collection.
+		tier1.addAll(tier2.get(indexTier2)); 
 		tier2.get(indexTier2).clear();
 		indexTier2++;
 		actTimeTier2+=bucketWidth;

JSimpleSim/src/org/simplesim/examples/elevator/DynamicMain.java

@@ -13,6 +13,7 @@
 import org.simplesim.examples.elevator.dyn.Floor;
 import org.simplesim.examples.elevator.shared.Limits;
 import org.simplesim.examples.elevator.shared.View;
+import org.simplesim.model.InstrumentationDecorator;
 import org.simplesim.model.MessageForwardingStrategy;
 import org.simplesim.model.RoutedMessageForwarding;
 import org.simplesim.simulator.ConcurrentDESimulator;
@@ -25,21 +26,23 @@
  * <p>
  * To illustrate differences of a static and a dynamic modeling approach, both
  * are used with the same simulation problem: the steering strategy of an
- * elevator. Common data structure, the steering algorithm and the graphical
- * representation are shared, so the focus lies on the differences of both
- * approaches:
+ * elevator. Steering algorithm, graphical representation and common data structures are shared, 
+ * so the focus lies on the differences of both approaches:
  * <p>
  * <u>Static model:</u>
  * <ul>
- * <li>Visitors store their current floor in their state.
+ * <li>There are no model changes.
+ * <li>Visitors store their current floor as part of their state.
  * <li>Ports of elevator and visitor are connected directly.
- * <li>
+ * <li>Direct message forwarding is used.
+ * </ul>
+ * <u>Dynamic model:</u>
+ * <ul>
+ * <li>Each floor is represented by a submodel containing its visitors.
+ * <li>Change of the floor is implemented as moving to an other submodel, the model is changed repeatedly during simulation run.
+ * <li>The model hierarchy Building-->Floor-->Visitor represents the real world situation comprehensibly.
+ * <li>Messaging is done by a routing mechanism.
  * </ul>
- *
- * 
- * (no model changes) (model is changed during the simulation run) nThis is the
- * dynamic variant of the elevator simulation example to illustrate differences
- * from the static apporach.
  */
 public class DynamicMain {
 
@@ -56,6 +59,7 @@ public static void main(String[] args) {
 		model.addEntity(elevator);
 		final Floor lobby=new Floor(Limits.LOBBY);
 		model.addEntity(lobby);
+		lobby.addEntity(new InstrumentationDecorator(new DynamicVisitor(model)));
 		for (int i=0; i<Limits.VISITORS; i++) lobby.addEntity(new DynamicVisitor(model));
 		for (int floor=1; floor<=Limits.MAX_FLOOR; floor++) model.addEntity(new Floor(floor));
 

JSimpleSim/src/org/simplesim/examples/elevator/StaticMain.java

@@ -17,6 +17,30 @@
 import org.simplesim.simulator.ConcurrentDESimulator;
 import org.simplesim.simulator.Simulator;
 
+/**
+ * Example of a multi-domain agent system with routed messaging and dynamic
+ * model changes
+ * <p>
+ * To illustrate differences of a static and a dynamic modeling approach, both
+ * are used with the same simulation problem: the steering strategy of an
+ * elevator. Steering algorithm, graphical representation and common data structures are shared, 
+ * so the focus lies on the differences of both approaches:
+ * <p>
+ * <u>Static model:</u>
+ * <ul>
+ * <li>There are no model changes.
+ * <li>Visitors store their current floor as part of their state.
+ * <li>Ports of elevator and visitor are connected directly.
+ * <li>Direct message forwarding is used.
+ * </ul>
+ * <u>Dynamic model:</u>
+ * <ul>
+ * <li>Each floor is represented by a submodel containing its visitors.
+ * <li>Change of the floor is implemented as moving to an other submodel, the model is changed repeatedly during simulation run.
+ * <li>The model hierarchy Building-->Floor-->Visitor represents the real world situation comprehensibly.
+ * <li>Messaging is done by a routing mechanism.
+ * </ul>
+ */
 public class StaticMain {
 
 	/**

JSimpleSim/src/org/simplesim/examples/gameoflife/Main.java

@@ -7,7 +7,6 @@
 
 import org.simplesim.core.scheduling.Time;
 import org.simplesim.model.DirectMessageForwarding;
-import org.simplesim.simulator.ConcurrentTSSimulator;
 import org.simplesim.simulator.SequentialTSSimulator;
 import org.simplesim.simulator.Simulator;
 

JSimpleSim/src/org/simplesim/model/InstrumentationDecorator.java

@@ -29,7 +29,7 @@
  */
 public class InstrumentationDecorator implements Agent {
 
-	/* the encapsulated simulator */
+	/* the encapsulated agent */
 	private final Agent agent;
 
 	// listeners to notify BEFORE agent is called

JSimpleSim/src/org/simplesim/model/ModelEntity.java

@@ -0,0 +1,15 @@
+/*
+ * JSimpleSim is a framework to build multi-agent systems in a quick and easy way. This software is published as open
+ * source and licensed under the terms of GNU GPLv3.
+ * 
+ * Contributors: - Rene Kuhlemann - development and initial implementation
+ */
+package org.simplesim.model;
+
+/**
+ * 
+ *
+ */
+public interface ModelEntity {
+
+}