From 4b1e33a90df34b50aa23caac48e95cbfb056c899 Mon Sep 17 00:00:00 2001
From: ctsfi <ctsfi@MSI>
Date: Tue, 15 Sep 2020 17:03:37 -0700
Subject: [PATCH] Project Progress

---
 .../White/working/Receiver Output Log.md      | 73 +++++++++++++++----
 .../White/working/WhiteSimulation.java        |  8 +-
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/Receiver Output Log.md b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/Receiver Output Log.md
index a8efe650eb..136bf9314b 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/Receiver Output Log.md	
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/Receiver Output Log.md	
@@ -1,46 +1,87 @@
 [MV3500Cohort2020JulySeptember.homework4.White.working.PDUReciever] started...
 [MV3500Cohort2020JulySeptember.homework4.White.working.PDUReciever] listening for PDU packets on port 2317
 ====================================================
-  1. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  1. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 25] 
-New Entity: EntityKind 1 PLATFORM Land Country 225 UNITED_STATES_OF_AMERICA_USA 2 41 3
+     New Entity: EntityKind 1 PLATFORM Land Country 225 UNITED_STATES_OF_AMERICA_USA 2 41 3
      Location in DIS coordinates:        [-2707501.7340396782, -4353408.810297934, 3781834.0645668795]
-  2. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  2. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 25] 
      Location in DIS coordinates:        [-2707521.7340396782, -4353483.810297934, 3781834.0645668795]
-  3. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  3. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 2] 
-New Entity: EntityKind 1 PLATFORM Land Country 260 RUSSIA 2 41 3
+     New Entity: EntityKind 1 PLATFORM Land Country 260 RUSSIA 2 41 3
      Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
-  4. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  4. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 25] 
      Location in DIS coordinates:        [-2707541.7340396782, -4353558.810297934, 3781834.0645668795]
-  5. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  5. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 2] 
      Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
-  6. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.7
+  6. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.8
      messages:  "LAV25-A2 ACQUIRES TARGET BMP2 WITHIN FIRING DISTANCE"
-  7. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  7. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 25] 
      Location in DIS coordinates:        [-2707561.7340396782, -4353633.810297934, 3781834.0645668795]
-  8. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+  8. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 2] 
      Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
-  9. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu  from /10.1.105.7
+  9. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu  from /10.1.105.8
      firingEntityID triplet: [1, 13, 25] 
      targetEntityID triplet: [1, 13, 2] 
      Munition Information:   [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.2.1]
- 10. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+ 10. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 25] 
      Location in DIS coordinates:        [-2707581.7340396782, -4353708.810297934, 3781834.0645668795]
- 11. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+ 11. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.8
      entityID triplet: [1, 13, 2] 
      Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
- 12. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu  from /10.1.105.7
+ 12. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu  from /10.1.105.8
      firingEntityID triplet: [1, 13, 25] 
      targetEntityID triplet: [1, 13, 2] 
      Munition Information:   [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.2.1]
- 13. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.7
+ 13. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.8
      messages:  "BMP2 DESTROYED BY LAV25-A2 AFTER TWO BURSTS OF 25mm HEI-T ON TARGET"
- 14. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.7
+ 14. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.8
+     messages:  "White Simulation Completed"
+ 15. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 25] 
+     Location in DIS coordinates:        [-2707501.7340396782, -4353408.810297934, 3781834.0645668795]
+ 16. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 25] 
+     Location in DIS coordinates:        [-2707521.7340396782, -4353483.810297934, 3781834.0645668795]
+ 17. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 2] 
+     Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
+ 18. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 25] 
+     Location in DIS coordinates:        [-2707541.7340396782, -4353558.810297934, 3781834.0645668795]
+ 19. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 2] 
+     Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
+ 20. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.7
+     messages:  "LAV25-A2 ACQUIRES TARGET BMP2 WITHIN FIRING DISTANCE"
+ 21. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 25] 
+     Location in DIS coordinates:        [-2707561.7340396782, -4353633.810297934, 3781834.0645668795]
+ 22. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 2] 
+     Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
+ 23. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu  from /10.1.105.7
+     firingEntityID triplet: [1, 13, 25] 
+     targetEntityID triplet: [1, 13, 2] 
+     Munition Information:   [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.2.1]
+ 24. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 25] 
+     Location in DIS coordinates:        [-2707581.7340396782, -4353708.810297934, 3781834.0645668795]
+ 25. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu  from /10.1.105.7
+     entityID triplet: [1, 13, 2] 
+     Location in DIS coordinates:        [-2707576.630668249, -4353720.04383471, 3781324.902449432]
+ 26. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu  from /10.1.105.7
+     firingEntityID triplet: [1, 13, 25] 
+     targetEntityID triplet: [1, 13, 2] 
+     Munition Information:   [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.2.1]
+ 27. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.7
+     messages:  "BMP2 DESTROYED BY LAV25-A2 AFTER TWO BURSTS OF 25mm HEI-T ON TARGET"
+ 28. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu  from /10.1.105.7
      messages:  "White Simulation Completed"
\ No newline at end of file
diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java
index 5208527bf2..c2799bdbf8 100644
--- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java
+++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/White/working/WhiteSimulation.java
@@ -375,13 +375,7 @@ public class WhiteSimulation
             }
             }
             
-            // make your reports: narrative code for CommentPdu here (set all to empty strings to avoid sending)
-            narrativeMessage1 = "MV3500 ExampleSimulationProgram";
-            narrativeMessage2 = "runSimulation() loop " + loopCount;
-            narrativeMessage3 = "LAV-25A2"; // intentionally blank for testing
-            if (narrativeMessage4.isEmpty()){
-            narrativeMessage4 = "BMP2";
-            }
+            
             // your loop termination condition goes here
             if (loopCount > 4) // for example
             {
-- 
GitLab