diff --git a/assignments/src/MV3500Cohort2023MarchJune/homework3/Oblak/ExampleSimulationProgramLog.txt b/assignments/src/MV3500Cohort2023MarchJune/homework3/Oblak/ExampleSimulationProgramLog.txt new file mode 100644 index 0000000000000000000000000000000000000000..98a0e3d775fc5126379119fd4afbbff91136509b Binary files /dev/null and b/assignments/src/MV3500Cohort2023MarchJune/homework3/Oblak/ExampleSimulationProgramLog.txt differ diff --git a/examples/src/SimkitOpenDis7Examples/TwoCraneBerths.java b/examples/src/SimkitOpenDis7Examples/TwoCraneBerths.java index f0555181469d0fbc8ff641b3164bfa85e72887aa..a10641544236b4071ee0455fd9e22c417326d7fa 100644 --- a/examples/src/SimkitOpenDis7Examples/TwoCraneBerths.java +++ b/examples/src/SimkitOpenDis7Examples/TwoCraneBerths.java @@ -9,7 +9,8 @@ import simkit.SimEntityBase; * Model two crane berths * @author abuss@nps.edu */ -public class TwoCraneBerths extends SimEntityBase { +public class TwoCraneBerths extends SimEntityBase +{ /** * Queue of Ships waiting to go into the berth @@ -47,14 +48,15 @@ public class TwoCraneBerths extends SimEntityBase { super.reset(); queue.clear(); berth.clear(); - timeInSystem = Double.NaN; - delayInQueue = Double.NaN; + timeInSystem = Double.NaN; // Not a Number + delayInQueue = Double.NaN; // Not a Number } /** * Only PropertyChangeEvents */ - public void doRun() { + public void doRun() + { firePropertyChange("queue", getQueue()); firePropertyChange("berth", getBerth()); firePropertyChange("timeInSystem", getTimeInSystem()); diff --git a/examples/src/SimkitOpenDis7Examples/TwoCraneBerthsOpenDis7.java b/examples/src/SimkitOpenDis7Examples/TwoCraneBerthsOpenDis7.java index 6482e6ef272c099d03fa88f81c99008ff8ebeba0..26a48ac1617bc10cf74c4e154dd8824740b49493 100644 --- a/examples/src/SimkitOpenDis7Examples/TwoCraneBerthsOpenDis7.java +++ b/examples/src/SimkitOpenDis7Examples/TwoCraneBerthsOpenDis7.java @@ -183,7 +183,7 @@ public class TwoCraneBerthsOpenDis7 extends SimEntityBase */ public void doStartUnloadingOneCrane() { SortedSet<Ship> oldQueue = getQueue(); - Ship ship = queue.first(); // TODO rename ship queue + Ship ship = queue.first(); queue.remove(ship); firePropertyChange("queue", oldQueue, getQueue()); @@ -196,6 +196,7 @@ public class TwoCraneBerthsOpenDis7 extends SimEntityBase berth.add(ship); firePropertyChange("berth", oldBerth, getBerth()); + // log crane operations for each ship shipCount++; if (shipCount == 1) @@ -212,7 +213,6 @@ public class TwoCraneBerthsOpenDis7 extends SimEntityBase waitDelay("EndUnloadingOneCrane", ship.getRemainingUnloadingTime(), ship); } - /** * Perform crane container unloading operations and send PDUs to report progress * @param simkitTimeStamp simkit timeStamp when crane operations began @@ -324,7 +324,7 @@ public class TwoCraneBerthsOpenDis7 extends SimEntityBase /** * Shutdown DIS network interfaces, enabling program termination */ - public void shutdown() + public void shutdownDisChannel() { if (disChannel != null) { diff --git a/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java index e579782fc3a4e21a7ff5769cc11d529e67f4fe5d..33c69a794c58bd62f9e09d737c5482a085d11536 100644 --- a/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java +++ b/examples/src/SimkitOpenDis7Examples/run/RunTwoCraneBerthsOpenDis7.java @@ -91,7 +91,7 @@ public class RunTwoCraneBerthsOpenDis7 System.out.printf("Average delay in queue:\t\t%.4f%n", delayInQueueStat.getMean()); - twoCraneBerthsOpenDis7.shutdown(); + twoCraneBerthsOpenDis7.shutdownDisChannel(); System.exit(0); } }