Changeset 103 in tmcsimulator

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

Files:

• branches/FEPSimulator/build/Debug/GNU-MacOSX/DataPacker.o.d (deleted)
• branches/FEPSimulator/build/Debug/GNU-MacOSX/FEPSim.o.d (deleted)
• branches/FEPSimulator/build/Debug/GNU-MacOSX/NetworkReader.o.d (deleted)
• branches/FEPSimulator/dist/Debug/GNU-MacOSX/fepsimulator (deleted)
• trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriverLocal.properties (modified) (1 diff)
• trunk/src/atmsdriver/ATMSDriver.java (modified) (5 diffs)
• trunk/src/atmsdriver/ConsoleDriver.java (modified) (1 diff)
• trunk/src/atmsdriver/FEPLineLoader.java (moved) (moved from trunk/src/atmsdriver/NetworkLoader.java) (3 diffs)
• trunk/src/atmsdriver/model/FEPLine.java (modified) (3 diffs)
• trunk/src/atmsdriver/model/Highway.java (modified) (2 diffs)
• trunk/src/atmsdriver/model/Highways.java (modified) (8 diffs)
• trunk/src/atmsdriver/model/LoopDetector.java (modified) (1 diff)
• trunk/src/atmsdriver/model/Station.java (modified) (8 diffs)
• trunk/src/tmcsim/application.properties (modified) (1 diff)
• trunk/test/atmsdriver/model/LoadHighwaysTest.java (modified) (6 diffs)
• trunk/test/atmsdriver/model/StationTest.java (modified) (3 diffs)

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/configs/ATMSDriverLocal.properties

@@ +1 @@
+main.class=atmsdriver.ATMSDriver
 run.jvmargs=-DATMSDRIVER_PROPERTIES=config/atms_driver_config_local.properties

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.");

trunk/src/atmsdriver/ConsoleDriver.java

@@ -1 +1 @@
 package atmsdriver;
 
+import atmsdriver.model.Highways;
+import atmsdriver.model.Station.DIRECTION;
+import atmsdriver.model.Highway;
+import atmsdriver.model.Station;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Scanner;
+
 /**
- *  A console application to drive the ATMS Server.
- * @author jdalbey
+ * A console application to drive the ATMS Server.
+ *
+ * @author jdalbey, John A. Torres
+ * @version 10/11/2017
  */
-public class ConsoleDriver
-{
-//
-//Given
-// <Highway Number> <Dir> <Postmile> <Range> <DotColor> 
-//
-//IF default direction of Highway Number = Dir THEN
-//    Set StartPost = Postmile
-//    Set EndPost = Postmile + Range
-//ELSE
-//    Set StartPost = Postmile - Range
-//    Set EndPost = Postmile
-//END IF
-//
-//FOR each Station in Highway Number LOOP
-//
-//    IF Station.Postmile within range of StartPost:EndPost THEN
-//        IF default direction of Highway Number = Dir THEN
-//            Set ML color to DotColor
-//        ELSE
-//            Set OPP color to DotColor
-//        END IF
-//    END IF
-//
-//END LOOP
-//
-//    
+public final class ConsoleDriver {
+    // highways model
+    private final Highways highways;
+    
+    // lists used for user input validation
+    private final List<Integer> routeNumInputList;
+    private final List<String> dotColorInputList;
+
+    /**
+     * Constructor. Sets the highways model and generates the input validation
+     * lists, and then runs the console driver application.
+     * @param highways 
+     */
+    public ConsoleDriver(Highways highways) {
+        // set highways model
+        this.highways = highways;
+        
+        // set input validation lists
+        routeNumInputList = generateRouteNumInputList();
+        dotColorInputList = new ArrayList<>(Arrays.asList("R", "Y", "G"));
+        
+        // run the console driver
+        runConsole();
+    }
+    
+    /**
+     * Generates the route number list, used for user input validation.
+     * @return list of route numbers.
+     */
+    private ArrayList<Integer> generateRouteNumInputList()
+    {
+        ArrayList<Integer> routeNums = new ArrayList<>();
+        // add the route number for each highway to the list
+        for(Highway hwy : highways.highways)
+        {
+            routeNums.add(hwy.routeNumber);
+        }
+        return routeNums;
+    }
+
+    /**
+     * Runs the console driver application.
+     */
+    public void runConsole() {
+        Scanner sc = new Scanner(System.in);
+        // Run continuously
+        while (true) {
+            // Get necessary values for colorization of highways
+            Integer routeNumber = getRouteNumber(sc);
+            DIRECTION direction = getDirection(sc, routeNumber);
+            Double postmile = getPostmile(sc, routeNumber, direction);
+            Integer range = getRange(sc, postmile);
+            DOTCOLOR dotcolor = getDotColor(sc);
+            
+            // apply colorization to highways
+            applyColorToHighwayStretch(routeNumber, direction, postmile, range, dotcolor);
+        }
+    }
+    
+    /**
+     * Applies specified color to the specified highway stretch. Route number and
+     * direction specify the highway. Postmile and range specify the stretch of
+     * specified highway. Dot color is the color to be applied to the stretch.
+     * 
+     * @param routeNumber highway route number
+     * @param direction highway direction
+     * @param postmile origin postmile value
+     * @param range range from origin postmile
+     * @param dotColor the color to be applied to specified highway stretch
+     */
+    private void applyColorToHighwayStretch(Integer routeNumber, DIRECTION direction, 
+            Double postmile, Integer range, DOTCOLOR dotColor) {
+        System.out.println("Applying " + dotColor.name() + " dots to highway " 
+                + routeNumber + " " + direction.name() + " at postmile " 
+                + postmile + " with a range of " + range + " miles...");
+        
+        // Get the highway by route number
+        Highway highway = highways.getHighwayByRouteNumber(routeNumber);
+        
+        // start value for highway section, and end value for highway section
+        // by postmile
+        Double startPost;
+        Double endPost;
+        
+        // postmiles increase from s to n and w to e
+        
+        // if the direction is south or west
+        if(direction.equals(DIRECTION.SOUTH) || direction.equals(DIRECTION.WEST))
+        {
+            // add range value to startPost to get
+            // the end postmile value of the highway section
+            startPost = postmile;
+            endPost = postmile + range;
+            
+            // iterate through the stations, if within the specified highway
+            // stretch, update the station by direction and apply dot color
+            for(Station station : highway.stations)
+            {
+                if(station.postmile > startPost && station.postmile < endPost)
+                {
+                    station.updateByDirection(direction, dotColor);
+                }
+            }
+        }
+        // if the direction is north or east 
+        else
+        {
+            //subtract range value from startPost
+            // to get the end postmile value of the highway section
+            startPost = postmile;
+            endPost = postmile - range;
+            
+            // iterate through the stations, if within the specified highway
+            // section, update the station by direction and apply dot color
+            for(Station station : highway.stations)
+            {
+                if(station.postmile < startPost && station.postmile > endPost)
+                {
+                    station.updateByDirection(direction, dotColor);
+                }
+            }
+        }
+        System.out.println("");
+    }
+    
+    /**
+     * Gets the highway route number from user and validates the input.
+     * 
+     * @param sc stdIn scanner
+     * @return highway route number
+     */
+    private Integer getRouteNumber(Scanner sc) {
+        Integer routeNum = null;
+        Boolean verified = false;
+        
+        // validation loop
+        while(!verified)
+        {
+            // Prints out available route numbers to user to select from
+            System.out.print("Available route numbers: [");
+            for(Integer rtNum : routeNumInputList)
+            {
+                System.out.print(rtNum.toString() + ", ");
+            }
+            System.out.print("]");
+            System.out.println("");
+            
+            // Prompt user to input a route number
+            System.out.println("Enter a route number: ");
+            routeNum = sc.nextInt();
+            System.out.println("");
+            
+            // validate the user's input
+            if(routeNumInputList.contains(routeNum))
+            {
+                verified = true;
+            }
+            else
+            {
+                System.out.println("Invalid route number, please re-enter: ");
+            }
+        }
+        
+        return routeNum;
+    }
+    
+    /**
+     * Gets the highway direction from the user and validates the input.
+     * 
+     * @param sc stdIn scanner
+     * @return highway direction
+     */
+    private DIRECTION getDirection(Scanner sc, Integer routeNum) {
+        DIRECTION direction;
+        String directionInput = null;
+        Boolean verified = false;
+        
+        // validation loop
+        while(!verified)
+        {
+            // Get available directions for route
+            ArrayList<DIRECTION> availDirs = new ArrayList<>();
+            for(Station stn : highways.getHighwayByRouteNumber(routeNum).stations)
+            {
+                if(!availDirs.contains(stn.direction))
+                {
+                    availDirs.add(stn.direction);
+                }
+            }
+            
+            // prompt user for input
+            System.out.print("Available directions for highway " + routeNum + ": [");
+            for(DIRECTION dir : availDirs)
+            {
+                System.out.print(dir.getLetter() + ", ");
+            }
+            System.out.print("]");
+            System.out.println("");
+            System.out.println("Enter a direction:");
+            directionInput = sc.next();
+            System.out.println("");
+            
+            // validate the user's input
+            if(availDirs.contains(DIRECTION.toDirection(directionInput)))
+            {
+                verified = true;
+            }
+            else
+            {
+                System.out.println("Invalid direction, please re-enter: ");
+            }
+        }
+        
+        return DIRECTION.toDirection(directionInput);
+    }
+    
+    /**
+     * Gets the starting/origin postmile value for the highway section from the 
+     * user and validates the input.
+     * 
+     * @param sc stdIn scanner
+     * @param routeNumber highway route number
+     * @param dir highway direction
+     * @return highway section start/origin postmile value
+     */
+    private Double getPostmile(Scanner sc, Integer routeNumber, DIRECTION dir) {
+        Double postmile = null;
+        Boolean verified = false;
+        
+        // validation loop
+        while(!verified)
+        {
+            // Get highway, and grab the floor and ceiling for postmile values
+            // from the highway stations to present to the user
+            Highway hwy = highways.getHighwayByRouteNumber(routeNumber);
+            Double floorPostmile = hwy.stations.get(0).postmile;
+            Double ceilPostmile = hwy.stations
+                    .get(hwy.stations.size() - 1).postmile;
+            
+            // present user with range of postmiles for given highway
+            System.out.println("Route " + hwy.routeNumber + " " + dir 
+                    + " postmile range: [" + floorPostmile + ", " 
+                    + ceilPostmile + "]");
+            
+            // prompt user for postmile value
+            System.out.println("Enter a postmile value (Integer/Double): ");
+            postmile = sc.nextDouble();
+            System.out.println("");
+            
+            // validate user's input, ensures that the postmile is within given
+            // postmile range (floorPostmile, ceilPostmile)
+            if(postmile >= floorPostmile && postmile <= ceilPostmile)
+            {
+                verified = true;
+            }
+            else
+            {
+                System.out.println("Postmile must be within postmile range: [" + floorPostmile + ", " 
+                    + ceilPostmile + "] please re-enter: ");
+            }
+        }
+        
+        return postmile;
+    }
+    
+    /**
+     * Gets the range to extend the highway stretch from the start/origin postmile
+     * value from the user and validates the input.
+     * 
+     * @param sc stdIn scanner
+     * @param postmile origin/start postmile value for highway stretch
+     * @return range value
+     */
+    private Integer getRange(Scanner sc, Double postmile) {
+        Integer range = null;
+        Boolean verified = false;
+        
+        // validation loop
+        while(!verified)
+        {
+            // prompt user for range value
+            System.out.println("Enter a range value (Integer):");
+            range = sc.nextInt();
+            System.out.println("");
+            
+            // range must be greater than or equal to 0
+            if(range >= 0)
+            {
+                verified = true;
+            }
+            else
+            {
+                System.out.println("Range must be >= 0");
+            }
+        }
+        
+        return range;
+    }
+
+    /**
+     * Gets the dot color from the user, to be applied to specified highway
+     * stretch and validates the user's input.
+     * 
+     * @param sc stdIn scanner
+     * @return dot color to be applied to highway stretch
+     */
+    private DOTCOLOR getDotColor(Scanner sc) {
+        DOTCOLOR dotColor;
+        String dotColorInput = null;
+        Boolean verified = false;
+        
+        // validationloop
+        while(!verified)
+        {
+            // prompt user for color
+            System.out.println("Enter a dot color (G/Y/R):");
+            dotColorInput = sc.next();
+            System.out.println("");
+            // validate user's input
+            if(dotColorInputList.contains(dotColorInput))
+            {
+                verified = true;
+            }
+            else
+            {
+                System.out.println("Invalid dot color, please re-enter: ");
+            }
+        }
+        
+        return DOTCOLOR.toDotColor(dotColorInput);
+    }
+    
+    /**
+     * Enum for highway status dot colors.
+     *
+     * @author John A. Torres
+     * @version 10/11/2017
+     */
+    public static enum DOTCOLOR {
+
+        RED,
+        YELLOW,
+        GREEN;
+        
+        // All the first letters of the values, in order.
+        private static String allLetters = "RYG";
+        
+        /**
+         * Return the first letter of this enum.
+         *
+         * @return String first letter of this enum.
+         */
+        public String getLetter() {
+            return this.toString().substring(0, 1);
+        }
+
+        /**
+         * Returns a dot color given its first character.
+         *
+         * @param letter the first character of a dot color
+         * @return dot color corresponding to letter
+         * @pre letter must be one of allLetters
+         */
+        public static DOTCOLOR toDotColor(String letter) {
+            return values()[allLetters.indexOf(letter.charAt(0))];
+        }
+    }  
 }

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);
         }
     }

trunk/src/atmsdriver/model/FEPLine.java

@@ -4 +4 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-
-
 
 /** An FEPLine is a simulated line of communication from the FEP to 
@@ -18 +16 @@
 public class FEPLine {
     /* Static FEPLine meta data */
-    final private int lineNum;
-    final private List<Station> stations;
+    final public int lineNum;
+    final public List<Station> stations;
     final private int count;
-    // NOT SURE IF NEXT IS FINAL
+    
     final private int schedule;
     final private int lineInfo;
     final private long systemKey;
+    
+    // THESE WILL NEED TO BE UPDATED MAYBE, NOT SURE, NOT A PRIORITY. SEE METHOD
+    // UPDATESEQUENCES()
     private long globalSeq;
     private long scheduleSeq;
@@ -40 +41 @@
         this.globalSeq = globalSeq;
         this.scheduleSeq = scheduleSeq;
-    }
-    
-    public int getLineNumber()
-    {
-        return this.lineNum;
-    }
-    
-    public List<Station> getStations()
-    {
-        return this.stations;
     }
     

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;
     }

trunk/src/atmsdriver/model/Highways.java

@@ -1 +1 @@
 package atmsdriver.model;
 
-import atmsdriver.NetworkLoader;
-import atmsdriver.model.Station.DIRECTION;
+import atmsdriver.FEPLineLoader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -13 +11 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
 import java.util.Observable;
 import java.util.Observer;
-import java.util.Scanner;
 import java.util.Set;
 import java.util.logging.Level;
@@ -34 +28 @@
 import org.w3c.dom.Element;
 
-/**
+/** The Highways class aggregates all Highway instances within a geographic
+ *  region, and all of the FEPLines within an electronic detector 
+ *  network, in the same geographic region. An instance of Highways.java 
+ *  comprises the underlying model for the ATMSDriver application.
+ * 
+ *  Highways uses method writeToFEP() to communicate with the FEP Simulator. 
+ *  It creates a socket client which sends the FEP Simulator a highways status
+ *  message over the socket. This message is in the XML format required by the 
+ *  FEP Simulator, which is provided by the resident toXML() method.
+ * 
+ *  Currently, there is no driving logic within the highways class. It is only
+ *  done through an instance of the ConsoleDriver.java class. Eventually, it
+ *  will receive incident data (from exchange.xml or better yet, directly from 
+ *  the TMCSimulator itself) and drive the highways using resident logic.
  *
  * @author John A. Torres
  */
-public class Highways implements Observer {
+public class Highways {
 
     final private ArrayList<FEPLine> lines;
     final private String FEPHostName;
     final private int FEPPortNum;
-    final private ArrayList<Highway> highways;
-    private Map<Integer, List<Station>> HiwayMap = new HashMap<Integer, List<Station>>();
     
-    // NEED FINISH final private ArrayList<Highway> highways;
+    final public ArrayList<Highway> highways;
+    
     public Highways(String ldsFileName, String loopsFileName,
             String highwayMetaFileName, String FEPHostName, int FEPPortNum) {
@@ -54 +60 @@
          */
 
-        NetworkLoader ldr = new NetworkLoader(new File(ldsFileName), new File(loopsFileName));
+        FEPLineLoader ldr = new FEPLineLoader(new File(ldsFileName), new File(loopsFileName));
         this.lines = (ArrayList<FEPLine>) ldr.getFEPLines();
         this.FEPHostName = FEPHostName;
@@ -61 +67 @@
         //writeHighwaysMeta("hard.txt");
     }
-
-    public ArrayList<Highway> getHighways()
-    {
-        return this.highways;
-    }
-    
     
     private ArrayList<Highway> loadHighways() {
@@ -72 +72 @@
         // The list of highways to return
         ArrayList<Highway> highways = new ArrayList<Highway>();
-        Hashtable<Hashtable<Integer, DIRECTION>, ArrayList<Station>>
-                highwayTable = new Hashtable<>();
+        
+        Map<Integer, ArrayList<Station>>
+                highwayMap = new HashMap<>();
         
         for (FEPLine line : lines)
         {
-            ArrayList<Station> lineStations = (ArrayList<Station>) line.getStations();
+            ArrayList<Station> lineStations = (ArrayList<Station>) line.stations;
             for(Station station : lineStations)
             {
-                Integer hwyNum = station.getHighwayNumber();
-                DIRECTION dir = station.getDirection();
-                Hashtable<Integer, DIRECTION> check = new Hashtable<>();
-                check.put(hwyNum, dir);
-                if(highwayTable.get(check) == null)
+                Integer hwyNum = station.routeNumber;
+
+                if(!highwayMap.containsKey(hwyNum))
                 {
                     ArrayList<Station> stnList = new ArrayList<>();
                     stnList.add(station);
-                    Hashtable<Hashtable<Integer, DIRECTION>, ArrayList<Station>>
-                            newEntry = new Hashtable();
-                    newEntry.put(check, stnList);
-                    highwayTable.putAll(newEntry);
+                    highwayMap.put(hwyNum, stnList);
                 }
                 else
                 {
-                    highwayTable.get(check).add(station);
+                    highwayMap.get(hwyNum).add(station);
                 }
             }
         }
         
-        Set<Hashtable<Integer, DIRECTION>> hwyKeys = highwayTable.keySet();
-        for(Hashtable<Integer, DIRECTION> hwyKey : hwyKeys)
+        Set<Integer> hwyKeys = highwayMap.keySet();
+        for(Integer hwyKey : hwyKeys)
         {
-            Enumeration<Integer> hwyNumEnum = hwyKey.keys();
-            Integer hwyNum = hwyNumEnum.nextElement();
-            ArrayList<Station> hwyStations = highwayTable.get(hwyKey);
-            DIRECTION hwyDir = hwyKey.get(hwyNum);
-            Collections.sort(highwayTable.get(hwyKey));
-            System.out.println("Adding highway: " + hwyNum + " " + hwyDir.toString().charAt(0));
-            highways.add(new Highway(hwyNum, 
+            ArrayList<Station> hwyStations = highwayMap.get(hwyKey);
+            Collections.sort(hwyStations);
+            System.out.println("Loaded highway " + hwyKey + "...");
+            highways.add(new Highway(hwyKey, 
                     hwyStations));
         }
+        System.out.println("");
         return highways;
     }
+    
     /*
      private ArrayList<FEPLine> loadLines(String highwayMetaFileName) {
@@ -215 +210 @@
 
     public void writeToFEP() {
-                    System.out.println(this.toXML().toCharArray().length);
-
         try {
             Socket sock = new Socket(FEPHostName, FEPPortNum);
@@ -293 +286 @@
     }
 
-    @Override
-    public void update(Observable o, Object arg) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public Highway getHighwayByRouteNumber(Integer routeNum) {
+        Highway returnHwy = null;
+        for(Highway hwy : highways)
+        {
+            if(hwy.routeNumber.equals(routeNum))
+            {
+                returnHwy = hwy;
+                break;
+            }
+        }
+        return returnHwy;
     }
 

trunk/src/atmsdriver/model/LoopDetector.java

@@ -17 +17 @@
 {
     /* static data */
-    final private int loopID;
-    final private String loopLocation;
-    final private int laneNum;
+    final public int loopID;
+    final public String loopLocation;
+    final public int laneNum;
     
     /* dynamic data */

trunk/src/atmsdriver/model/Station.java

@@ -1 +1 @@
 package atmsdriver.model;
 
+import atmsdriver.ConsoleDriver;
+import atmsdriver.ConsoleDriver.DOTCOLOR;
 import java.util.List;
 import org.w3c.dom.Document;
@@ -21 +23 @@
 
     /* Static Station meta data */
-    final private int lineNum;
-    final private int ldsID; // double check
-    final private int drop;
-    final private String location;
-    final private List<LoopDetector> loops;
-    final private int highwayNum;
-    final private double postmile;
-    final private DIRECTION direction;
+    final public int lineNum;
+    final public int ldsID; // double check
+    final public int drop;
+    final public String location;
+    final public List<LoopDetector> loops;
+    final public int routeNumber;
+    final public double postmile;
+    final public DIRECTION direction;
 
     /* Dynamic Station data */
@@ -46 +48 @@
         this.postmile = postmile;
         this.direction = direction;
-        this.highwayNum = hwy;
+        this.routeNumber = hwy;
 
         this.MLTotVol = 0;
         this.OppTotVol = 0;
-    }
-
-    public int getHighwayNumber()
-    {
-        return this.highwayNum;
-    }
-
-    public DIRECTION getDirection()
-    {
-        return this.direction;
     }
 
@@ -76 +68 @@
         build.append(Integer.toString(this.drop));
         build.append(" ");
-        build.append(Integer.toString(this.highwayNum));
+        build.append(Integer.toString(this.routeNumber));
         build.append(" ");
         build.append(this.direction.getLetter());
@@ -91 +83 @@
         }
         return build.toString();
-    }
-
-    public double getPostmile()
-    {
-        return postmile;
     }
 
@@ -117 +104 @@
 
         // get difference of values
-        double otherStationPostmile = ((Station) otherStation).getPostmile();
+        double otherStationPostmile = ((Station) otherStation).postmile;
         double val = this.postmile - otherStationPostmile;
 
@@ -134 +121 @@
     }
 
+    public void updateByDirection(DIRECTION direction, DOTCOLOR dotColor) {
+        if(direction.equals(this.direction))
+        {
+            updateML(dotColor);
+        }
+        else
+        {
+            updateOPP(dotColor);
+        }
+    }
+    
+    private void updateML(DOTCOLOR dotcolor)
+    {
+        outputUpdateMessage(dotcolor, "ML");
+        
+        for(LoopDetector loop : loops)
+        {
+            if(loop.loopLocation.startsWith("ML"))
+            {
+                // UPDATE LOOP WITH VALUES
+            }
+        }
+    }
+    
+    private void updateOPP(DOTCOLOR dotcolor)
+    {
+        outputUpdateMessage(dotcolor, "OPP");
+        for(LoopDetector loop : loops)
+        {
+            if(loop.loopLocation.startsWith("OP"))
+            {
+                // UPDATE LOOP WITH VALUES
+            }
+        }
+    }
+    
+    private void outputUpdateMessage(DOTCOLOR dotcolor, String OPP_ML)
+    {
+        System.out.printf("Updating route %-3.3s %-5.5s %-3.3s lanes\t %-12.12s "
+                + "at postmile %-6.6s to %-7.7s\n", 
+                Integer.toString(this.routeNumber), this.direction.name(), 
+                OPP_ML, this.location, Double.toString(this.postmile), 
+                dotcolor.name());
+    }
+    
     private static enum XML_TAGS
     {
@@ -189 +221 @@
 
         Element freewayElement = theDoc.createElement(XML_TAGS.FREEWAY.tag);
-        freewayElement.appendChild(theDoc.createTextNode(String.valueOf(this.highwayNum)));
+        freewayElement.appendChild(theDoc.createTextNode(String.valueOf(this.routeNumber)));
         stationElement.appendChild(freewayElement);
 

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Wed, 11 Oct 2017 17:25:07 -0700
+#Thu, 12 Oct 2017 01:19:36 -0700
 
-Application.revision=97
+Application.revision=101
 
-Application.buildnumber=50
+Application.buildnumber=51

trunk/test/atmsdriver/model/LoadHighwaysTest.java

@@ -1 +1 @@
 package atmsdriver.model;
 
-import atmsdriver.ATMSDriver;
-import atmsdriver.model.Station.DIRECTION;
-import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;
@@ -70 +67 @@
         
         // Test for correct number of highways
-        ArrayList<Highway> result = highways.getHighways();
-        assertEquals(3, result.size());
+        ArrayList<Highway> result = highways.highways;
+        assertEquals(2, result.size());
         
         // Test 55 N was loaded
-        Highway fiftyfiveN = result.get(2);
-        assertEquals(new Integer(55), fiftyfiveN.highwayNumber);
+        Highway fiftyfiveN = result.get(0);
+        assertEquals(new Integer(55), fiftyfiveN.routeNumber);
         
         // Test 55 N stations are sorted by postmile
@@ -82 +79 @@
         for(Station station : stations)
         {
-            stationsPostmiles.add(station.getPostmile());
+            stationsPostmiles.add(station.postmile);
         }
+        
+        // Create expected station postmile list (sorted)
         ArrayList<Double> expectedStationsPostmiles = new ArrayList<>();
         expectedStationsPostmiles.add(new Double(4.58));
+        expectedStationsPostmiles.add(new Double(4.7));
+        expectedStationsPostmiles.add(new Double(5.06));
         expectedStationsPostmiles.add(new Double(5.51));
         expectedStationsPostmiles.add(new Double(9.41));
         expectedStationsPostmiles.add(new Double(10));
-        for(int i = 0; i < 4; i++)
+        expectedStationsPostmiles.add(new Double(10.4));
+        expectedStationsPostmiles.add(new Double(10.5));
+        for(int i = 0; i < 8; i++)
         {
             assertEquals(expectedStationsPostmiles.get(i), 
@@ -96 +99 @@
         
         // Test 55 S was loaded
-        Highway fiftyfiveS = result.get(0);
-        assertEquals(new Integer(55), fiftyfiveS.highwayNumber);
+        Highway fiftyfiveS = result.get(1);
+        assertEquals(new Integer(5), fiftyfiveS.routeNumber);
         
         // Test 55 S stations are sorted by postmile
@@ -104 +107 @@
         for(Station station : stations)
         {
-            stationsPostmiles.add(station.getPostmile());
-        }
-        expectedStationsPostmiles.clear();
-        expectedStationsPostmiles.add(new Double(4.7));
-        expectedStationsPostmiles.add(new Double(5.06));
-        expectedStationsPostmiles.add(new Double(10.4));
-        expectedStationsPostmiles.add(new Double(10.5));
-        for(int i = 0; i < 4; i++)
-        {
-            assertEquals(expectedStationsPostmiles.get(i), 
-                    stationsPostmiles.get(i));
-        }
-        
-        Highway fiveS = result.get(1);
-        assertEquals(new Integer(5), fiveS.highwayNumber);
-        
-        // Test 5 S stations are sorted by postmile
-        stations = fiveS.stations;
-        stationsPostmiles.clear();
-        for(Station station : stations)
-        {
-            stationsPostmiles.add(station.getPostmile());
+            stationsPostmiles.add(station.postmile);
         }
         expectedStationsPostmiles.clear();
@@ -131 +113 @@
         expectedStationsPostmiles.add(new Double(32.25));
         expectedStationsPostmiles.add(new Double(33));
-        for(int i = 0; i < 2; i++)
+        for(int i = 0; i < 3; i++)
         {
             assertEquals(expectedStationsPostmiles.get(i), 

trunk/test/atmsdriver/model/StationTest.java

@@ -33 +33 @@
     public void testGetHighwayNumber() {
         System.out.println("getHighwayNumber");
-        assertEquals(4, alpha.getHighwayNumber());
+        assertEquals(4, alpha.routeNumber);
     }
 
@@ -41 +41 @@
     public void testGetDirection() {
         System.out.println("getDirection");
-        assertEquals(DIRECTION.NORTH, alpha.getDirection());
+        assertEquals(DIRECTION.NORTH, alpha.direction);
     }
 
@@ -59 +59 @@
     public void testGetPostmile() {
         System.out.println("getPostmile");
-        assertEquals(1.0, alpha.getPostmile(),0.1);
+        assertEquals(1.0, alpha.postmile,0.1);
     }