Changeset 103 in tmcsimulator for trunk/src/atmsdriver/ATMSDriver.java

Timestamp:

10/12/2017 12:28:28 AM (9 years ago)

Author:

jtorres

Message:

trunk/src/atmsdriver/ConsoleDriver.java: Created console driver for ATMSDriver, completed and very nice. Still need to apply correct vol/occ values to actually change the colors. Still need to write a JUnit test for it. trunk/src/atmsdriver/ATMSDriver.java: Refactored to run the console driver. ATMSDriver runs in thread, console driver runs, and they share the highways instance. Renamed NetworkLoader?.java to FEPLineLoader.java. trunk/src/atmsdriver/model/Highways.java: refactored loadHighways() method to conform to new undirected highway abstraction. trunk/src/atmsdriver/model/Station.java: added updateByDirection(DIRECTION dir) method and supporting utility methods. trunk/test/atmsdriver/model/LoadHighwaysTest.java: Conformed LoadHighways? test to new undirected highway abstraction. trunk/test/atmsdriver/model/StationTest.java: Conformed StationTest?.java to new changes - very minor stuff. Went through all model classes and changed any final privates with a getter method to final public, for good OOP practice and simplicity. Went through ALL FILES and commented everything very well. minor application custom configuration changes. Removed all .class or .o.d files from svn repository

File:

• trunk/src/atmsdriver/ATMSDriver.java (modified) (5 diffs)

trunk/src/atmsdriver/ATMSDriver.java

@@ -2 +2 @@
 
 import atmsdriver.model.Highways;
-import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
 import java.util.Properties;
 import java.util.logging.Level;
@@ -25 +22 @@
      */
     private static Logger ATMSDriverLogger = Logger.getLogger("atmsdriver");
-
-    private static final String CONFIG_FILE_NAME = "atms_driver_config.properties";
 
     /**
@@ -95 +90 @@
 
     public ATMSDriver(String propertiesFile) {
-
+        // verify properties file
         if (!verifyProperties(propertiesFile)) {
             System.exit(0);
         }
-
+        // create the highways model
         highways = new Highways(
                 ATMSDriverProperties.getProperty(
@@ -110 +105 @@
                 Integer.parseInt(ATMSDriverProperties.getProperty(
                                 PROPERTIES.FEP_WRITER_PORT.name)));
-        
+        // create the exchange reader
         exchangeReader = new ExchangeReader();
     }
-
+    
+    /**
+     * Verifies that the properties file has all necessary properties.
+     * 
+     * @param propertiesFile
+     * @return 
+     */
     private boolean verifyProperties(String propertiesFile) {
         // Load the properties file.
@@ -133 +134 @@
         try {
             if (System.getProperty("ATMSDRIVER_PROPERTIES") != null) {
-                new Thread(new ATMSDriver(System.getProperty(
-                        "ATMSDRIVER_PROPERTIES"))).start();
+                // Create and run the ATMSDriver thread
+                ATMSDriver atmsDriver = new ATMSDriver(System.getProperty("ATMSDRIVER_PROPERTIES"));
+                Thread ATMSDriverThread = new Thread(atmsDriver);
+                ATMSDriverThread.start();
+                
+                // run the console driver, pass it the atmsDriver highways model
+                ConsoleDriver driver = new ConsoleDriver(atmsDriver.highways);
+                
             } else {
                 throw new Exception("ATMSDRIVER_PROPERTIES system property not defined.");