Changeset 103 in tmcsimulator for trunk/src/atmsdriver/model/Highway.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/model/Highway.java (modified) (2 diffs)

trunk/src/atmsdriver/model/Highway.java

@@ -10 +10 @@
  * @author jdalbey
  */
-final class Highway
+final public class Highway
 {
     /** The identifying number for this highway, e.g., 101 */
-    public final Integer highwayNumber;
+    public final Integer routeNumber;
     /** The ordered list of stations (lane detector stations) on this highway */
     public final ArrayList<Station> stations;
@@ -22 +22 @@
      * @param stations ordered list of stations on this highway
      */
-    public Highway(Integer highwayNum, ArrayList<Station> stations)
+    public Highway(Integer routeNumber, ArrayList<Station> stations)
     {
-        this.highwayNumber = highwayNum;
+        this.routeNumber = routeNumber;
         this.stations = stations;
     }