diff --git a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/LennonSimulationProgram.java b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/LennonSimulationProgram.java
new file mode 100644
index 0000000000000000000000000000000000000000..a6bf39142a82b9a8f07e507e3acb7540398aac60
--- /dev/null
+++ b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/LennonSimulationProgram.java
@@ -0,0 +1,421 @@
+/**
+ * Copyright (c) 2008-2023, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
+ * This work is provided under a BSD open-source license, see project license.html or license.txt
+ * @author brutzman@nps.edu
+ */
+package MV3500Cohort2024JulySeptember.homework3.Lennon;
+
+import edu.nps.moves.dis7.entities.swe.platform.surface._001Poseidon;
+import edu.nps.moves.dis7.entities.swe.platform.surface._002Triton;
+import edu.nps.moves.dis7.enumerations.*;
+import edu.nps.moves.dis7.pdus.*;
+import edu.nps.moves.dis7.utilities.DisChannel;
+import edu.nps.moves.dis7.utilities.PduFactory;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** The purpose of this inheritable class is to provide an easily modifiable
+ * example simulation program that includes DIS-capable entities performing
+ * tasks of interest, and then reporting activity via PDUs to the network.
+ * Default program initialization includes PDU recording turned on by default.
+ * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt" target="_blank">ExampleSimulationProgramLog.txt</a>
+ * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramPduCaptureLog.dislog" target="_blank">ExampleSimulationProgramPduCaptureLog.dislog</a>
+ * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramFlowDiagram.pdf" target="_blank">ExampleSimulationProgramFlowDiagram.pdf</a>
+ * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramWireshark.png" target="_blank">ExampleSimulationProgramWireshark.png</a>
+ * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramSequenceDiagram.png" target="_blank">ExampleSimulationProgramSequenceDiagram.png</a>
+ */
+public class LennonSimulationProgram
+{
+ /* **************************** infrastructure code, modification is seldom needed ************************* */
+
+ private String descriptor = this.getClass().getSimpleName();
+ /** DIS channel defined by network address/port combination includes multiple utility capabilities */
+ protected DisChannel disChannel;
+ /** Factory object used to create new PDU instances */
+ protected PduFactory pduFactory;
+
+ /** seconds per loop for real-time or simulation execution */
+ private double simulationTimeStepDuration = 1.0; // seconds TODO encapsulate
+ /** initial simulation time in seconds */
+ double simulationTimeInitial = 0.0;
+ /** current simulation time in seconds */
+ double simulationTimeSeconds = simulationTimeInitial;
+ /** Maximum number of simulation loops */
+ int MAX_LOOP_COUNT = 4;
+
+ String narrativeMessage1 = new String();
+ String narrativeMessage2 = new String();
+ String narrativeMessage3 = new String();
+
+ /** EntityID settings for entity 1 */
+ protected EntityID entityID_1 = new EntityID();
+ /** EntityID settings for entity 2 */
+ protected EntityID entityID_2 = new EntityID();
+ /** ESPDU for entity 1 */
+ protected EntityStatePdu entityStatePdu_1;
+ /** ESPDU for entity 2 */
+ protected EntityStatePdu entityStatePdu_2;
+ /** FirePdu for entity 1 first weapon (if any) */
+ protected FirePdu firePdu_1a;
+ /** FirePdu for entity 1 second weapon (if any) */
+ protected FirePdu firePdu_1b;
+ /** MunitionDescriptor for these weapons */
+ protected MunitionDescriptor munitionDescriptor1;
+
+ // hey programmer, what other state do you want? this is a good place to declare it...
+
+ /**
+ * Constructor to create an instance of this class.
+ * Design goal: additional built-in initialization conveniences can go here
+ * to keep your efforts focused on the runSimulation() method.
+ */
+ // base constructor is not invoked automatically by other constructors
+ // https://stackoverflow.com/questions/581873/best-way-to-handle-multiple-constructors-in-java
+ public LennonSimulationProgram()
+ {
+ initialize();
+ }
+ /**
+ * Constructor to create an instance of this class.
+ * @param newDescriptor describes this program, useful for logging and debugging
+ */
+ public LennonSimulationProgram(String newDescriptor)
+ {
+ descriptor = newDescriptor;
+ initialize();
+ }
+ /**
+ * Utility Constructor that allows your example simulation program to override default network address and port
+ * @param address network address to use
+ * @param port corresponding network port to use
+ */
+ public LennonSimulationProgram(String address, int port)
+ {
+ disChannel.setNetworkAddress (address);
+ disChannel.setNetworkPort (port);
+ disChannel.setVerboseComments (true); // TODO rename library method to disambiguate CommentPDU
+ // TODO still seems really chatty... add silent mode?
+ disChannel.setVerboseDisNetworkInterface(true); // Default false
+ disChannel.setVerbosePduRecorder (true); // default false
+ initialize();
+ }
+
+ /** Initialize channel setup for OpenDis7 and report a test PDU
+ * @see initializeDisChannel
+ * @see initializeSimulationEntities */
+ private void initialize()
+ {
+ initializeDisChannel(); // must come first, uses PduFactory
+
+ initializeSimulationEntities(); // set unchanging parameters
+
+ disChannel.join(); // TODO further functionality expected
+
+ String timeStepMessage = "Simulation timestep duration " + getSimulationTimeStepDuration() + " seconds";
+ disChannel.sendCommentPdu(simulationTimeSeconds, DisChannel.COMMENTPDU_SIMULATION_TIMESTEP, timeStepMessage);
+ // additional constructor initialization can go here
+ }
+
+ /** Initialize channel setup for OpenDis7 and report a test PDU */
+ private void initializeDisChannel()
+ {
+ if (disChannel == null)
+ disChannel = new DisChannel();
+ else
+ {
+ disChannel.printlnTRACE ("*** warning, duplicate invocation of initializeDisChannel() ignored");
+ return;
+ }
+ pduFactory = disChannel.getPduFactory();
+ disChannel.setDescriptor(this.getClass().getSimpleName()); // ExampleSimulationProgram might be a superclass
+ disChannel.setUpNetworkInterface();
+ disChannel.printlnTRACE ("just checking: disChannel.getNetworkAddress()=" + disChannel.getNetworkAddress() +
+ ", getNetworkPort()=" + disChannel.getNetworkPort());
+ disChannel.getDisNetworkInterface().setVerbose(true); // sending and receipt
+ disChannel.printlnTRACE ("just checking: hasVerboseSending()=" + disChannel.getDisNetworkInterface().hasVerboseSending() +
+ ", hasVerboseReceipt()=" + disChannel.getDisNetworkInterface().hasVerboseReceipt());
+ disChannel.getPduRecorder().setVerbose(true);
+
+ // TODO confirm whether recorder is explicitly started by programmer (or not)
+
+// disChannel.sendCommentPdu(VariableRecordType.OTHER, "DisThreadedNetworkInterface.initializeDisChannel() complete"); // hello channel, debug
+ }
+
+ /** Get ready, get set... initialize simulation entities. Who's who in the zoo?
+ */
+ public void initializeSimulationEntities()
+ {
+ if (pduFactory == null)
+ pduFactory = disChannel.getPduFactory();
+ entityStatePdu_1 = pduFactory.makeEntityStatePdu();
+ entityStatePdu_2 = pduFactory.makeEntityStatePdu();
+ firePdu_1a = pduFactory.makeFirePdu();
+ firePdu_1b = pduFactory.makeFirePdu();
+ munitionDescriptor1 = new MunitionDescriptor();
+
+ // Your model setup: define participants. who's who in this zoo?
+ // Assuming you keep track of entity objects... here is some support for for Entity 1.
+
+ // PDU objects are already declared and instances created, so now set their values.
+ // who is who in our big zoo, sufficient for global participation if we need it
+ entityID_1.setSiteID(1).setApplicationID(2).setEntityID(3); // made-up example ID;
+ disChannel.addEntity(entityID_1);
+
+ entityID_2.setSiteID(1).setApplicationID(2).setEntityID(4); // made-up example ID;
+ disChannel.addEntity(entityID_2);
+ // TODO someday, use enumerations for sites as part of a SimulationManager object; e.g. is there a unique site triplet for MOVES Institute?
+
+ entityStatePdu_1.setEntityID(entityID_1);
+ entityStatePdu_1.setForceId(ForceID.FRIENDLY);
+ entityStatePdu_1.setEntityType(new _001Poseidon()); // note import statement above
+// entityStatePdu_1.setMarking("Entity #1");
+ entityStatePdu_1.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.air.MV22B()); // note import statement at top
+ entityStatePdu_1.setMarking("Entity #53");
+ entityStatePdu_1.getMarkingString(); // use Netbeans Debug breakpoint here to check left justified...
+
+ entityStatePdu_2.setEntityID(entityID_2);
+ entityStatePdu_2.setForceId(ForceID.OPPOSING);
+ entityStatePdu_2.setEntityType(new _002Triton()); // note import statement above
+ entityStatePdu_2.setMarking("Entity #2");
+
+ // TODO how should we customize this munition? what are key parameters for your simulation?
+ // more is needed here by scenario authors...
+ munitionDescriptor1.setQuantity(1);
+ firePdu_1a.setDescriptor(munitionDescriptor1).setRange(1000.0f);
+ }
+
+ /**
+ * This runSimulationLoops() method is for you, a customizable programmer-modifiable
+ * code block for defining and running a new simulation of interest.
+ *
+ * Welcome! Other parts of this program handle bookkeeping and plumbing tasks so that
+ * you can focus on your model entities and activities.
+ * Expandable support includes DIS EntityStatePdu, FirePdu and CommentPdu all available for
+ * modification and sending in a simulation loop.
+ * Continuous improvement efforts seek to make this program as easy and straightforward
+ * as possible for DIS simulationists to use and adapt.
+ * All of the other methods are setup, teardown and configuration that you may find
+ * interesting, even helpful, but don't really have to worry about.
+ */
+ @SuppressWarnings("SleepWhileInLoop") // yes we might do that
+ public void runSimulationLoops ()
+ {
+ try
+ {
+ final int SIMULATION_MAX_LOOP_COUNT = 10; // set number of turns in the game also avoid infinite loops.
+ int simulationLoopCount = 0; // variable, initialized at 0
+ boolean simulationComplete = false; // sentinel variable as termination condition, are we done yet?
+ final int NUMBER_MINES = 5; // preset number of mines to be placed
+ // TODO reset Clock Time for today's date and timestamp to zero, providing consistent outputs for each simulation run
+ String timeMessage = "Simulation time " + simulationTimeSeconds + " at LocalDateTime " + LocalDateTime.now();
+ disChannel.sendCommentPdu(simulationTimeSeconds, DisChannel.COMMENTPDU_TIME, timeMessage);
+ // TODO replace enumeration with disChannel.COMMENTPDU_TIME
+ // TODO fix VariableRecordType.TIME_AMP_DATE_VALID
+
+ // ===================================================================================================
+ // loop the simulation while allowed, programmer can set additional conditions to break out and finish
+ List<double[]> minefield = new ArrayList<>();
+
+ for (int i = 0; i < NUMBER_MINES; i++){
+ //double x = Random.nextInt();
+ //double[] mine = []
+ }
+ while (simulationLoopCount < SIMULATION_MAX_LOOP_COUNT) // are we done yet?
+ {
+ simulationLoopCount++; // good practice: increment loop counter as first action in that loop
+
+ // =============================================================================================
+ // * your own simulation code starts here! *****************************************************
+ // =============================================================================================
+
+ // are there any other variables to modify at the beginning of your loop?
+
+ // are your reading any DIS PDUs from the network? check for them here
+
+ // compute a track, update an ESPDU, whatever it is that your model is doing...
+
+ // Where is my entity? Insert changes in position; this sample only changes X position.
+ entityStatePdu_1.getEntityLocation().setX(entityStatePdu_1.getEntityLocation().getX() + 1.0); // 1m per timestep
+
+ // decide whether to fire, and then update the firePdu. Hmmm, you might want a target to shoot at!
+
+ // etc. etc. your code goes here for your simulation of interest
+
+ // something happens between my simulation entities, la de da de da...
+ System.out.println ("... My simulation just did something, no really...");
+ System.out.flush(); // make sure this arrives to user even if other threads somehow become deadlocked
+
+
+ // make your reports: narrative code for CommentPdu here (set all to empty strings to avoid sending)
+ narrativeMessage1 = "MV3500 ExampleSimulationProgram";
+ narrativeMessage2 = "runSimulation() loop " + simulationLoopCount;
+ narrativeMessage3 = ""; // intentionally blank for testing
+
+ // your loop termination condition goes here
+ if (simulationLoopCount > MAX_LOOP_COUNT) // for example
+ {
+ simulationComplete = true;
+ }
+ // =============================================================================================
+ // * your own simulation code is finished here! ************************************************
+ // =============================================================================================
+
+ // staying synchronized with timestep: wait duration for elapsed time in this loop
+ // Thread.sleep needs a (long) parameter for milliseconds, which are clumsy to use sometimes
+ Thread.sleep((long)(getSimulationTimeStepDuration() * 1000)); // units of seconds * (1000 msec/sec) = milliseconds
+ System.out.println ("... [Pausing for " + getSimulationTimeStepDuration() + " seconds]");
+
+ // OK now send the status PDUs for this loop, and then continue
+ System.out.println ("... sending PDUs of interest for simulation step " + simulationLoopCount + ", monitor loopback to confirm sent");
+ System.out.flush();
+
+ // TODO set timesteps in PDUs
+
+ sendAllPdusForLoopTimestep(simulationTimeSeconds,
+ entityStatePdu_1,
+ firePdu_1a,
+ DisChannel.COMMENTPDU_APPLICATION_STATUS,
+ narrativeMessage1, narrativeMessage2, narrativeMessage3);
+ disChannel.sendSinglePdu(simulationTimeSeconds, entityStatePdu_2); // me too i.e. 2!
+
+ System.out.println ("... [PDUs of interest successfully sent for this loop]");
+ System.out.flush();
+
+ // ===============================
+ // current loop now finished, check whether to terminate if simulation complete, otherwise continue
+ if (simulationComplete || (simulationLoopCount > 10000)) // for example; including fail-safe condition is good
+ {
+ System.out.println ("... [loop termination condition met, simulationComplete=" + simulationComplete + "]"); // ", final loopCount=" + loopCount +
+ System.out.flush();
+ break;
+ }
+ simulationTimeSeconds += getSimulationTimeStepDuration(); // good practice: increment simulationTime as lastst action in that loop
+
+ } // end of simulation loop, continue until done
+ // ===================================================================================================// ===================================================================================================// ===================================================================================================// ===================================================================================================
+
+ narrativeMessage2 = "runSimulation() completed successfully"; // all done, so tell everyone else on the channel
+ // TODO better javadoc needs to be autogenerated for VariableRecordType enumerations
+ disChannel.sendCommentPdu(DisChannel.COMMENTPDU_NARRATIVE, narrativeMessage1, narrativeMessage2, narrativeMessage3);
+ System.out.println ("... [final=completion CommentPdu successfully sent for simulation]");
+
+// disChannel.getPduRecorder(). TODO record XML as well
+ disChannel.leave(); // embedded SimulationManager is expected to send appropriate PDUs for entity, application shutdown
+ }
+ catch (InterruptedException iex) // handle any exception that your code might choose to provoke!
+ {
+ Logger.getLogger(LennonSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
+ }
+ }
+
+ /**
+ * Send EntityState, Fire, Comment PDUs that got updated for this loop, reflecting state of current simulation timestep.
+ * @param simTimeSeconds simulation time in second, applied to PDU as timestamp
+ * @param entityStatePdu the ESPDU to send, if any
+ * @param firePdu the FirePDU to send, if any
+ * @param commentType enumeration value describing purpose of the narrative comment PDU
+ * @param comments String array of narrative comments
+ * @see DisChannel
+// * @see DisTime // TODO find renamed version
+ * @see <a href="https://docs.oracle.com/javase/tutorial/java/javaOO/arguments.html" target="_blank">Passing Information to a Method or a Constructor</a> Arbitrary Number of Arguments
+ */
+ public void sendAllPdusForLoopTimestep(double simTimeSeconds,
+ EntityStatePdu entityStatePdu,
+ FirePdu firePdu,
+ VariableRecordType commentType,
+ // vararg... variable-length set of String comments can optionally follow
+ String... comments)
+ {
+ if (entityStatePdu != null)
+ disChannel.sendSinglePdu(simTimeSeconds, entityStatePdu);
+
+ if (firePdu != null)
+ disChannel.sendSinglePdu(simTimeSeconds, firePdu); // bang
+
+ disChannel.sendCommentPdu(simTimeSeconds, commentType, comments); // empty comments are filtered
+ }
+
+ /**
+ * Initial execution via main() method: handle args array of command-line initialization (CLI) arguments here
+ * @param args command-line parameters: network address and port
+ */
+ protected void handleArguments (String[] args)
+ {
+ // initial execution: handle args array of initialization arguments here
+ if (args.length == 2)
+ {
+ if ((args[0] != null) && !args[0].isEmpty())
+ thisProgram.disChannel.setNetworkAddress(args[0]);
+ if ((args[1] != null) && !args[1].isEmpty())
+ thisProgram.disChannel.setNetworkPort(Integer.parseInt(args[1]));
+ }
+ else if (args.length != 0)
+ {
+ System.err.println("Usage: " + thisProgram.getClass().getSimpleName() + " [address port]");
+ System.exit(-1);
+ }
+ }
+
+ /**
+ * Get simple descriptor (such as parent class name) for this network interface, used in trace statements
+ * @return simple descriptor name
+ */
+ public String getDescriptor() {
+ return descriptor;
+ }
+
+ /**
+ * Set new simple descriptor (such as parent class name) for this network interface, used in trace statements
+ * @param newDescriptor simple descriptor name for this interface
+ */
+ public void setDescriptor(String newDescriptor) {
+ if (newDescriptor == null)
+ newDescriptor = "";
+ this.descriptor = newDescriptor;
+ }
+
+ /**
+ * parameter accessor method
+ * @return the simulationTimeStepDuration in seconds
+ */
+ public double getSimulationTimeStepDuration() {
+ return simulationTimeStepDuration;
+ }
+
+ /**
+ * parameter accessor method
+ * @param timeStepDurationSeconds the simulationTimeStepDuration in seconds to set
+ */
+ public void setSimulationTimeStepDuration(double timeStepDurationSeconds) {
+ this.simulationTimeStepDuration = timeStepDurationSeconds;
+ }
+
+ /** Locally instantiable copy of program, can be subclassed. */
+ protected static LennonSimulationProgram thisProgram;
+
+ /**
+ * Main method is first executed when a program instance is loaded.
+ * @see <a href="https://docs.oracle.com/javase/tutorial/getStarted/application/index.html" target="_blank">Java Tutorials: A Closer Look at the "Hello World!" Application</a>
+ * @param args command-line parameters: network address and port.
+ * Command-line arguments are an array of optional String parameters that are passed from execution environment during invocation
+ */
+ public static void main(String[] args)
+ {
+ thisProgram = new LennonSimulationProgram("test constructor"); // create instance of self within static main() method
+
+ thisProgram.disChannel.printlnTRACE("main() started...");
+
+ thisProgram.handleArguments(args); // process any command-line invocation arguments
+
+ thisProgram.runSimulationLoops(); // ... your simulation execution code goes in there ...
+
+ thisProgram.disChannel.tearDownNetworkInterface(); // make sure no processes are left lingering
+
+ thisProgram.disChannel.printlnTRACE("complete."); // report successful completion
+
+ System.exit(0); // ensure all threads and sockets released
+ }
+}
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/package-info.java b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..0182f9f08eac81459c1925c4695b44789f5bb82a
--- /dev/null
+++ b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Lennon/package-info.java
@@ -0,0 +1,10 @@
+/**
+ * Final project assignments supporting the NPS MOVES MV3500 Networked Graphics course.
+ *
+ * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/assignments" target="_blank">networkedGraphicsMV3500 assignments</a>
+ * @see java.lang.Package
+ * @see <a href="https://stackoverflow.com/questions/22095487/why-is-package-info-java-useful" target="_blank">StackOverflow: why-is-package-info-java-useful</a>
+ * @see <a href="https://stackoverflow.com/questions/624422/how-do-i-document-packages-in-java" target="_blank">StackOverflow: how-do-i-document-packages-in-java</a>
+ */
+
+package MV3500Cohort2024JulySeptember.homework3.Lennon;
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Smith/ExampleSimulationProgram.java b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Smith/ExampleSimulationProgram.java
index a5e42691d8d460162361a3b370617b601b204425..26419da18ec013dfd0790866944c8d64b44c0020 100644
--- a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Smith/ExampleSimulationProgram.java
+++ b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Smith/ExampleSimulationProgram.java
@@ -1,413 +1,310 @@
-/**
- * Copyright (c) 2008-2023, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
- * This work is provided under a BSD open-source license, see project license.html or license.txt
- * @author tjsus
- */
package MV3500Cohort2024JulySeptember.homework3.Smith;
-import edu.nps.moves.dis7.entities.swe.platform.surface._001Poseidon;
-import edu.nps.moves.dis7.entities.swe.platform.surface._002Triton;
-import edu.nps.moves.dis7.enumerations.*;
+import edu.nps.moves.dis7.enumerations.VariableRecordType;
import edu.nps.moves.dis7.pdus.*;
import edu.nps.moves.dis7.utilities.DisChannel;
import edu.nps.moves.dis7.utilities.PduFactory;
-import java.time.LocalDateTime;
import java.util.logging.Level;
import java.util.logging.Logger;
-/** The purpose of this inheritable class is to provide an easily modifiable
- * example simulation program that includes DIS-capable entities performing
- * tasks of interest, and then reporting activity via PDUs to the network.
- * Default program initialization includes PDU recording turned on by default.
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt" target="_blank">ExampleSimulationProgramLog.txt</a>
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramPduCaptureLog.dislog" target="_blank">ExampleSimulationProgramPduCaptureLog.dislog</a>
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramFlowDiagram.pdf" target="_blank">ExampleSimulationProgramFlowDiagram.pdf</a>
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramWireshark.png" target="_blank">ExampleSimulationProgramWireshark.png</a>
- * @see <a href="https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/ExampleSimulationProgramSequenceDiagram.png" target="_blank">ExampleSimulationProgramSequenceDiagram.png</a>
+/**
+ * The purpose of this inheritable class is to provide an easily modifiable
+ * example simulation program that includes DIS-capable entities performing
+ * tasks of interest, and then reporting activity via PDUs to the network.
+ * Default program initialization includes PDU recording turned on by default.
*/
-public class ExampleSimulationProgram
-{
- /* **************************** infrastructure code, modification is seldom needed ************************* */
-
- private String descriptor = this.getClass().getSimpleName();
- /** DIS channel defined by network address/port combination includes multiple utility capabilities */
+public class ExampleSimulationProgram {
+
+ // Constants for the Battleship game
+ private static final int GRID_SIZE = 10; // 10x10 grid for Battleship
+ private static final int MAX_TURNS = 100; // Limit turns to avoid infinite games
+
+ // Grids for each player
+ private char[][] player1Grid = new char[GRID_SIZE][GRID_SIZE];
+ private char[][] player2Grid = new char[GRID_SIZE][GRID_SIZE];
+
+ // To track whose turn it is
+ private boolean isPlayer1Turn = true;
+
+ // Ship positions (simple example positions for each player's ships)
+ private final int[][] player1Ships = {{0, 0}, {0, 1}, {0, 2}}; // Positions for player 1's ships
+ private final int[][] player2Ships = {{5, 5}, {5, 6}, {5, 7}}; // Positions for player 2's ships
+
+ // DIS utilities
+ private String descriptor = this.getClass().getSimpleName();
protected DisChannel disChannel;
- /** Factory object used to create new PDU instances */
protected PduFactory pduFactory;
-
- /** seconds per loop for real-time or simulation execution */
- private double simulationTimeStepDuration = 1.0; // seconds TODO encapsulate
- /** initial simulation time in seconds */
- double simulationTimeInitial = 0.0;
- /** current simulation time in seconds */
- double simulationTimeSeconds = simulationTimeInitial;
- /** Maximum number of simulation loops */
- int MAX_LOOP_COUNT = 4;
-
- String narrativeMessage1 = new String();
- String narrativeMessage2 = new String();
- String narrativeMessage3 = new String();
-
- /** EntityID settings for entity 1 */
- protected EntityID entityID_1 = new EntityID();
- /** EntityID settings for entity 2 */
- protected EntityID entityID_2 = new EntityID();
- /** ESPDU for entity 1 */
- protected EntityStatePdu entityStatePdu_1;
- /** ESPDU for entity 2 */
- protected EntityStatePdu entityStatePdu_2;
- /** FirePdu for entity 1 first weapon (if any) */
- protected FirePdu firePdu_1a;
- /** FirePdu for entity 1 second weapon (if any) */
- protected FirePdu firePdu_1b;
- /** MunitionDescriptor for these weapons */
- protected MunitionDescriptor munitionDescriptor1;
-
- // hey programmer, what other state do you want? this is a good place to declare it...
-
+ protected CommentPdu gridStatusPdu;
+ protected FirePdu firePduPlayer1;
+ protected FirePdu firePduPlayer2;
+ protected MunitionDescriptor munitionDescriptor1 = new MunitionDescriptor();
+
+ // Simulation time settings
+ private double simulationTimeStepDuration = 1.0; // seconds
+ private double simulationTimeSeconds = 0.0;
+
+ // Tracking indices for Player 1's systematic search
+ private int player1SearchRow = 0;
+ private int player1SearchCol = 0;
+
/**
- * Constructor to create an instance of this class.
- * Design goal: additional built-in initialization conveniences can go here
- * to keep your efforts focused on the runSimulation() method.
+ * Constructor to create an instance of this class. Design goal: additional
+ * built-in initialization conveniences can go here to keep your efforts
+ * focused on the runSimulation() method.
*/
- // base constructor is not invoked automatically by other constructors
- // https://stackoverflow.com/questions/581873/best-way-to-handle-multiple-constructors-in-java
- public ExampleSimulationProgram()
- {
+ public ExampleSimulationProgram() {
initialize();
}
+
/**
- * Constructor to create an instance of this class.
- * @param newDescriptor describes this program, useful for logging and debugging
+ * Initialize the simulation program, setting up the DIS channel, PDUs, and
+ * the Battleship game grids.
*/
- public ExampleSimulationProgram(String newDescriptor)
- {
- descriptor = newDescriptor;
- initialize();
+ private void initialize() {
+ initializeDisChannel();
+ initializeSimulationEntities();
+ setupGrids();
+ disChannel.join();
}
+
/**
- * Utility Constructor that allows your example simulation program to override default network address and port
- * @param address network address to use
- * @param port corresponding network port to use
+ * Initialize the DIS channel for communication, setting verbose output for
+ * debugging and creating the PduFactory.
*/
- public ExampleSimulationProgram(String address, int port)
- {
- disChannel.setNetworkAddress (address);
- disChannel.setNetworkPort (port);
- disChannel.setVerboseComments (true); // TODO rename library method to disambiguate CommentPDU
- // TODO still seems really chatty... add silent mode?
- disChannel.setVerboseDisNetworkInterface(true); // Default false
- disChannel.setVerbosePduRecorder (true); // default false
- initialize();
- }
-
- /** Initialize channel setup for OpenDis7 and report a test PDU
- * @see initializeDisChannel
- * @see initializeSimulationEntities */
- private void initialize()
- {
- initializeDisChannel(); // must come first, uses PduFactory
-
- initializeSimulationEntities(); // set unchanging parameters
-
- disChannel.join(); // TODO further functionality expected
-
- String timeStepMessage = "Simulation timestep duration " + getSimulationTimeStepDuration() + " seconds";
- disChannel.sendCommentPdu(simulationTimeSeconds, DisChannel.COMMENTPDU_SIMULATION_TIMESTEP, timeStepMessage);
- // additional constructor initialization can go here
- }
-
- /** Initialize channel setup for OpenDis7 and report a test PDU */
- private void initializeDisChannel()
- {
- if (disChannel == null)
- disChannel = new DisChannel();
- else
- {
- disChannel.printlnTRACE ("*** warning, duplicate invocation of initializeDisChannel() ignored");
- return;
- }
- pduFactory = disChannel.getPduFactory();
- disChannel.setDescriptor(this.getClass().getSimpleName()); // ExampleSimulationProgram might be a superclass
+ private void initializeDisChannel() {
+ disChannel = new DisChannel();
+ pduFactory = disChannel.getPduFactory();
+ disChannel.setDescriptor(this.getClass().getSimpleName());
disChannel.setUpNetworkInterface();
- disChannel.printlnTRACE ("just checking: disChannel.getNetworkAddress()=" + disChannel.getNetworkAddress() +
- ", getNetworkPort()=" + disChannel.getNetworkPort());
disChannel.getDisNetworkInterface().setVerbose(true); // sending and receipt
- disChannel.printlnTRACE ("just checking: hasVerboseSending()=" + disChannel.getDisNetworkInterface().hasVerboseSending() +
- ", hasVerboseReceipt()=" + disChannel.getDisNetworkInterface().hasVerboseReceipt());
disChannel.getPduRecorder().setVerbose(true);
-
- // TODO confirm whether recorder is explicitly started by programmer (or not)
-
-// disChannel.sendCommentPdu(VariableRecordType.OTHER, "DisThreadedNetworkInterface.initializeDisChannel() complete"); // hello channel, debug
}
-
- /** Get ready, get set... initialize simulation entities. Who's who in the zoo?
+
+ /**
+ * Initialize simulation entities by creating PDUs for firing events.
*/
- public void initializeSimulationEntities()
- {
- if (pduFactory == null)
- pduFactory = disChannel.getPduFactory();
- entityStatePdu_1 = pduFactory.makeEntityStatePdu();
- entityStatePdu_2 = pduFactory.makeEntityStatePdu();
- firePdu_1a = pduFactory.makeFirePdu();
- firePdu_1b = pduFactory.makeFirePdu();
- munitionDescriptor1 = new MunitionDescriptor();
-
- // Your model setup: define participants. who's who in this zoo?
- // Assuming you keep track of entity objects... here is some support for for Entity 1.
-
- // PDU objects are already declared and instances created, so now set their values.
- // who is who in our big zoo, sufficient for global participation if we need it
- entityID_1.setSiteID(1).setApplicationID(2).setEntityID(3); // made-up example ID;
- disChannel.addEntity(entityID_1);
-
- entityID_2.setSiteID(1).setApplicationID(2).setEntityID(4); // made-up example ID;
- disChannel.addEntity(entityID_2);
- // TODO someday, use enumerations for sites as part of a SimulationManager object; e.g. is there a unique site triplet for MOVES Institute?
-
- entityStatePdu_1.setEntityID(entityID_1);
- entityStatePdu_1.setForceId(ForceID.FRIENDLY);
- entityStatePdu_1.setEntityType(new _001Poseidon()); // note import statement above
-// entityStatePdu_1.setMarking("Entity #1");
- entityStatePdu_1.setEntityType(new edu.nps.moves.dis7.entities.usa.platform.air.MV22B()); // note import statement at top
- entityStatePdu_1.setMarking("Entity #53");
- entityStatePdu_1.getMarkingString(); // use Netbeans Debug breakpoint here to check left justified...
-
- entityStatePdu_2.setEntityID(entityID_2);
- entityStatePdu_2.setForceId(ForceID.OPPOSING);
- entityStatePdu_2.setEntityType(new _002Triton()); // note import statement above
- entityStatePdu_2.setMarking("Entity #2");
-
- // TODO how should we customize this munition? what are key parameters for your simulation?
- // more is needed here by scenario authors...
- munitionDescriptor1.setQuantity(1);
- firePdu_1a.setDescriptor(munitionDescriptor1).setRange(1000.0f);
+ private void initializeSimulationEntities() {
+ firePduPlayer1 = pduFactory.makeFirePdu();
+ firePduPlayer2 = pduFactory.makeFirePdu();
+ gridStatusPdu = pduFactory.makeCommentPdu();
}
-
+
/**
- * This runSimulationLoops() method is for you, a customizable programmer-modifiable
- * code block for defining and running a new simulation of interest.
- *
- * Welcome! Other parts of this program handle bookkeeping and plumbing tasks so that
- * you can focus on your model entities and activities.
- * Expandable support includes DIS EntityStatePdu, FirePdu and CommentPdu all available for
- * modification and sending in a simulation loop.
- * Continuous improvement efforts seek to make this program as easy and straightforward
- * as possible for DIS simulationists to use and adapt.
- * All of the other methods are setup, teardown and configuration that you may find
- * interesting, even helpful, but don't really have to worry about.
+ * Set up the game grids for each player, marking empty water and ship
+ * positions.
*/
- @SuppressWarnings("SleepWhileInLoop") // yes we might do that
- public void runSimulationLoops ()
- {
- try
- {
- final int SIMULATION_MAX_LOOP_COUNT = 10; // be deliberate out there! also avoid infinite loops.
- int simulationLoopCount = 0; // variable, initialized at 0
- boolean simulationComplete = false; // sentinel variable as termination condition, are we done yet?
-
- // TODO reset Clock Time for today's date and timestamp to zero, providing consistent outputs for each simulation run
- String timeMessage = "Simulation time " + simulationTimeSeconds + " at LocalDateTime " + LocalDateTime.now();
- disChannel.sendCommentPdu(simulationTimeSeconds, DisChannel.COMMENTPDU_TIME, timeMessage);
- // TODO replace enumeration with disChannel.COMMENTPDU_TIME
- // TODO fix VariableRecordType.TIME_AMP_DATE_VALID
-
- // ===================================================================================================
- // loop the simulation while allowed, programmer can set additional conditions to break out and finish
- while (simulationLoopCount < SIMULATION_MAX_LOOP_COUNT) // are we done yet?
- {
- simulationLoopCount++; // good practice: increment loop counter as first action in that loop
-
- // =============================================================================================
- // * your own simulation code starts here! *****************************************************
- // =============================================================================================
-
- // are there any other variables to modify at the beginning of your loop?
-
- // are your reading any DIS PDUs from the network? check for them here
-
- // compute a track, update an ESPDU, whatever it is that your model is doing...
-
- // Where is my entity? Insert changes in position; this sample only changes X position.
- entityStatePdu_1.getEntityLocation().setX(entityStatePdu_1.getEntityLocation().getX() + 1.0); // 1m per timestep
-
- // decide whether to fire, and then update the firePdu. Hmmm, you might want a target to shoot at!
-
- // etc. etc. your code goes here for your simulation of interest
-
- // something happens between my simulation entities, la de da de da...
- System.out.println ("... My simulation just did something, no really...");
- System.out.flush(); // make sure this arrives to user even if other threads somehow become deadlocked
-
-
- // make your reports: narrative code for CommentPdu here (set all to empty strings to avoid sending)
- narrativeMessage1 = "MV3500 ExampleSimulationProgram";
- narrativeMessage2 = "runSimulation() loop " + simulationLoopCount;
- narrativeMessage3 = ""; // intentionally blank for testing
-
- // your loop termination condition goes here
- if (simulationLoopCount > MAX_LOOP_COUNT) // for example
- {
- simulationComplete = true;
- }
- // =============================================================================================
- // * your own simulation code is finished here! ************************************************
- // =============================================================================================
-
- // staying synchronized with timestep: wait duration for elapsed time in this loop
- // Thread.sleep needs a (long) parameter for milliseconds, which are clumsy to use sometimes
- Thread.sleep((long)(getSimulationTimeStepDuration() * 1000)); // units of seconds * (1000 msec/sec) = milliseconds
- System.out.println ("... [Pausing for " + getSimulationTimeStepDuration() + " seconds]");
-
- // OK now send the status PDUs for this loop, and then continue
- System.out.println ("... sending PDUs of interest for simulation step " + simulationLoopCount + ", monitor loopback to confirm sent");
- System.out.flush();
-
- // TODO set timesteps in PDUs
-
- sendAllPdusForLoopTimestep(simulationTimeSeconds,
- entityStatePdu_1,
- firePdu_1a,
- DisChannel.COMMENTPDU_APPLICATION_STATUS,
- narrativeMessage1, narrativeMessage2, narrativeMessage3);
- disChannel.sendSinglePdu(simulationTimeSeconds, entityStatePdu_2); // me too i.e. 2!
-
- System.out.println ("... [PDUs of interest successfully sent for this loop]");
- System.out.flush();
-
- // ===============================
- // current loop now finished, check whether to terminate if simulation complete, otherwise continue
- if (simulationComplete || (simulationLoopCount > 10000)) // for example; including fail-safe condition is good
- {
- System.out.println ("... [loop termination condition met, simulationComplete=" + simulationComplete + "]"); // ", final loopCount=" + loopCount +
- System.out.flush();
- break;
+ private void setupGrids() {
+ // Initialize grids with empty water '~'
+ for (int i = 0; i < GRID_SIZE; i++) {
+ for (int j = 0; j < GRID_SIZE; j++) {
+ player1Grid[i][j] = '~';
+ player2Grid[i][j] = '~';
}
- simulationTimeSeconds += getSimulationTimeStepDuration(); // good practice: increment simulationTime as lastst action in that loop
-
- } // end of simulation loop, continue until done
- // ===================================================================================================// ===================================================================================================// ===================================================================================================// ===================================================================================================
-
- narrativeMessage2 = "runSimulation() completed successfully"; // all done, so tell everyone else on the channel
- // TODO better javadoc needs to be autogenerated for VariableRecordType enumerations
- disChannel.sendCommentPdu(DisChannel.COMMENTPDU_NARRATIVE, narrativeMessage1, narrativeMessage2, narrativeMessage3);
- System.out.println ("... [final=completion CommentPdu successfully sent for simulation]");
-
-// disChannel.getPduRecorder(). TODO record XML as well
- disChannel.leave(); // embedded SimulationManager is expected to send appropriate PDUs for entity, application shutdown
- }
- catch (InterruptedException iex) // handle any exception that your code might choose to provoke!
- {
- Logger.getLogger(ExampleSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
- }
+ }
+
+ // Place ships on the grids ('P' denotes a ship)
+ for (int[] ship : player1Ships) {
+ player1Grid[ship[0]][ship[1]] = 'P';
+ }
+ for (int[] ship : player2Ships) {
+ player2Grid[ship[0]][ship[1]] = 'P';
+ }
}
/**
- * Send EntityState, Fire, Comment PDUs that got updated for this loop, reflecting state of current simulation timestep.
- * @param simTimeSeconds simulation time in second, applied to PDU as timestamp
- * @param entityStatePdu the ESPDU to send, if any
- * @param firePdu the FirePDU to send, if any
- * @param commentType enumeration value describing purpose of the narrative comment PDU
- * @param comments String array of narrative comments
- * @see DisChannel
-// * @see DisTime // TODO find renamed version
- * @see <a href="https://docs.oracle.com/javase/tutorial/java/javaOO/arguments.html" target="_blank">Passing Information to a Method or a Constructor</a> Arbitrary Number of Arguments
+ * This runSimulationLoops() method is for you, a customizable
+ * programmer-modifiable code block for defining and running a new
+ * simulation of interest.
*/
- public void sendAllPdusForLoopTimestep(double simTimeSeconds,
- EntityStatePdu entityStatePdu,
- FirePdu firePdu,
- VariableRecordType commentType,
- // vararg... variable-length set of String comments can optionally follow
- String... comments)
- {
- if (entityStatePdu != null)
- disChannel.sendSinglePdu(simTimeSeconds, entityStatePdu);
-
- if (firePdu != null)
- disChannel.sendSinglePdu(simTimeSeconds, firePdu); // bang
-
- disChannel.sendCommentPdu(simTimeSeconds, commentType, comments); // empty comments are filtered
+ public void runSimulationLoops() {
+ int turnCount = 0;
+ while (turnCount < MAX_TURNS) {
+ if (isPlayer1Turn) {
+ // Player 1 systematically searches Player 2's grid
+ int[] target = selectNextTargetForPlayer1();
+ handleFire(firePduPlayer1, player2Grid, target, "Player 1");
+ } else {
+ // Player 2 fires at Player 1 randomly
+ int[] target = selectRandomTarget();
+ handleFire(firePduPlayer2, player1Grid, target, "Player 2");
+ }
+
+ // Switch turns and increment turn counter
+ isPlayer1Turn = !isPlayer1Turn;
+ turnCount++;
+
+ // Check for win conditions
+ if (checkWinCondition(player1Grid)) {
+ System.out.println("Player 2 wins!");
+ break;
+ } else if (checkWinCondition(player2Grid)) {
+ System.out.println("Player 1 wins!");
+ break;
+ }
+
+ // Wait for the next simulation step
+ try {
+ Thread.sleep((long) (simulationTimeStepDuration * 1000)); // units of seconds * (1000 msec/sec) = milliseconds
+ } catch (InterruptedException iex) {
+ Logger.getLogger(ExampleSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
+ }
+
+ // Increment simulation time
+ simulationTimeSeconds += simulationTimeStepDuration;
+ }
}
-
+
/**
- * Initial execution via main() method: handle args array of command-line initialization (CLI) arguments here
- * @param args command-line parameters: network address and port
+ * Systematically select the next target for Player 1 in a row-by-row
+ * manner.
+ *
+ * @return the coordinates of the next target cell.
*/
- protected void handleArguments (String[] args)
- {
- // initial execution: handle args array of initialization arguments here
- if (args.length == 2)
- {
- if ((args[0] != null) && !args[0].isEmpty())
- thisProgram.disChannel.setNetworkAddress(args[0]);
- if ((args[1] != null) && !args[1].isEmpty())
- thisProgram.disChannel.setNetworkPort(Integer.parseInt(args[1]));
+ private int[] selectNextTargetForPlayer1() {
+ // Systematically select the next target in a row-by-row manner
+ int[] target = {player1SearchRow, player1SearchCol};
+
+ // Move to the next column
+ player1SearchCol++;
+ // If end of row is reached, move to the next row and reset column
+ if (player1SearchCol >= GRID_SIZE) {
+ player1SearchCol = 0;
+ player1SearchRow++;
}
- else if (args.length != 0)
- {
- System.err.println("Usage: " + thisProgram.getClass().getSimpleName() + " [address port]");
- System.exit(-1);
+
+ // Ensure search stays within grid bounds
+ if (player1SearchRow >= GRID_SIZE) {
+ player1SearchRow = 0; // Reset search if bounds are exceeded
}
+
+ return target;
}
/**
- * Get simple descriptor (such as parent class name) for this network interface, used in trace statements
- * @return simple descriptor name
+ * Randomly select a target on the grid for Player 2's turn.
+ *
+ * @return the coordinates of the randomly selected target cell.
*/
- public String getDescriptor() {
- return descriptor;
+ private int[] selectRandomTarget() {
+ int x = (int) (Math.random() * GRID_SIZE);
+ int y = (int) (Math.random() * GRID_SIZE);
+ return new int[]{x, y};
}
/**
- * Set new simple descriptor (such as parent class name) for this network interface, used in trace statements
- * @param newDescriptor simple descriptor name for this interface
+ * Handles the firing action, setting relevant data in the FirePdu, checking
+ * if the target is a hit or miss, updating the grid, and sending the
+ * appropriate PDU.
+ *
+ * @param firePdu the FirePdu object to use for the shot.
+ * @param grid the grid of the player being fired at.
+ * @param target the coordinates of the target cell.
+ * @param player the name of the player firing the shot.
*/
- public void setDescriptor(String newDescriptor) {
- if (newDescriptor == null)
- newDescriptor = "";
- this.descriptor = newDescriptor;
+ private void handleFire(FirePdu firePdu, char[][] grid, int[] target, String player) {
+ int x = target[0];
+ int y = target[1];
+
+ // Set relevant details in the FirePdu
+ firePdu.setFiringEntityID(new EntityID().setEntityID(player.equals("Player 1") ? 1 : 2));
+ firePdu.setTargetEntityID(new EntityID().setEntityID(player.equals("Player 1") ? 1 : 2));
+ Vector3Double fireLoc = new Vector3Double(); //annoying that there isn't a Vector3Double(x, y, z) constructor...
+ fireLoc.setX(x);
+ fireLoc.setY(y);
+ fireLoc.setZ(0.0);
+ firePdu.setLocationInWorldCoordinates(fireLoc);
+ firePdu.setDescriptor(munitionDescriptor1); // Not needed I guess
+ firePdu.setRange(100.0f);// Not needed I gueess
+
+ // Print the firing action
+ System.out.println(player + " fires at (" + x + ", " + y + ").");
+
+ // Determine hit or miss and update the game grid
+ if (grid[x][y] == 'P') {
+ grid[x][y] = 'H'; // Mark as Hit
+ firePdu.setFireMissionIndex(1); // Indicate that this was a successful hit with an index of 1
+ System.out.println(player + " hits a ship at (" + x + ", " + y + ")!");
+ } else if (grid[x][y] == '~') {
+ grid[x][y] = 'M'; // Mark as Miss
+ firePdu.setFireMissionIndex(0); // Indicate that this was a miss with an index of 0
+ System.out.println(player + " misses at (" + x + ", " + y + ").");
+ } else {
+ System.out.println(player + " fires at (" + x + ", " + y + ") but it's already hit/missed.");
+ }
+
+ // Send the FirePdu to represent the shot
+ disChannel.sendSinglePdu(simulationTimeSeconds, firePdu);
+
+ // Send the updated grid status of both players
+ sendGridStatus();
+ }
+
+ /**
+ * Checks the win condition by verifying if all ships on the grid have been
+ * hit.
+ *
+ * @param grid the grid to check.
+ * @return true if all ships are hit; false otherwise.
+ */
+ private boolean checkWinCondition(char[][] grid) {
+ // Check if all ships have been hit
+ for (int i = 0; i < GRID_SIZE; i++) {
+ for (int j = 0; j < GRID_SIZE; j++) {
+ if (grid[i][j] == 'P') {
+ return false; // There are still ships left
+ }
+ }
+ }
+ return true; // All ships have been hit
}
/**
- * parameter accessor method
- * @return the simulationTimeStepDuration in seconds
+ * Sends the current grid status of both players as a CommentPdu.
*/
- public double getSimulationTimeStepDuration() {
- return simulationTimeStepDuration;
+ private void sendGridStatus() {
+ // Construct a string representation of both grids
+ StringBuilder gridStatus = new StringBuilder();
+ gridStatus.append("Player 1 Grid:\n");
+ appendGridToString(gridStatus, player1Grid);
+ gridStatus.append("Player 2 Grid:\n");
+ appendGridToString(gridStatus, player2Grid);
+
+ // Set the grid status in the CommentPdu
+ gridStatusPdu.getVariableDatums().clear(); // Clear previous comments
+ gridStatusPdu.getVariableDatums().add(new VariableDatum()
+ .setVariableDatumID(VariableRecordType.OTHER)
+ .setVariableDatumValue(gridStatus.toString().getBytes())
+ .setVariableDatumLengthInBytes(gridStatus.toString().getBytes().length));
+
+ // Send the CommentPdu containing the grid status
+ disChannel.sendSinglePdu(simulationTimeSeconds, gridStatusPdu);
}
/**
- * parameter accessor method
- * @param timeStepDurationSeconds the simulationTimeStepDuration in seconds to set
+ * Appends the current grid status to a StringBuilder.
+ *
+ * @param sb the StringBuilder to append to.
+ * @param grid the grid to represent.
*/
- public void setSimulationTimeStepDuration(double timeStepDurationSeconds) {
- this.simulationTimeStepDuration = timeStepDurationSeconds;
+ private void appendGridToString(StringBuilder sb, char[][] grid) {
+ for (char[] row : grid) {
+ for (char cell : row) {
+ sb.append(cell).append(' ');
+ }
+ sb.append('\n');
+ }
}
-
- /** Locally instantiable copy of program, can be subclassed. */
- protected static ExampleSimulationProgram thisProgram;
-
+
/**
* Main method is first executed when a program instance is loaded.
- * @see <a href="https://docs.oracle.com/javase/tutorial/getStarted/application/index.html" target="_blank">Java Tutorials: A Closer Look at the "Hello World!" Application</a>
+ *
* @param args command-line parameters: network address and port.
- * Command-line arguments are an array of optional String parameters that are passed from execution environment during invocation
+ * Command-line arguments are an array of optional String parameters that
+ * are passed from execution environment during invocation
*/
- public static void main(String[] args)
- {
- thisProgram = new ExampleSimulationProgram("test constructor"); // create instance of self within static main() method
-
- thisProgram.disChannel.printlnTRACE("main() started...");
-
- thisProgram.handleArguments(args); // process any command-line invocation arguments
-
- thisProgram.runSimulationLoops(); // ... your simulation execution code goes in there ...
-
- thisProgram.disChannel.tearDownNetworkInterface(); // make sure no processes are left lingering
-
- thisProgram.disChannel.printlnTRACE("complete."); // report successful completion
-
- System.exit(0); // ensure all threads and sockets released
+ public static void main(String[] args) {
+ ExampleSimulationProgram game = new ExampleSimulationProgram();
+ game.runSimulationLoops();
+ System.out.println("Game Over");
}
}
diff --git a/build.properties b/build.properties
index 2d38b9f13c7e911590a334e2f995526a70a5c100..9758be32e7c04e4d2adb7d4bcb96f8dfd4528517 100644
--- a/build.properties
+++ b/build.properties
@@ -17,15 +17,15 @@ common.run.args=-Xmx256m \
win.run.args=${common.run.args}
-run.arg1=-Dawt.useSystemAAFontSettings=gasp
-unix.run.args=${common.run.args} ${run.arg1}
+unix.run.args=${common.run.args} \
+ -Dawt.useSystemAAFontSettings=gasp
-run.arg2=-Dapple.awt.graphics.UseQuartz=true \
+mac.run.args=${common.run.args} \
+ -Dapple.awt.graphics.UseQuartz=true \
-Dapple.laf.useScreenMenuBar=true \
-Dapple.awt.brushMetalLook=true \
-Xdock:name=${product.shortname} \
--add-exports java.desktop/com.apple.eawt=ALL-UNNAMED
-mac.run.args=${common.run.args} ${run.arg2}
# property used to identify Viskit config files
dot.viskit.dir=${user.home}/.${product.shortname}
diff --git a/build.xml b/build.xml
index 3e8559d124c43ae4053da712ce3882372836c8bd..6223df117e8f940eb31b536f90dfa0daab754ec1 100644
--- a/build.xml
+++ b/build.xml
@@ -319,7 +319,7 @@ POSSIBILITY OF SUCH DAMAGE.
<copy todir ="${dot.viskit.dir}" file="${c_gui.xml}"/>
</target>
- <target name="reset.viskit" description="clear an out of synch configuration and metadata directory - only when necessary">
+ <target name="reset.viskit" description="Replace an out-of-synch configuration with known good defaults - only when necessary">
<echo message="Reset user's Viskit configuration files in ${dot.viskit.dir}"/>
<delete includeemptydirs="yes" dir="${dot.viskit.dir}"/>
<mkdir dir="${dot.viskit.dir}"/>
diff --git a/examples/nbproject/project.properties b/examples/nbproject/project.properties
index a659c6016220db9cc02cbfe18f4b1c0ce29a9244..bb12d3f683a507710517c28cff44c8c0ff5a9892 100644
--- a/examples/nbproject/project.properties
+++ b/examples/nbproject/project.properties
@@ -1,121 +1,121 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
-application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
-application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
-application.title=NPS Networked Graphics MV3500 examples
-application.vendor=Don Brutzman
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
- ${run.classpath}
-debug.modulepath=\
- ${run.modulepath}
-debug.test.classpath=\
- ${run.test.classpath}
-debug.test.modulepath=\
- ${run.test.modulepath}
-# Files in build.classes.dir which should be excluded from distribution jar
-dist.archive.excludes=
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.name=Networked_Graphics_MV3500_examples
-dist.jar=${dist.dir}/${dist.name}.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-project.licensePath=../license.txt
-viskit.proj.dir=ViskitOpenDis7Examples
-viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
-opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
-excludes=ViskitOpenDis7Examples/
-file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
-file.reference.opendis7-full.jar=../lib/opendis7-full.jar
-file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
-file.reference.simkit-doc.zip=../lib/simkit-doc.zip
-file.reference.simkit-src.zip=../lib/simkit-src.zip
-file.reference.simkit.jar=../lib/simkit.jar
-#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
-#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
-includes=**/*.java
-jar.compress=false
-javac.classpath=\
- ${file.reference.opendis7-full.jar}:\
- ${file.reference.open-dis_4.16.jar}:\
- ${file.reference.dis-enums-1.3.jar}:\
- ${file.reference.simkit.jar}:\
- ${file.reference.simkit-doc.zip}:\
- ${file.reference.simkit-src.zip}
-# ${file.reference.opendis7-enumerations-classes.jar}:\
-# ${file.reference.opendis7-pdus-classes.jar}:\
-
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
-javac.deprecation=false
-javac.external.vm=true
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=\
- ${javac.classpath}
-javac.source=21
-javac.target=21
-javac.test.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-javac.test.modulepath=\
- ${javac.modulepath}
-javac.test.processorpath=\
- ${javac.test.classpath}
-javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
-javadoc.author=true
-javadoc.encoding=${source.encoding}
-javadoc.html5=false
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=MV3500 Examples
-jlink.launcher=false
-jlink.launcher.name=Networked_Graphics_MV3500_examples
-main.class=TcpExamples.TcpExample1Telnet
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=JDK_22
-run.classpath=\
- ${javac.classpath}:\
- ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.modulepath=\
- ${javac.modulepath}
-run.test.classpath=\
- ${javac.test.classpath}:\
- ${build.test.classes.dir}
-run.test.modulepath=\
- ${javac.test.modulepath}
-source.encoding=UTF-8
-#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
-src.dir=src
-src.src.dir=otherProjects\\DisDemo\\src
-src.src2.dir=otherProjects\\DisShooting\\src
-src.src3.dir=otherProjects\\WebSocketGateway\\src
-#src.src4.dir=otherProjects\\BasicServletDemo\\src
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.desc=Example programs provided as part of NPS course Networked Graphics MV3500. This course is an introduction to network communications in simulation applications. Topics include an introduction to the TCP/IP protocol stack; TCP/IP socket communications, including TCP, UDP, and multicast; and protocol design issues, with emphasis on Distributed Interactive Simulation (DIS) Protocol and High Level Architecture (HLA). Course emphasis is on creation and testing of network programming network code and web-browser applications.
+application.homepage=https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/tree/master/examples
+application.splash=..\\..\\NetworkedGraphicsMV3500\\documentation\\images\\OpenDisSurferDude.png
+application.title=NPS Networked Graphics MV3500 examples
+application.vendor=Don Brutzman
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+ ${run.classpath}
+debug.modulepath=\
+ ${run.modulepath}
+debug.test.classpath=\
+ ${run.test.classpath}
+debug.test.modulepath=\
+ ${run.test.modulepath}
+# Files in build.classes.dir which should be excluded from distribution jar
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.name=Networked_Graphics_MV3500_examples
+dist.jar=${dist.dir}/${dist.name}.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+project.licensePath=../license.txt
+viskit.proj.dir=ViskitOpenDis7Examples
+viskit.proj.lib.dir=src/${viskit.proj.dir}/lib
+opendis.helper=SimkitOpenDis7Examples.run.OpenDisHelper
+excludes=ViskitOpenDis7Examples/
+file.reference.dis-enums-1.3.jar=../lib/dis-enums-1.3.jar
+file.reference.opendis7-full.jar=../lib/opendis7-full.jar
+file.reference.open-dis_4.16.jar=../lib/open-dis_4.16.jar
+file.reference.simkit-doc.zip=../lib/simkit-doc.zip
+file.reference.simkit-src.zip=../lib/simkit-src.zip
+file.reference.simkit.jar=../lib/simkit.jar
+#file.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-classes.jar
+#file.reference.opendis7-pdus-classes.jar=../lib/opendis7-pdus-classes.jar
+includes=**/*.java
+jar.compress=false
+javac.classpath=\
+ ${file.reference.opendis7-full.jar}:\
+ ${file.reference.open-dis_4.16.jar}:\
+ ${file.reference.dis-enums-1.3.jar}:\
+ ${file.reference.simkit.jar}:\
+ ${file.reference.simkit-doc.zip}:\
+ ${file.reference.simkit-src.zip}
+# ${file.reference.opendis7-enumerations-classes.jar}:\
+# ${file.reference.opendis7-pdus-classes.jar}:\
+
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
+javac.deprecation=false
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+ ${javac.classpath}
+javac.source=21
+javac.target=21
+javac.test.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+javac.test.modulepath=\
+ ${javac.modulepath}
+javac.test.processorpath=\
+ ${javac.test.classpath}
+javadoc.additionalparam=-header "NPS Networked Graphics MV3500 Examples"
+javadoc.author=true
+javadoc.encoding=${source.encoding}
+javadoc.html5=false
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+#javadoc.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-javadoc.jar
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=MV3500 Examples
+jlink.launcher=false
+jlink.launcher.name=Networked_Graphics_MV3500_examples
+main.class=TcpExamples.TcpExample1Telnet
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+run.classpath=\
+ ${javac.classpath}:\
+ ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.modulepath=\
+ ${javac.modulepath}
+run.test.classpath=\
+ ${javac.test.classpath}:\
+ ${build.test.classes.dir}
+run.test.modulepath=\
+ ${javac.test.modulepath}
+source.encoding=UTF-8
+#source.reference.opendis7-enumerations-classes.jar=../lib/opendis7-enumerations-source.jar
+src.dir=src
+src.src.dir=otherProjects\\DisDemo\\src
+src.src2.dir=otherProjects\\DisShooting\\src
+src.src3.dir=otherProjects\\WebSocketGateway\\src
+#src.src4.dir=otherProjects\\BasicServletDemo\\src
diff --git a/examples/src/UdpExamples/UnicastUdpSender.java b/examples/src/UdpExamples/UnicastUdpSender.java
index e7d4daf32708dfa6815fae497003410e3bb1a468..68cde3d0adc819257118fd6344ef554d2e93e312 100644
--- a/examples/src/UdpExamples/UnicastUdpSender.java
+++ b/examples/src/UdpExamples/UnicastUdpSender.java
@@ -27,13 +27,13 @@ public class UnicastUdpSender
private static final String MY_NAME = System.getProperty("user.name"); // guru incantation 8)
// public static final int SENDING_PORT = 1414; // not needed, can let system choose an open local port
/** socket value of shared interest */
- public static final int UDP_PORT = UnicastUdpReceiver.UDP_PORT; // 1415; ensure consistent
+ public static final int UDP_PORT = 1415;// ensure consistent
private static final int TOTAL_PACKETS_TO_SEND = 100;
/** socket value of shared interest */
- public static final String DESTINATION_HOST = "localhost";
+ //public static final String DESTINATION_HOST = "localhost";
// here is what we need for lab comms
-// public static final String DESTINATION_HOST = "10.1.105.16"; // localhost 127.0.0.1 or argon 10.1.105.1 or 10.1.105.1 or whatever
+ public static final String DESTINATION_HOST = "127.0.0.1"; // localhost 127.0.0.1 or argon 10.1.105.1 or 10.1.105.1 or whatever
/**
* Program invocation, execution starts here
@@ -46,7 +46,7 @@ public class UnicastUdpSender
DataOutputStream dos = null;
int packetID = 0; // counter variable to send in packet
float countdown = -1.0f; // unreachable value is good sentinel to ensure expected changes occur
- String message = MY_NAME + " says Hello MV3500"; // no really
+ String message = MY_NAME + " says Hello Professor!"; // no really
String padding = new String();
try
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
index 87787fc2afa70f4122f89029fae5350ab3793b37..597e3466d1cbf16277106c2a88056fdaf381ce4b 100644
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
+++ b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
@@ -24,5 +24,6 @@
<PropertyChangeListenerConnection property="N" listener="numArrivalsStat" source="aPOpenDis7" description=""/>
<PropertyChangeListenerConnection property="C" listener="numEntityCreationsStat" source="aPOpenDis7" description=""/>
<PropertyChangeListenerConnection property="R" listener="numEntityRemovalsStat" source="aPOpenDis7" description=""/>
+ <Output entity="aPOpenDis7"/>
<Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
</SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
old mode 100755
new mode 100644
index 11d6ab585dab9323bd35b9aad841dd336e49d286..5aac321ee51ee75c2eb1c78ec7618b2f475737d6
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
+++ b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
@@ -36,5 +36,7 @@
<PropertyChangeListenerConnection property="numberAvailableServers" listener="numAvailServersStat" source="simpleServer" description=""/>
<PropertyChangeListenerConnection property="numberArrivals" listener="numArrivalsStat" source="arrivalProcessOpenDis7" description=""/>
<PropertyChangeListenerConnection property="numberServed" listener="numServedStat" source="simpleServer" description=""/>
+ <Output entity="arrivalProcessOpenDis7"/>
+ <Output entity="simpleServer"/>
<Schedule stopTime="100000.0" verbose="false" saveReplicationData="false"/>
</SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar b/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
index 63265b6ef8dac61bf0adc627325968d8e2730309..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
Binary files a/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar and b/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar differ
diff --git a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml
index ad872c9652eb9cd6581ba5a65b3d4d4db021ad2b..ab5bd43c6ad40ce491eb30c65e13c8af836d4316 100644
--- a/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml
+++ b/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/SimpleMachineFailure.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="SimpleMachineFailure" version="0.1" package="examples" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<SimEntity name="SimpleMachineFailure" version="0.1" package="examples" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameter type="int" name="totalNumberMachines"/>
<Parameter type="int" name="totalNumberRepairPeople"/>
<Parameter type="simkit.random.RandomVariate" name="timeToFailure"/>
diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar
index 9a7c4a7574779f8e7e76765f7ace939dab637828..fa2bd59262e5771603440b823ff8f2d664e1c123 100644
Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ