Changeset 193 in tmcsimulator

Timestamp:

10/30/2017 02:10:10 PM (9 years ago)

Author:

jdalbey

Message:

TrafficModelManager?: Added extra config property to allow for specifying output destination (console or FEP).

File:

• trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java (modified) (4 diffs)

trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java

@@ -71 +71 @@
          *
          */
-        EVENTS_FILE("Events_File");
-
+        EVENTS_FILE("Events_File"),
+        OUTPUT_DEST("Output_Destination");
+        
         public String name;
 
@@ -198 +199 @@
         timer.start();
 
-        // Start the FEP thread (to update ATMS every 30 sec). (See class def below)
-        Thread wtfep = new WriteToFEPThread();
-        wtfep.start();
+        if (atmsProperties.getProperty(PROPERTIES.OUTPUT_DEST.name).equals("FEP"))
+        {
+            // Start the FEP thread (to update ATMS every 30 sec). (See class def below)
+            Thread wtfep = new WriteToFEPThread();
+            wtfep.start();
+        }
+        else
+        {
+            Thread wtConsole = new WriteToConsoleThread();
+            wtConsole.start();
+        }
         
     }
@@ -239 +248 @@
         if (atmsProperties.getProperty(PROPERTIES.HIGHWAYS_MAP_FILE.name) == null
                 || atmsProperties.getProperty(PROPERTIES.FEPSIM_IP_ADDR.name) == null
-                || atmsProperties.getProperty(PROPERTIES.EVENTS_FILE.name) == null)
+                || atmsProperties.getProperty(PROPERTIES.EVENTS_FILE.name) == null
+                || atmsProperties.getProperty(PROPERTIES.OUTPUT_DEST.name) == null)
         {
             atmsLogger.logp(Level.SEVERE, "TrafficModelManager",
@@ -388 +398 @@
 
     }
+    class WriteToConsoleThread extends Thread
+    {
+
+        public void run()
+        {
+            System.out.println("WriteToConsole Thread starting.");
+            // Run indefinitely
+            while (true)
+            {
+                 // Write the highway network status to the FEP Simulator
+                 System.out.println(highways.toString());
+
+                // Wait for FEP Sim to process the data we just sent
+                try
+                {
+                    Thread.sleep(1000);
+                }
+                catch (InterruptedException ie)
+                {
+                    ie.printStackTrace();
+                }
+            }
+
+        }
+    }
+    
     class WriteToFEPThread extends Thread
     {