diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java index 659eec43b65da81ca097965cf0549fd672a7f51d..cc43ae2fd99bc4f5bf3b6800a75011cefb7fbbcc 100644 --- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java +++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonArtillerySimulation.java @@ -226,9 +226,9 @@ public class CannonArtillerySimulation { entityStatePdu.setEntityID(entityID_1); EntityID paladinID = new EntityID(); - paladinID.setSiteID(1); - paladinID.setApplicationID(13); - paladinID.setEntityID(25); + paladinID.setSiteID(2); + paladinID.setApplicationID(10); + paladinID.setEntityID(3); entityStatePdu.setEntityID(paladinID); EntityType paladinType = new EntityType(); //1.1.225.4.3.7 M109A6 Paladin (Self-proppelled howitzer) paladinType.setEntityKind(EntityKind.PLATFORM); @@ -289,9 +289,9 @@ public class CannonArtillerySimulation { //FirePdu firePduNull = new FirePdu(); FirePdu firePdu = pduFactory.makeFirePdu(); EntityID fireID = new EntityID(); - fireID.setSiteID(1); - fireID.setApplicationID(13); - fireID.setEntityID(25); + fireID.setSiteID(2); + fireID.setApplicationID(10); + fireID.setEntityID(3); EntityID targetID = new EntityID(); targetID.setSiteID(1); targetID.setApplicationID(13); diff --git a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonOutputLog.md b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonOutputLog.md index 674a1091f8c7617c4620559cce10a5ac64951458..3645bf9e062f9f972aa1218b248ab73c40c09f28 100644 --- a/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonOutputLog.md +++ b/assignments/src/MV3500Cohort2020JulySeptember/homework4/Cannon/CannonOutputLog.md @@ -2,7 +2,7 @@ [MV3500Cohort2020JulySeptember.homework4.Cannon.PDUReciever] listening for PDU packets on port 2317 ==================================================== 1. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 - entityID triplet: [1, 13, 25] + entityID triplet: [2, 10, 3] New Entity: EntityKind 1 PLATFORM Land Country 225 UNITED_STATES_OF_AMERICA_USA 4 3 7 Location in DIS coordinates: [-2709702.5301454174, -4349384.2159421, 3784766.9772485564] 2. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 @@ -10,57 +10,57 @@ New Entity: EntityKind 1 PLATFORM Land Country 260 RUSSIA 2 41 3 Location in DIS coordinates: [-2707576.630668249, -4353720.04383471, 3781324.902449432] 3. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu from /127.0.0.1 - firingEntityID triplet: [1, 13, 25] + firingEntityID triplet: [2, 10, 3] targetEntityID triplet: [1, 13, 2] Munition Information: [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.14.1.2] 4. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 - entityID triplet: [1, 13, 25] + entityID triplet: [2, 10, 3] Location in DIS coordinates: [-2709702.5301454174, -4349384.2159421, 3784766.9772485564] 5. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 entityID triplet: [1, 13, 2] Location in DIS coordinates: [-2707576.630668249, -4353720.04383471, 3781324.902449432] 6. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu from /127.0.0.1 - firingEntityID triplet: [1, 13, 25] + firingEntityID triplet: [2, 10, 3] targetEntityID triplet: [1, 13, 2] Munition Information: [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.14.1.2] 7. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 - entityID triplet: [1, 13, 25] + entityID triplet: [2, 10, 3] Location in DIS coordinates: [-2709702.5301454174, -4349384.2159421, 3784766.9772485564] 8. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 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 /127.0.0.1 - firingEntityID triplet: [1, 13, 25] + firingEntityID triplet: [2, 10, 3] targetEntityID triplet: [1, 13, 2] Munition Information: [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.14.1.2] 10. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 - entityID triplet: [1, 13, 25] + entityID triplet: [2, 10, 3] Location in DIS coordinates: [-2709702.5301454174, -4349384.2159421, 3784766.9772485564] 11. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 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 /127.0.0.1 - firingEntityID triplet: [1, 13, 25] + firingEntityID triplet: [2, 10, 3] targetEntityID triplet: [1, 13, 2] Munition Information: [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.14.1.2] 13. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 - entityID triplet: [1, 13, 25] + entityID triplet: [2, 10, 3] Location in DIS coordinates: [-2709702.5301454174, -4349384.2159421, 3784766.9772485564] 14. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 entityID triplet: [1, 13, 2] Location in DIS coordinates: [-2707576.630668249, -4353720.04383471, 3781324.902449432] 15. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu from /127.0.0.1 - firingEntityID triplet: [1, 13, 25] + firingEntityID triplet: [2, 10, 3] targetEntityID triplet: [1, 13, 2] Munition Information: [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.14.1.2] 16. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 - entityID triplet: [1, 13, 25] + entityID triplet: [2, 10, 3] Location in DIS coordinates: [-2709702.5301454174, -4349384.2159421, 3784766.9772485564] 17. received PDU type 1=ENTITY_STATE edu.nps.moves.dis7.pdus.EntityStatePdu from /127.0.0.1 entityID triplet: [1, 13, 2] Location in DIS coordinates: [-2707576.630668249, -4353720.04383471, 3781324.902449432] 18. received PDU type 2=FIRE edu.nps.moves.dis7.pdus.FirePdu from /127.0.0.1 - firingEntityID triplet: [1, 13, 25] + firingEntityID triplet: [2, 10, 3] targetEntityID triplet: [1, 13, 2] Munition Information: [Air.Country 225 UNITED_STATES_OF_AMERICA_USA.2.14.1.2] 19. received PDU type 62=COMMENT_RELIABLE edu.nps.moves.dis7.pdus.CommentReliablePdu from /127.0.0.1