Changeset 237 in tmcsimulator for trunk/src

Timestamp:

12/13/2017 03:02:27 AM (8 years ago)

Author:

jtorres

Message:

Added new package atmsdriver.batchbuilder. Includes BatchBuilderGUI, TimeFrame?, TimeFrames?, and TrafficLaneEvent? classes. Added some auxillary methods to Highways.java, Highway.java, and Station.java.

Location:

trunk/src

Files:

• atmsdriver/ConsoleTrafficDriver.java (modified) (1 diff)
• atmsdriver/batchbuilder (added)
• atmsdriver/batchbuilder/BatchBuilderGUI.form (added)
• atmsdriver/batchbuilder/BatchBuilderGUI.java (added)
• atmsdriver/batchbuilder/TimeFrame.java (added)
• atmsdriver/batchbuilder/TimeFrames.java (added)
• atmsdriver/batchbuilder/TrafficLaneEvent.java (added)
• atmsdriver/model/Highway.java (modified) (3 diffs)
• atmsdriver/model/Highways.java (modified) (3 diffs)
• atmsdriver/model/Station.java (modified) (3 diffs)
• tmcsim/application.properties (modified) (1 diff)

trunk/src/atmsdriver/ConsoleTrafficDriver.java

@@ -79 +79 @@
             ConsoleDriverProperties.load(new FileInputStream(System.getProperty("ATMSDRIVER_PROPERTIES")));
         } catch (Exception e) {
-            Logger.getLogger("CosoleDriver").logp(Level.SEVERE, "ConsoleDriver",
+            Logger.getLogger("ConsoleDriver").logp(Level.SEVERE, "ConsoleDriver",
                     "Constructor", "Exception in reading properties file.", e);
         }

trunk/src/atmsdriver/model/Highway.java

@@ -1 +1 @@
 package atmsdriver.model;
 
+import atmsdriver.model.Station.DIRECTION;
 import java.util.ArrayList;
 import java.util.List;
@@ -17 +18 @@
     /** The ordered list of stations (lane detector stations) on this highway */
     public final List<Station> stations;
-
+        
     /** Construct a highway 
      * 
@@ -28 +29 @@
         this.stations = stations;
     }
+    
+    /**
+     * 
+     */
+    public List<DIRECTION> getDirections()
+    {
+                    // Get available directions for route
+            ArrayList<DIRECTION> availDirs = new ArrayList<>();
+            for(Station stn : stations)
+            {
+                if(!availDirs.contains(stn.direction))
+                {
+                    availDirs.add(stn.direction);
+                }
+            }
+            return availDirs;
+    }
+    
+    @Override
+    public String toString()
+    {
+        return Integer.toString(this.routeNumber);
+    }
 }

trunk/src/atmsdriver/model/Highways.java

@@ -1 +1 @@
 package atmsdriver.model;
 
+import atmsdriver.batchbuilder.TrafficLaneEvent;
+import atmsdriver.model.LoopDetector.DOTCOLOR;
 import atmsdriver.model.Station.DIRECTION;
 import java.io.File;
@@ -520 +522 @@
         return result.toString();
     }
+    
+    /**
+     * Generates the route number list, used for user input validation.
+     * @return list of route numbers.
+     */
+    public List<Integer> getAllRouteNums()
+    {
+        ArrayList<Integer> routeNums = new ArrayList<>();
+        // add the route number for each highway to the list
+        for(Highway hwy : highways)
+        {
+            routeNums.add(hwy.routeNumber);
+        }
+        return routeNums;
+    }
+    
     /**
      * XML tags used in writeToXML()
@@ -535 +553 @@
         }
     }
+    
+    public void reset()
+    {
+        for(FEPLine line : lines)
+        {
+            for(Station stn : line.stations)
+            {
+                for(LoopDetector ld : stn.loops)
+                {
+                    ld.occ = 0;
+                    ld.vol = 0;
+                }
+            }
+        }
+    }
+    
+    public void applyTrafficLaneEvent(TrafficLaneEvent event)
+    {
+        Integer routeNum = event.routeNum;
+        Highway hwy = getHighwayByRouteNumber(routeNum);
+        for(Station stn: hwy.stations)
+        {
+            if(stn.equals(event.station))
+            {
+                for(LoopDetector ld : stn.loops)
+                {
+                    if(ld.equals(event.loopDetector))
+                    {
+                        ld.occ = event.color.occupancy();
+                        ld.vol = event.color.volume();
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+    }
 }

trunk/src/atmsdriver/model/Station.java

@@ -2 +2 @@
 
 import atmsdriver.model.LoopDetector.DOTCOLOR;
+import java.util.ArrayList;
 import java.util.List;
 import org.w3c.dom.Document;
@@ -366 +367 @@
             return this.toString().substring(0, 1);
         }
-
+        
         public DIRECTION getOpposite()
         {
@@ -392 +393 @@
         public static DIRECTION toDirection(String letter)
         {
+            if(letter.indexOf(letter.charAt(0)) == -1)
+            {
+                return null;
+            }
             return values()[allLetters.indexOf(letter.charAt(0))];
         }
-
+    }
+    
+    @Override
+    public String toString()
+    {
+        return Integer.toString(this.ldsID);
     }
 }

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 23 Nov 2017 17:06:06 -0800
+#Wed, 13 Dec 2017 04:11:31 -0800
 
-Application.revision=232
+Application.revision=234
 
 Application.buildnumber=88