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

trunk/src/atmsdriver/model/Highway.java

@@ -3 +3 @@
 import atmsdriver.model.Station.DIRECTION;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 /**
@@ -18 +22 @@
     /** The ordered list of stations (lane detector stations) on this highway */
     public final List<Station> stations;
-        
+    /** The directions for this highway, either N/S or E/W */
+    public final Set<DIRECTION> availDirs = new TreeSet<DIRECTION>();
+    
     /** Construct a highway 
      * 
@@ -28 +34 @@
         this.routeNumber = routeNumber;
         this.stations = stations;
-    }
-    
-    /**
-     * 
-     */
-    public List<DIRECTION> getDirections()
-    {
-                    // Get available directions for route
-            ArrayList<DIRECTION> availDirs = new ArrayList<>();
+        // Get available directions for route
+        if (stations != null)
+        {
             for(Station stn : stations)
             {
-                if(!availDirs.contains(stn.direction))
-                {
-                    availDirs.add(stn.direction);
-                }
+                availDirs.add(stn.direction);
             }
-            return availDirs;
+        }
     }