Changeset 343 in tmcsimulator for trunk/src/atmsdriver/model/Highways.java

Timestamp:

03/23/2019 05:40:52 PM (7 years ago)

Author:

jdalbey

Message:

Fix defect #117. Update HighwaysTest?.java for new highway model.

File:

• trunk/src/atmsdriver/model/Highways.java (modified) (6 diffs)

trunk/src/atmsdriver/model/Highways.java

@@ -43 +43 @@
  * FEP Simulator.
  *
- * 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
@@ -124 +120 @@
     }
 
+    /** Search for a station with the given attributes 
+     * 
+     * @param routeNumber
+     * @param direction
+     * @param postmile
+     * @return the desired station, or null if not found.
+     */
+    public Station findStation(Integer routeNumber, Station.DIRECTION direction,
+            Double postmile)
+    {
+        // Get the highway by route number
+        Highway highway = getHighwayByRouteNumber(routeNumber);
+        if (highway == null)
+        {
+            Logger.getLogger(Highways.class.getName()).log(Level.SEVERE,  
+                    "Highway "+routeNumber+" not found in findStation()", "");
+            return null;
+        }
+        //Search the stations on this highway for a match
+        for (Station station : highway.stations)
+        {
+            if (station.matches(direction, postmile))
+            {
+                return station;
+            }
+        }
+        return null;
+    }
     /**
      * Applies specified color to the specified highway stretch. Route number
@@ -158 +182 @@
         // postmiles increase from s to n and w to e
         // if the direction is south or west
-        if (direction.equals(Station.DIRECTION.SOUTH) || direction.equals(Station.DIRECTION.WEST))
+        if (direction.equals(Station.DIRECTION.NORTH) || direction.equals(Station.DIRECTION.EAST))
         {
             // add range value to startPost to get
@@ -440 +464 @@
     /**
      * Returns the Highways model data in XML format.
-     * 
+     * Probably obsolete, since we aren't using exchange.xml any longer.
      * @return highways data in XML format
      */
@@ -507 +531 @@
         {
             // Consider each route direction
-            for (DIRECTION dir: DIRECTION.values())
+            for (DIRECTION dir: hwy.availDirs)
             {
                 String rowLabel = ""+String.format("%3s ",hwy.routeNumber)+dir.getLetter()+' ';
@@ -514 +538 @@
                 for (Station stat: hwy.stations)
                 {
+                    if (stat.direction.equals(dir))
+                    {
                     //lineout.append("" + dir.getLetter() + stat.postmile);
                     lineout.append(stat.getColor());
                     //lineout.append("  ");
+                    }
+                    else 
+                    {
+                        lineout.append(".");
+                    }
                 }
                 // See if there were stations for this direction