From 073081d06aaa87556010b4c810ae030a57a81a6a Mon Sep 17 00:00:00 2001 From: brutzman <brutzman@nps.edu> Date: Sun, 18 Jul 2021 07:45:39 -0700 Subject: [PATCH] explicitly note start/completion, continuing spacing improvements --- .../ExampleSimulationProgram.java | 15 ++++++-- .../ExampleSimulationProgramOutput.txt | 36 ++++++++++--------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java index 5c14850d11..aa798ba67e 100644 --- a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java +++ b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java @@ -19,6 +19,11 @@ import java.util.logging.Logger; /** The purpose of this program is to provide an easily modifiable example simulation program. */ public class ExampleSimulationProgram { + /** + * Output prefix to identify this class, helps with logging + */ + private final static String TRACE_PREFIX = "[" + ExampleSimulationProgram.class.getName() + "] "; + // class variables PduFactory pduFactory = new PduFactory(); DisThreadedNetworkInterface disNetworkInterface; @@ -172,6 +177,8 @@ public class ExampleSimulationProgram */ public static void main(String[] args) { + System.out.println(TRACE_PREFIX + "started..."); + ExampleSimulationProgram thisProgram = new ExampleSimulationProgram(); // creates instance // initial execution: can handle args array of initialization arguments here @@ -192,9 +199,11 @@ public class ExampleSimulationProgram thisProgram.setUpNetworkInterface(); - thisProgram.runSimulation (); // customization code goes in there + thisProgram.runSimulation (); // your simulation execution code goes in there - thisProgram.tearDownNetworkInterface(); + thisProgram.tearDownNetworkInterface(); // make sure no processes are left lingering + + System.out.println(TRACE_PREFIX + "complete."); // report successful completion } /** @@ -207,6 +216,8 @@ public class ExampleSimulationProgram { try { + + final double LOOP_DURATION_SECONDS = 1.0; // seconds final int MAX_LOOP_COUNT = 10; int loopCount = 0; diff --git a/examples/src/OpenDis7Examples/ExampleSimulationProgramOutput.txt b/examples/src/OpenDis7Examples/ExampleSimulationProgramOutput.txt index 9c57bfce8b..929eefb283 100644 --- a/examples/src/OpenDis7Examples/ExampleSimulationProgramOutput.txt +++ b/examples/src/OpenDis7Examples/ExampleSimulationProgramOutput.txt @@ -8,37 +8,39 @@ warning: [options] bootstrap class path not set in conjunction with -source 8 1 warning compile-single: run-single: -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface PANGP Virtual Ethernet Adapter #6 +[OpenDis7Examples.ExampleSimulationProgram] started... +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] Using network interface Intel(R) Centrino(R) Ultimate-N 6300 AGN Network confirmation: address=239.1.2.3 port=3000 ... Pausing for 1.0 seconds sending PDUs for simulation step 1, monitor loopback to confirm sent -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 1 ENTITY_STATE, size 144 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 2 FIRE, size 96 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DISPDUType 22 COMMENT, size 104 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 1. received DISPDUType 1 ENTITY_STATE, size 144 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 2. received DISPDUType 2 FIRE, size 96 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 3. received DISPDUType 22 COMMENT, size 104 bytes) ... PDUs successfully sent ... Pausing for 1.0 seconds sending PDUs for simulation step 2, monitor loopback to confirm sent -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DISPDUType 1 ENTITY_STATE, size 144 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. received DISPDUType 2 FIRE, size 96 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. received DISPDUType 22 COMMENT, size 104 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 4. received DISPDUType 1 ENTITY_STATE, size 144 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 5. received DISPDUType 2 FIRE, size 96 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 6. received DISPDUType 22 COMMENT, size 104 bytes) ... PDUs successfully sent ... Pausing for 1.0 seconds sending PDUs for simulation step 3, monitor loopback to confirm sent -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. received DISPDUType 1 ENTITY_STATE, size 144 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. received DISPDUType 2 FIRE, size 96 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. received DISPDUType 22 COMMENT, size 104 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 7. received DISPDUType 1 ENTITY_STATE, size 144 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 8. received DISPDUType 2 FIRE, size 96 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 9. received DISPDUType 22 COMMENT, size 104 bytes) ... PDUs successfully sent ... Pausing for 1.0 seconds sending PDUs for simulation step 4, monitor loopback to confirm sent -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 10. received DISPDUType 1 ENTITY_STATE, size 144 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 11. received DISPDUType 2 FIRE, size 96 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 12. received DISPDUType 22 COMMENT, size 104 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 10. received DISPDUType 1 ENTITY_STATE, size 144 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 11. received DISPDUType 2 FIRE, size 96 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 12. received DISPDUType 22 COMMENT, size 104 bytes) ... PDUs successfully sent ... Pausing for 1.0 seconds sending PDUs for simulation step 5, monitor loopback to confirm sent -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 13. received DISPDUType 1 ENTITY_STATE, size 144 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 14. received DISPDUType 2 FIRE, size 96 bytes) -[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 15. received DISPDUType 22 COMMENT, size 104 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 13. received DISPDUType 1 ENTITY_STATE, size 144 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 14. received DISPDUType 2 FIRE, size 96 bytes) +[edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface] 15. received DISPDUType 22 COMMENT, size 104 bytes) ... PDUs successfully sent ... Termination condition met, simulationComplete=true -BUILD SUCCESSFUL (total time: 9 seconds) +[OpenDis7Examples.ExampleSimulationProgram] complete. +BUILD SUCCESSFUL (total time: 11 seconds) -- GitLab