Changeset 103 in tmcsimulator for trunk/src/atmsdriver/FEPLineLoader.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/FEPLineLoader.java (moved) (moved from trunk/src/atmsdriver/NetworkLoader.java) (3 diffs)

trunk/src/atmsdriver/FEPLineLoader.java

@@ -13 +13 @@
 import java.util.logging.Logger;
 
-/** The NetworkReader loads all static data for the traffic network through
- *  network lookup files. 
+/** The FEPLineLoader loads all static data for the FEPLines, using the station
+ *  and loop lookup files.
+ * 
+ *  THIS CLASS WILL BE REMOVED AND THE LOADING OF FEPLINES WILL BE THE RESPONSIBILITY
+ *  OF THE HIGHWAYS.JAVA CLASS FOR PROPER OOP. JUST USING FOR NOW BECAUSE IT WORKS.
  * 
  *  The public method getFEPLines() method can be used to get all the FEPLines 
-  within a network. All other methods are private and are used to construct
-  the FEPLines.
- 
-  The "LDSFile" contains Station and FEPLine information.
-  ex.
-   < Insert file here >
- *  The "loopFile" contains individual LoopDetector information.
- *  ex.
- *   < Insert file here > 
+ *  within the network. All other methods are private and are used to construct
+ *  the FEPLines.
  *
  * @author John A. Torres
  * @version 09/10/2017
  */
-public class NetworkLoader {
+public class FEPLineLoader {
     // Two network config files
     private final File LDSFile;
@@ -43 +39 @@
      * @param loopFile contains individual LoopDetector static data
      */
-    public NetworkLoader(File LDSFile, File loopFile)
+    public FEPLineLoader(File LDSFile, File loopFile)
     {
         this.LDSFile = LDSFile;
@@ -176 +172 @@
             }
         } catch (FileNotFoundException ex) {
-            Logger.getLogger(NetworkLoader.class.getName()).log(Level.SEVERE, null, ex);
+            Logger.getLogger(FEPLineLoader.class.getName()).log(Level.SEVERE, null, ex);
         }
     }