Merge origin/master

assignments/src/MV3500Cohort2021JulySeptember/homework3/Fisher/ExampleSimulationProgramFisher.java

@@ -4,9 +4,13 @@ package MV3500Cohort2021JulySeptember.homework3.Fisher;
 /**
  * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
  * This work is provided under a BSD open-source license, see project license.html and license.txt
- * @author brutzman@nps.edu
+ * @author adfis
+ * 
+ * This simulation has two entities moving towards each other and when they 
+ * collide a detonation happens.
  */
 
+import edu.nps.moves.dis7.enumerations.ForceID;
 import edu.nps.moves.dis7.enumerations.VariableRecordType;
 import edu.nps.moves.dis7.pdus.CommentPdu;
 import edu.nps.moves.dis7.pdus.EntityID;
@@ -62,9 +66,19 @@ public class ExampleSimulationProgramFisher
         EntityID       entityID_1    = new EntityID();
         entityID_1.setSiteID(1).setApplicationID(2).setEntityID(3); // made-up example ID; 
         // TODO someday, use enumerations; is there a unique site triplet for MOVES Institute?
+        
+        EntityID       entityID_2    = new EntityID();
+        entityID_2.setSiteID(4).setApplicationID(5).setEntityID(6);
 
         EntityStatePdu entityStatePdu_1 = pduFactory.makeEntityStatePdu();
         entityStatePdu_1.setEntityID(entityID_1);
+        entityStatePdu_1.setForceId(ForceID.FRIENDLY);
+        
+        EntityStatePdu entityStatePdu_2 = pduFactory.makeEntityStatePdu();
+        entityStatePdu_2.setEntityID(entityID_2);
+        entityStatePdu_2.getEntityLocation().setX(10);
+        entityStatePdu_2.setForceId(ForceID.OPPOSING);
+
 
         FirePdu        firePdu_1a       = pduFactory.makeFirePdu(); // for entity 1 first  weapon (if any)
         FirePdu        firePdu_1b       = pduFactory.makeFirePdu(); // for entity 1 second weapon (if any)
@@ -97,7 +111,7 @@ public class ExampleSimulationProgramFisher
             
             // 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
-
+            entityStatePdu_2.getEntityLocation().setX(entityStatePdu_2.getEntityLocation().getX() - 1.0);
             // decide whether to fire, and then update the firePdu.  Hmmm, you might want a target to shoort at!
             
             // etc. etc. your code goes here for your simulation of interest
@@ -129,7 +143,7 @@ public class ExampleSimulationProgramFisher
             System.out.println ("sending PDUs for simulation step " + simulationLoopCount + ", monitor loopback to confirm sent");
             
             // Below is the PDU that comes out as "Comment" in the info
-            sendAllPdusForLoopTimestep(entityStatePdu_1, firePdu_1a, detonationPdu, timeStepComment, narrativeMessage1, narrativeMessage2, narrativeMessage3);
+            sendAllPdusForLoopTimestep(entityStatePdu_1, entityStatePdu_2, firePdu_1a, timeStepComment, narrativeMessage1, narrativeMessage2, narrativeMessage3);
             
             System.out.println ("... [PDUs successfully sent for this loop]");
             
@@ -137,6 +151,7 @@ public class ExampleSimulationProgramFisher
             // loop now finished, check whether to terminate if simulation complete, otherwise continue
             if (simulationComplete || (simulationLoopCount > 10000)) // for example; including fail-safe condition is good
             {
+                sendSinglePdu(detonationPdu);
                 System.out.println ("... [Termination condition met, simulationComplete=" + simulationComplete + "]"); // ", final loopCount=" + loopCount + 
                 break;
             }
@@ -309,23 +324,27 @@ public class ExampleSimulationProgramFisher
      * @param commentType    enumeration value describing purpose of the narrative comment
      * @param comments       String array of narrative comments
      */
-    public void sendAllPdusForLoopTimestep(EntityStatePdu entityStatePdu,
+    public void sendAllPdusForLoopTimestep(EntityStatePdu entityStatePdu1,
+                                EntityStatePdu entityStatePdu2,
                                    FirePdu firePdu,
-                                   DetonationPdu detonationPdu,
+                                   //DetonationPdu detonationPdu,
                         VariableRecordType commentType,
                               // vararg... variable-length set of String comments can optionally follow
                                  String... comments)
     {
-        if (entityStatePdu != null)
-            sendSinglePdu(entityStatePdu);
+        if (entityStatePdu1 != null)
+            sendSinglePdu(entityStatePdu1);
+        
+        if (entityStatePdu2 != null)
+            sendSinglePdu(entityStatePdu2);
                   
 
         if (firePdu != null)
             sendSinglePdu(firePdu); // bang
         
-        if (detonationPdu != null)
-            sendSinglePdu(detonationPdu);
-        
+        //if (detonationPdu != null)
+         //   sendSinglePdu(detonationPdu);
+        //
         if ((comments != null) && (comments.length > 0))
         {
             ArrayList<String> newCommentsList = new ArrayList<>();
@@ -385,7 +404,7 @@ public class ExampleSimulationProgramFisher
 
         thisProgram.runSimulation (); // ... your simulation execution code goes in there ...
         
-        pduRecorder.end();
+        //pduRecorder.end();
 
         thisProgram.tearDownNetworkInterface(); // make sure no processes are left lingering
         

assignments/src/MV3500Cohort2021JulySeptember/homework3/Frank/README.md

+## Homework 3: Example Simulation Recording OpenDIS Network Streams
+
+### Assignment
+
+* Adapt the functionality for [OpenDIS ExampleSimulationProgram](../../../../examples/src/OpenDis7Examples/ExampleSimulationProgram.java), modifying provided code
+* Result streams are recorded/saved/replayed using Wireshark or X3D-Edit.
+
+This assignment  presents a Problem Prototyping opportunity.
+While some minimal functionality is expected, the general outline of
+a networking problem and proposed solution holds great interest.
+Think of it as a warmup preparation for your final project.
+
+This is also a freeplay opportunity. 
+ You have the option to pick one or more of the provided course example programs 
+and adapt the source to demonstrate a new client-server handshake protocol of interest.
+
+Be sure to provide a rationale that justifies why the networking choices you made
+(TCP/UDP, unicast/multicast, etc.) are the best for the problem you are addressing.
+
+Refer to [homework2 README](../homework2/README.md) and [assignments README](../../../README.md)
+for further details on what specific deliverables are expected in each homework assignment.
+
+Team efforts are encouraged, though if you choose a team approach be sure to justify why.
+This is a good warmup prior to final projects. Have fun with Java networking!
+
+### Prior Assignment, August 2019
+
+In 2019, students worked together on a single project to check wireless multicast connectivity recently deployed on NPS campus.  
+
+See their experimental results in the [NPS Multicast Connectivity Report](../../MV3500Cohort2019JulySeptember/homework3).
+

assignments/src/MV3500Cohort2021JulySeptember/homework3/Leckie/PushTest.java

-
-package MV3500Cohort2021JulySeptember.homework3.Leckie;
-
-/**
- *
- * @author Jacob Leckie
- */
-
-
-public class PushTest {
-
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) {
-        // This code does nothing it is test of can I push code.
-    }
-    
-}

assignments/src/MV3500Cohort2021JulySeptember/homework3/Leckie/homework3Leckie.java

+
+package MV3500Cohort2021JulySeptember.homework3.Leckie;
+
+/**
+ *
+ * @author Jacob Leckie
+ */
+
+/**
+ * Copyright (c) 2008-2021, MOVES Institute, Naval Postgraduate School (NPS). All rights reserved.
+ * This work is provided under a BSD open-source license, see project license.html and license.txt
+ */
+package OpenDis7Examples;
+
+import edu.nps.moves.dis7.enumerations.VariableRecordType;
+import edu.nps.moves.dis7.pdus.CommentPdu;
+import edu.nps.moves.dis7.pdus.EntityID;
+import edu.nps.moves.dis7.pdus.EntityStatePdu;
+import edu.nps.moves.dis7.pdus.FirePdu;
+import edu.nps.moves.dis7.pdus.Pdu;
+import edu.nps.moves.dis7.utilities.DisThreadedNetworkInterface;
+import edu.nps.moves.dis7.utilities.PduFactory;
+import edu.nps.moves.dis7.utilities.stream.PduRecorder;
+import java.util.ArrayList;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** The purpose of this program is to provide an easily modifiable example simulation program
+ *  that includes DIS-capable entities doing tasks and reporting them to the network.
+ *  Default settings include PDU recording turned on by default.
+ */
+public class homework3Leckie
+{
+    /**
+     * This runSimulation() method is for you! This block is programmer-modifiable method 
+     * for defining and running a new simulation of interest.
+     * Support include 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 new simulation people to use and adapt.
+     * All of the other methods are setup, tear down and configuration that you don't have to worry about.
+     */
+    @SuppressWarnings("SleepWhileInLoop")
+    public void runSimulation ()
+    {
+      try
+      {
+        /** seconds for real-time execution (not simulation time, which may or may not be the same) */
+        final double LOOP_DURATION_SECONDS  =  1.0; 
+        final int    MAX_LOOP_COUNT = 10;   // be deliberate out out there!
+              int    loopCount = 0;         // initialized at 0
+        boolean simulationComplete = false; // sentinel variable as termination condition,, are we done yet?
+        
+        // TODO reset clock to zero each time for consistent outputs
+        
+        // your model setup: who's who in this zoo?
+        // create PDU objects and set their values
+        
+        EntityID       entityID_1    = new EntityID();
+        entityID_1.setSiteID(1).setApplicationID(2).setEntityID(3); // made-up example ID; 
+        // TODO use enumerations; is there a unique site triplet for MOVES Institute?
+
+        EntityStatePdu entityStatePdu = pduFactory.makeEntityStatePdu();
+        entityStatePdu.setEntityID(entityID_1);
+
+        FirePdu               firePdu = pduFactory.makeFirePdu();
+        // should we customize this munition?  what is it for your simulation?
+        
+        // TODO simulation management PDUs for startup
+        
+        // loop the simulation while allowed, programmer can set additional conditions to break out and finish
+        while (loopCount < MAX_LOOP_COUNT)  // are we done yet?
+        {
+            loopCount++; // good practice: increment loop counter as first action
+            // =============================================================================================
+            // ============================================================================================= 
+            // your own simulation code starts here!
+            
+            //  are there any other variables to modify at the beginning of your loop?
+            
+            // compute a track, update an ESPDU, whatever it is that your model is doing...
+            
+            // Where is my entity?  Insert changes in position.
+            entityStatePdu.getEntityLocation().setX(entityStatePdu.getEntityLocation().getX() + 1.0); // 1m per timestep
+            
+            // decide whether to fire, and then update the firePdu.  Hmmm, you might want a target to shoort at!
+            
+            // etc. etc. your code goes here
+                
+            // something happens between my simulation entities, la de da de da...
+            System.out.println ("... My simulation just did something, no really...");
+            
+            
+            // make your reports: narrative code for CommentPdu here (set all to empty strings to avoid sending)
+            narrativeMessage1 = "MV3500 ExampleSimulationProgram";
+            narrativeMessage2 = "runSimulation() loop " + loopCount;
+            narrativeMessage3 = ""; // intentionally blank for testing
+
+            // your loop termination condition goes here
+            if (loopCount > 4) // for example
+            {
+                simulationComplete = true;
+            }      
+            // your own simulation code is finished here! 
+            
+            
+            
+            // =============================================================================================
+            // =============================================================================================
+            // keep track of 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)(LOOP_DURATION_SECONDS * 1000)); // seconds * (1000 msec/sec) = milliseconds
+            System.out.println ("... [Pausing for " + LOOP_DURATION_SECONDS + " seconds]");
+            
+            // send the status PDUs for this loop and continue
+            System.out.println ("sending PDUs for simulation step " + loopCount + ", monitor loopback to confirm sent");
+            sendAllPdusForLoopTimestep(entityStatePdu, firePdu, timeStepComment, narrativeMessage1, narrativeMessage2, narrativeMessage3);
+            System.out.println ("... [PDUs successfully sent for this loop]");
+            
+            // ===============================
+            // loop now finished, thus terminate if simulation complete, otherwise send latest PDUs and continue
+            if (simulationComplete || (loopCount > 10000)) // for example; including fail-safe condition is good
+            {
+                System.out.println ("... [Termination condition met, simulationComplete=" + simulationComplete + "]"); // ", final loopCount=" + loopCount + 
+                break;
+            }
+        }   // end of while loop
+        // all done
+        narrativeMessage2 = "runSimulation() completed successfully";
+        sendCommentPdu(narrativeComment, narrativeMessage1, narrativeMessage2, narrativeMessage3);
+        System.out.println ("... [final CommentPdu successfully sent for simulation]");
+        // TODO simulation management PDUs
+      } 
+      catch (InterruptedException iex) // handle any exception that your code might choose to provoke!
+      {
+        Logger.getLogger(homework3Leckie.class.getName()).log(Level.SEVERE, null, iex);
+      }
+    }
+    /* **************************** infrastructure code, modification is seldom needed ************************* */
+        
+    private boolean verboseComments = true;
+    String narrativeMessage1 = new String();
+    String narrativeMessage2 = new String();
+    String narrativeMessage3 = new String();
+          
+    /* VariableRecordType enumerations have potential use with CommentPdu logs */
+    VariableRecordType descriptionComment = VariableRecordType.DESCRIPTION;
+    VariableRecordType   narrativeComment = VariableRecordType.COMPLETE_EVENT_REPORT;
+    VariableRecordType      statusComment = VariableRecordType.APPLICATION_STATUS;
+    VariableRecordType    timeStepComment = VariableRecordType.APPLICATION_TIMESTEP;
+    VariableRecordType       otherComment = VariableRecordType.OTHER;
+        
+	/**
+	 * Output prefix to identify this class, helps with logging
+	 */
+    private final static String TRACE_PREFIX = "[" + homework3Leckie.class.getName() + "] ";
+    
+    // class variables
+    PduFactory pduFactory = new PduFactory();
+    DisThreadedNetworkInterface disNetworkInterface;
+    DisThreadedNetworkInterface.PduListener pduListener;
+    Pdu receivedPdu;
+    
+    static final String networkAddress_DEFAULT = "239.1.2.3";
+    static final int    networkPort_DEFAULT    = 3000;
+    static       String networkAddress         = networkAddress_DEFAULT;
+    static       int    networkPort            = networkPort_DEFAULT;
+    
+    /**
+     * Constructor design goal: additional built-in initialization conveniences can go here
+     * to keep student efforts focused on the runSimulation() method.
+     */
+    public homework3Leckie()
+    {
+        // Constructor is under consideration.  Constructor is not currently needed.
+    }
+    
+    /**
+     * 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 homework3Leckie(String address, int port)
+    {
+        setNetworkAddress(address);
+        
+        setNetworkPort(port);
+    }
+
+    /**
+     * @return the networkAddress
+     */
+    public String getNetworkAddress()
+    {
+        return networkAddress;
+    }
+
+    /**
+     * @param newNetworkAddress the networkAddress to set
+     */
+    public final void setNetworkAddress(String newNetworkAddress)
+    {
+        homework3Leckie.networkAddress = newNetworkAddress;
+    }
+
+    /**
+     * @return the networkPort
+     */
+    public int getNetworkPort()
+    {
+        return networkPort;
+    }
+
+    /**
+     * @param newNetworkPort the networkPort to set
+     */
+    public final void setNetworkPort(int newNetworkPort)
+    {
+        homework3Leckie.networkPort = newNetworkPort;
+    }
+
+    /**
+     * Initialize network interface, choosing best available network interface
+     */
+    public void setUpNetworkInterface()
+    {
+        disNetworkInterface = new DisThreadedNetworkInterface(getNetworkAddress(), getNetworkPort());
+        
+        System.out.println("Network confirmation: address=" + disNetworkInterface.getMulticastGroup() + " port=" + disNetworkInterface.getDisPort());
+        pduListener = new DisThreadedNetworkInterface.PduListener()
+        {
+            /** Callback handler for listener */
+            @Override
+            public void incomingPdu(Pdu newPdu)
+            {
+                receivedPdu = newPdu;
+            }
+        };
+        disNetworkInterface.addListener(pduListener);
+    }
+
+    /** All done, release network resources */
+    public void tearDownNetworkInterface()
+    {
+        disNetworkInterface.removeListener(pduListener);
+        disNetworkInterface.kill();
+        disNetworkInterface = null;
+    }
+
+    /** 
+     * Send a single Protocol Data Unit (PDU) of any type
+     * @param pdu the pdu to send
+     */
+    private void sendSinglePdu(Pdu pdu)
+    {
+        try
+        {
+            disNetworkInterface.send(pdu);
+            Thread.sleep(100); // TODO consider refactoring the wait logic and moving externally
+        } 
+        catch (InterruptedException ex)
+        {
+            System.err.println(this.getClass().getName() + " Error sending PDU: " + ex.getLocalizedMessage());
+            System.exit(1);
+        }
+    }
+
+    /**
+     * Send Comment PDU
+     * @see <a href="https://docs.oracle.com/javase/tutorial/java/javaOO/arguments.html">Passing Information to a Method or a Constructor</a> Arbitrary Number of Arguments
+     * @param commentType    enumeration value describing purpose of the narrative comment
+     * @param comments       String array of narrative comments
+     */
+    public void sendCommentPdu(VariableRecordType commentType,
+                                     // vararg... variable-length set of String comments can optionally follow
+                                        String... comments)
+    {
+        sendAllPdusForLoopTimestep (null, null, commentType, comments);
+    }
+
+    /**
+     * Send EntityState, Fire, Comment PDUs that got updated for this loop, reflecting state of current simulation timestep.
+     * @see <a href="https://docs.oracle.com/javase/tutorial/java/javaOO/arguments.html">Passing Information to a Method or a Constructor</a> Arbitrary Number of Arguments
+     * @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
+     * @param comments       String array of narrative comments
+     */
+    public void sendAllPdusForLoopTimestep(EntityStatePdu entityStatePdu,
+                                   FirePdu firePdu,
+                        VariableRecordType commentType,
+                              // vararg... variable-length set of String comments can optionally follow
+                                 String... comments)
+    {
+        if (entityStatePdu != null)
+            sendSinglePdu(entityStatePdu);
+            
+        if (firePdu != null)
+            sendSinglePdu(firePdu); // bang
+        
+        if ((comments != null) && (comments.length > 0))
+        {
+            ArrayList<String> newCommentsList = new ArrayList<>();
+            for (int i = 0; i < comments.length; i++)
+            {
+                if (!comments[i].isEmpty())
+                     newCommentsList.add(comments[i]); // OK found something to send
+            }
+            if (!newCommentsList.isEmpty())
+            {
+                if (commentType == null)
+                    commentType = otherComment; // fallback value otherComment
+                // now build the commentPdu from these string inputs, thus constructing a narrative entry
+                CommentPdu commentPdu = pduFactory.makeCommentPdu(commentType, newCommentsList.toArray(new String[0])); // comments);
+                sendSinglePdu(commentPdu);
+                if (isVerboseComments())
+                    System.out.println("*** [Narrative comment sent: " + commentType.name() + "] " + newCommentsList.toString());
+            }
+        }
+    }
+  
+    /**
+     * Main method is first executed when a program instance is loaded.
+     * @see <a href="https://docs.oracle.com/javase/tutorial/getStarted/application/index.html">Java Tutorials: A Closer Look at the "Hello World!" Application</a>
+     * @param args command-line arguments are an array of optional String parameters that are passed from execution environment during invocation
+     */
+    public static void main(String[] args)
+    {
+        System.out.println(TRACE_PREFIX + "started...");
+        
+        homework3Leckie thisProgram = new homework3Leckie(); // creates instance
+        
+        // initial execution: can handle args array of initialization arguments here
+        if (args.length == 2)
+        {
+            if ((args[0] != null) && !args[0].isEmpty())
+                thisProgram.setNetworkAddress(args[0]);
+            
+            if ((args[1] != null) && !args[1].isEmpty())
+                thisProgram.setNetworkPort(Integer.parseInt(args[1]));
+        }
+        else if (args.length != 0)
+        {
+            System.err.println("Usage: " + thisProgram.getClass().getName() + " [address port]");
+            System.exit(-1);
+        }
+        // OK here we go...
+
+        thisProgram.setUpNetworkInterface();
+        
+        String DEFAULT_OUTPUT_DIRECTORY = "./pduLog";
+        String outputDirectory = DEFAULT_OUTPUT_DIRECTORY;
+        System.out.println("Beginning pdu save to directory " + outputDirectory);
+        PduRecorder pduRecorder = new PduRecorder(outputDirectory, networkAddress, networkPort); // assumes save
+
+        thisProgram.runSimulation (); // ... your simulation execution code goes in there ...
+        
+//        pduRecorder.end();  // ".end()" was throwing an error.
+        pduRecorder.stop();
+
+        thisProgram.tearDownNetworkInterface(); // make sure no processes are left lingering
+        
+        System.out.println(TRACE_PREFIX + "complete."); // report successful completion
+    }
+
+    /**
+     * @return whether verboseComments mode is enabled
+     */
+    public boolean isVerboseComments() {
+        return verboseComments;
+    }
+
+    /**
+     * @param newVerboseComments whether verboseComments mode is enabled
+     */
+    public void setVerboseComments(boolean newVerboseComments) {
+        this.verboseComments = newVerboseComments;
+    }
+}

presentations/01_README_LVC.md

@@ -3,7 +3,9 @@
 Interesting aspect of LVC is that definitions can vary widely, continuing to evolve.
 How someone considers LVC often shows a lot about the individual than the concept.
 
-For NPS students: what do you consider to be great examples of Live, Virtual and Constructive for your professional community?  For your modeling and simulation areas of interest?
+For NPS students: what do you consider to be great examples of Live, Virtual and Constructive (LVC)
+for your professional community?  For your modeling and simulation areas of interest?
+This interesting question broadens and deepens steadily as capabilities make progress.
 
 
 ## Live
@@ -13,7 +15,7 @@ For NPS students: what do you consider to be great examples of Live, Virtual and
 3. MEU Amphibious Landing Beach Operations Group 
 4. Any "live fire" attack, in training 
 5. Infantry Immersion Trainer (IIT)
-6. Cyber training: red vs. blue team link: https://www.csoonline.com/article/2122440/emergency-preparedness-red-team-versus-blue-team-how-to-run-an-effective-simulation.html
+6. Cyber training: [red vs. blue team](https://www.csoonline.com/article/2122440/emergency-preparedness-red-team-versus-blue-team-how-to-run-an-effective-simulation.html)
 7. (Your Example Here)
 
 
@@ -24,6 +26,7 @@ For NPS students: what do you consider to be great examples of Live, Virtual and
 3. Convoy Simulator 
 4. Cyber education and training facility in a simulated environment 
 5. Small Arms fire simulator (i.e AGSHP (germany))
+6. (Your Example Here)
 
 
 ## Constructive
@@ -32,5 +35,5 @@ For NPS students: what do you consider to be great examples of Live, Virtual and
 2. Combat XXI (Never used constructive simulations during my time in the fleet "Chris C.")
 3. Joint Conflict and Tactical Simulation
 4. Joint Deployment Logistics Model (JDLM)
-3. (Your Example Here)
+5. (Your Example Here)
 

presentations/10_TENA_References.md

@@ -2,21 +2,19 @@
 
 # Test and Training Enabling Architecture (TENA)
 
-> "The United States Office of the Secretary of Defense Test Resource Management Center (TRMC)
-> has developed a common architecture to support effective integration and reuse of testing,
-> training, and simulation capabilities that require real-time collaboration between
-> distributed computer systems operating within diverse testing and training environments.
-> Through the establishment of the Test and Training Enabling Architecture (TENA),
-> the interoperability and reuse of range assets are tremendously improved,
-> thereby the reducing development, operation, and maintenance costs of range systems."
+> "The OSD’s Test Resource Management Center (TRMC) Central Test and Evaluation 
+> Investment Program (CTEIP) is developing and validating a common architecture and 
+> requisite software to integrate testing, training, simulation, and high-performance computing technologies, distributed across many facilities. Through the establishment of a 
+> common architecture, the Test and Training Enabling Architecture (TENA), reuse and 
+> interoperability of range assets will be tremendously improved, thus reducing range development, operation, and maintenance costs"
 
-1. [TENA Home](https://www.tena-sda.org/display/TENAintro/Home) and [TENA Introduction Documentation](https://www.tena-sda.org/display/TENAintro/Home)
+1. [TENA Home](https://www.tena-sda.org) 
 
-2. [IITSEC 2018 TENA Tutorial](../conferences/IITSEC2018/IITSEC2018_TENA_Tutorial_1716wide.pdf)
+2. [TENA Overview Fact Sheet](https://www.tena-sda.org/attachments/TENA-OverviewFS-2020-03-16-DistA.pdf)
 
-3. [TENA About](https://www.tena-sda.org/display/TENAintro/About+TENA)
+3. [TENA Overview Briefing](https://www.tena-sda.org/attachments/TENA-OverviewBrief-2019-10-15-DistA.pdf)
 
-4. [TENA Introduction Documentation](https://www.tena-sda.org/display/TENAintro/Documentation)
+4. [IITSEC 2018 TENA Tutorial](../conferences/IITSEC2018/IITSEC2018_TENA_Tutorial_1716wide.pdf)
 
 5. [TENA Wikipedia](https://en.wikipedia.org/wiki/Test_and_Training_Enabling_Architecture)
 
@@ -26,12 +24,18 @@
 > persistent capability for linking distributed facilities,
 > enabling DoD customers to develop and test warfighting capabilities in a Joint Context."
 
-6. [JMETC DASD DT&E Test Resource Management Center (TMRC)](https://www.acq.osd.mil/dte-trmc/interoperability.html) and [JMETC Home](http://www.jmetc.org)
+6. [JMETC DASD DT&E Test Resource Management Center (TMRC)](https://www.trmc.osd.mil) 
 
-7. [JMETC Program Overview](https://www.tena-sda.org/download/attachments/67898070/JMETCOverviewBrief-2017-12-19%5BdistA%5D.pdf) (slideset, 2017)
+7. [JMETC Home](https://www.trmc.osd.mil/jmetc-home.html)
 
-8. [JMETC Enables Distributed Testing, Overview](https://www.tena-sda.org/download/attachments/67898070/JMETC%20Overview%20171003.pdf) (flyer, 2017)
+8. [JMETC Program Overview](https://www.tena-sda.org/attachments/JMETC-OverviewFS-2020-03-16-DistA.pdf) (flyer, 2020) 
 
-9. "[Distributed: the Next Step in T&E](https://www.acq.osd.mil/dte-trmc/docs/The%20Next%20Step%20in%20T&E-2014.PDF)," Bernard "Chip" Ferguson and Neyer Torrico, _ITEA Journal of Test and Evaluation_, vol. 35 no. 2, pp. 132-135, June 2014.
+9. [TENA JMETC Overview Brief](https://www.trmc.osd.mil/attachments/JMETC-OverviewBrief-2019-06-05-DistA.pdf) (slideset, 2019)
 
-10. "[An Update on the JMETC and the Distributed Testing World](https://www.acq.osd.mil/dte-trmc/docs/JMETC%20and%20the%20Distributed%20Testing%20World.pdf)," Bernard "Chip" Ferguson, _ITEA Journal of Test and Evaluation_, vol. 34 no. 4, pp. 317-320, December 2013.
+### Historic
+
+TODO: link updates, if possible
+
+*  "[Distributed: the Next Step in T&E](https://www.acq.osd.mil/dte-trmc/docs/The%20Next%20Step%20in%20T&E-2014.PDF)," Bernard "Chip" Ferguson and Neyer Torrico, _ITEA Journal of Test and Evaluation_, vol. 35 no. 2, pp. 132-135, June 2014.
+
+* "[An Update on the JMETC and the Distributed Testing World](https://www.acq.osd.mil/dte-trmc/docs/JMETC%20and%20the%20Distributed%20Testing%20World.pdf)," Bernard "Chip" Ferguson, _ITEA Journal of Test and Evaluation_, vol. 34 no. 4, pp. 317-320, December 2013.