From bd0c6c71e106440df9d3e890308694f893960bc4 Mon Sep 17 00:00:00 2001
From: rojas <rojas@N619>
Date: Sat, 31 Aug 2024 00:46:05 -0700
Subject: [PATCH] Merge origin/master

Conflicts:
	examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar
---
 .../homework3/Romero/README.md                | 19 +++++++++++++++++--
 ...gram.java => RomeroSimulationProgram.java} | 14 +++++++-------
 .../ViskitOpenDis7Examples/viskitProject.xml  |  3 ++-
 3 files changed, 26 insertions(+), 10 deletions(-)
 rename assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/{ExampleSimulationProgram.java => RomeroSimulationProgram.java} (97%)

diff --git a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/README.md b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/README.md
index a1f900c417..2d70b8de0e 100644
--- a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/README.md
+++ b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/README.md
@@ -4,9 +4,24 @@
 
 ## Description
 
-Modification to ... 
+Assigment 3, show a simple Modeling & Simulation loop.
+
+- "Add DIS outputs (general skills)"
+
+
+<!-- 
+
+Assigment 4
+
+- Show use of Simkit, DIS and Viskit together.
+
+Final essay
+
+- What do you think?
+
+    "And you get to use the word networking and combination, whatever else interest you, 
+    you know, thesis, challenging for my warfare community cell phone, thinking about international partnerships".
 
-<!--
 
 Phrases taken from: <b>https://www.divein.com/everyday/monday-motivation-quotes/</b>
 
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/ExampleSimulationProgram.java b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/RomeroSimulationProgram.java
similarity index 97%
rename from assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/ExampleSimulationProgram.java
rename to assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/RomeroSimulationProgram.java
index 6372a714e6..8c3664dfb4 100644
--- a/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/ExampleSimulationProgram.java
+++ b/assignments/src/MV3500Cohort2024JulySeptember/homework3/Romero/RomeroSimulationProgram.java
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
  *  @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 ExampleSimulationProgram
+public class RomeroSimulationProgram
 {
     /* **************************** infrastructure code, modification is seldom needed ************************* */
                  
@@ -72,7 +72,7 @@ public class ExampleSimulationProgram
      */
     // 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 RomeroSimulationProgram()
     {
         initialize();
     }
@@ -80,7 +80,7 @@ public class ExampleSimulationProgram
      * Constructor to create an instance of this class.
      * @param newDescriptor describes this program, useful for logging and debugging
      */
-    public ExampleSimulationProgram(String newDescriptor)
+    public RomeroSimulationProgram(String newDescriptor)
     {
         descriptor = newDescriptor;
         initialize();
@@ -90,7 +90,7 @@ public class ExampleSimulationProgram
      * @param address network address to use
      * @param port corresponding network port to use
      */
-    public ExampleSimulationProgram(String address, int port)
+    public RomeroSimulationProgram(String address, int port)
     {
         disChannel.setNetworkAddress            (address);
         disChannel.setNetworkPort               (port);
@@ -299,7 +299,7 @@ public class ExampleSimulationProgram
       } 
       catch (InterruptedException iex) // handle any exception that your code might choose to provoke!
       {
-        Logger.getLogger(ExampleSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
+        Logger.getLogger(RomeroSimulationProgram.class.getSimpleName()).log(Level.SEVERE, null, iex);
       }
     }
 
@@ -386,7 +386,7 @@ public class ExampleSimulationProgram
     }
     
     /** Locally instantiable copy of program, can be subclassed. */
-    protected static ExampleSimulationProgram thisProgram;
+    protected static RomeroSimulationProgram thisProgram;
   
     /**
      * Main method is first executed when a program instance is loaded.
@@ -396,7 +396,7 @@ public class ExampleSimulationProgram
      */
     public static void main(String[] args)
     {
-        thisProgram = new ExampleSimulationProgram("test constructor"); // create instance of self within static main() method
+        thisProgram = new RomeroSimulationProgram("test constructor"); // create instance of self within static main() method
         
         thisProgram.disChannel.printlnTRACE("main() started...");
         
diff --git a/examples/src/ViskitOpenDis7Examples/viskitProject.xml b/examples/src/ViskitOpenDis7Examples/viskitProject.xml
index 1d20dbac80..9fb374249e 100644
--- a/examples/src/ViskitOpenDis7Examples/viskitProject.xml
+++ b/examples/src/ViskitOpenDis7Examples/viskitProject.xml
@@ -9,8 +9,9 @@
   </BuildDirectory>
   <DistDirectory name="dist" />
   <LibDirectory name="lib" />
-  <Cached></Cached>
+  <Cached />
   <extraClassPaths>
+    <path value="C:/Users/RJRRLocal/MOVES/Q5/MV3500/src/NetworkedGraphicsMV3500/examples/src/ViskitOpenDis7Examples/lib/Networked_Graphics_MV3500_examples.jar" />
   </extraClassPaths>
 </ViskitProject>
 
-- 
GitLab