DisTime improvements open-dis7

examples/src/OpenDis7Examples/ExampleSimulationProgram.java

@@ -49,7 +49,7 @@ public class ExampleSimulationProgram
     
     /* Declare DIS Protocol Data Unit (PDU) classes for simulation entities */
     
-    DisTime.TimestampStyle       timestampStyle      = DisTime.TimestampStyle.YEAR;
+    DisTime.TimestampStyle       timestampStyle      = DisTime.TimestampStyle.IEEE_ABSOLUTE;
     PduFactory                   pduFactory          = new PduFactory(timestampStyle);
        
     protected EntityID           entityID_1          = new EntityID();

examples/src/OpenDis7Examples/ExampleSimulationProgramLog.txt

@@ -75,8 +75,8 @@ sending PDUs for simulation step 3, monitor loopback to confirm sent
 ... [Pausing for 1.0 seconds]
 sending PDUs for simulation step 4, monitor loopback to confirm sent
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [sending 13] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
-[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 13] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
 [DisThreadedNetworkInterface PduRecorder] [receipt 13] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
+[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 13] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [sending 14] DisPduType 02 FIRE, size 96 bytes)
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 14] DisPduType 02 FIRE, size 96 bytes)
 [DisThreadedNetworkInterface PduRecorder] [receipt 14] DisPduType 02 FIRE, size 96 bytes)
@@ -92,8 +92,8 @@ sending PDUs for simulation step 4, monitor loopback to confirm sent
 ... [Pausing for 1.0 seconds]
 sending PDUs for simulation step 5, monitor loopback to confirm sent
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [sending 17] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
-[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 17] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
 [DisThreadedNetworkInterface PduRecorder] [receipt 17] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
+[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 17] DisPduType 01 ENTITY_STATE   Entity #1, size 144 bytes)
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [sending 18] DisPduType 02 FIRE, size 96 bytes)
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 18] DisPduType 02 FIRE, size 96 bytes)
 [DisThreadedNetworkInterface PduRecorder] [receipt 18] DisPduType 02 FIRE, size 96 bytes)
@@ -102,13 +102,13 @@ sending PDUs for simulation step 5, monitor loopback to confirm sent
 [DisThreadedNetworkInterface PduRecorder] [receipt 19] DisPduType 22 COMMENT, size 104 bytes)
 *** [Narrative comment sent: APPLICATION_TIMESTEP] [MV3500 ExampleSimulationProgram, runSimulation() loop 5]
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [sending 20] DisPduType 01 ENTITY_STATE   Entity #2, size 144 bytes)
-[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 20] DisPduType 01 ENTITY_STATE   Entity #2, size 144 bytes)
 [DisThreadedNetworkInterface PduRecorder] [receipt 20] DisPduType 01 ENTITY_STATE   Entity #2, size 144 bytes)
+[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 20] DisPduType 01 ENTITY_STATE   Entity #2, size 144 bytes)
 ... [PDUs successfully sent for this loop]
 ... [loop termination condition met, simulationComplete=true]
 [DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [sending 21] DisPduType 22 COMMENT, size 120 bytes)
-[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 21] DisPduType 22 COMMENT, size 120 bytes)
 [DisThreadedNetworkInterface PduRecorder] [receipt 21] DisPduType 22 COMMENT, size 120 bytes)
+[DisThreadedNetworkInterface ExampleSimulationProgram pdu looping] [receipt 21] DisPduType 22 COMMENT, size 120 bytes)
 *** [Narrative comment sent: COMPLETE_EVENT_REPORT] [MV3500 ExampleSimulationProgram, runSimulation() completed successfully]
 ... [final CommentPdu successfully sent for simulation]
 *** setKillSentinelAndInterrupts() killed=true sendingThread.isInterrupted()=true receiveThread.isInterrupted()=true

examples/src/OpenDis7Examples/PduTrack.java

@@ -71,7 +71,7 @@ public class PduTrack
     private Vector3Double   latestLocation;
     
     /** waypoint timelineList in seconds */
-    private ArrayList<Float>       timelineList = new ArrayList<>();
+    private ArrayList<Float>          timelineList = new ArrayList<>();
     private ArrayList<Vector3Double> waypointsList = new ArrayList<>();
     private ArrayList<EulerAngles> eulerAnglesList = new ArrayList<>();
     
@@ -85,8 +85,8 @@ public class PduTrack
     private String      x3dOrientationInterpolatorDEF = new String();
     private boolean      addLineBreaksWithinKeyValues = false;
     
-    protected PduFactory             pduFactory            = new PduFactory();
     public    DisTime.TimestampStyle timestampStyle        = DisTime.TimestampStyle.IEEE_ABSOLUTE;
+    protected PduFactory             pduFactory            = new PduFactory(timestampStyle);
     private   LocalDateTime          recordingStart;
     private   LocalDateTime          recordingStop;
     private   String                 todaysDateString      = new String();
@@ -884,7 +884,8 @@ public class PduTrack
         pduTrack.setX3dModelIdentifier("https://gitlab.nps.edu/Savage/NetworkedGraphicsMV3500/-/blob/master/examples/src/OpenDis7Examples/PduTrackInterpolation.x3d");
         pduTrack.setDefaultWaypointInterval(1.0f); // experimentation with timestamp values
 
-//        DisTime.setInitialTimestampEpoch(DisTime.getCurrentDisAbsoluteTimestamp()); // TODO testing
+        DisTime.setEpochLvcNow();
+        recordingStart = LocalDateTime.now();
         Instant epoch = DisTime.getEpochLvc();
         System.out.println(TRACE_PREFIX + "DisTime.hasEpochLvc()=" + DisTime.hasEpochLvc() + 
                                          ", DisTime.getEpochLvc()=" + epoch + 
@@ -898,8 +899,7 @@ public class PduTrack
         {
 //          EntityStatePdu espdu = new EntityStatePdu();
             EntityStatePdu espdu = pduFactory.makeEntityStatePdu(); // TODO check Pdu.Type
-            espdu.setTimestamp(DisTime.getCurrentDisAbsoluteTimestamp()); // default
-//          espdu.setTimestamp(DisTime.getCurrentYearTimestamp());        // TODO test
+            espdu.setTimestamp(DisTime.getCurrentDisTimestamp()); // chooses appropriate version
             espdu.setMarking("ESPDU " + i);
             espdu.setEntityLocation(i, i, i);
             espdu.setEntityOrientation(0, (float)(45.0 * Math.PI / 180.0), 0);
@@ -1003,6 +1003,7 @@ public class PduTrack
         System.out.println(pduTrack.createX3dModel()); // 
         System.out.println("=================================");
 
+        recordingStop = LocalDateTime.now();
         System.out.println(TRACE_PREFIX + "selfTest() complete.");
     }