Changeset 188 in tmcsimulator for trunk/src/tmcsim/cadsimulator/CADServer.java

Timestamp:

10/29/2017 03:13:25 PM (9 years ago)

Author:

jdalbey

Message:

TrafficModelManager?.java: Now integrated into CAD Server. Passes smoke test, needs system testing.

File:

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

trunk/src/tmcsim/cadsimulator/CADServer.java

@@ -20 +20 @@
 import tmcsim.cadsimulator.managers.ParamicsSimulationManager;
 import tmcsim.cadsimulator.managers.SimulationClockManager;
+import tmcsim.cadsimulator.managers.TrafficModelManager;
 import tmcsim.cadsimulator.viewer.model.CADSimulatorState;
 import tmcsim.common.SimulationException;
@@ -122 +123 @@
         ATMS_PROP_FILE("ATMSProperties"),
         /**
+         * Filepath for the properties file to initialize the traffic manager.
+         */
+        TRAFFICMGR_PROP_FILE("TrafficMgrProperties"),
+        /**
          * Class name of desired user interface.
          */
@@ -168 +173 @@
      */
     protected static ATMSManager theATMSMgr = null;
+    /**
+     * Traffic Model Manager instance
+     */
+    protected static TrafficModelManager theTrafficMgr = null;
     /**
      * Properties file for the CADSimulator.
@@ -242 +251 @@
                     cadSimulatorProperties.getProperty(
                     CAD_PROPERTIES.ATMS_PROP_FILE.name));
+            
+            theTrafficMgr = new TrafficModelManager(
+                    cadSimulatorProperties.getProperty(
+                    CAD_PROPERTIES.TRAFFICMGR_PROP_FILE.name),
+                    theCoordinator);
 
             theMediaMgr = new MediaManager(