Changeset 274 in tmcsimulator for trunk/src/tmcsim

Timestamp:

02/25/2019 04:36:04 PM (7 years ago)

Author:

jdalbey

Message:

Multi file commit: adding and elaborating on comments and javadoc.

Location:

trunk/src/tmcsim

Files:

• application.properties (modified) (1 diff)
• utilities/BuildHighwayFile.java (modified) (3 diffs)
• utilities/VehicleDetectionStation.java (modified) (2 diffs)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 21 Feb 2019 15:22:00 -0800
+#Mon, 25 Feb 2019 17:13:55 -0800
 
-Application.revision=268
+Application.revision=273
 
-Application.buildnumber=95
+Application.buildnumber=97

trunk/src/tmcsim/utilities/BuildHighwayFile.java

@@ -1 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
 package tmcsim.utilities;
 
@@ -30 +25 @@
  *      3. LDS file that has the fep line number for each LDS.
  * Output: 1. The highway map file that lists VDS info and the lanes it governs.
- *      2. A slightly reformatted loop file.
+ *      2. A slightly reformatted loop file.  (Not sure what this is for.)
  * @author jdalbey, jtorres
  */
@@ -157 +152 @@
                 else
                 {
-                    if (shortLoc.equals("ML") && !missingVDS.contains(vdsID))
+                    boolean desiredType = shortLoc.equals("ML") || shortLoc.equals("OS");
+                    if (desiredType && !missingVDS.contains(vdsID))
                     {
                         System.out.println("createLaneLookup(): vdsID: "+vdsID+
-                                " of type ML not found. "+ String.format("%3s %s %5s",fwy,dir,postmile));
+                                " of type "+shortLoc+" not found. "+ String.format("%3s %s %5s",fwy,dir,postmile));
                         missingVDS.add(vdsID);
                     }

trunk/src/tmcsim/utilities/VehicleDetectionStation.java

@@ -8 +8 @@
 
 /**
- * Represent a single VDS.
+ * Represent a single VDS, "a logical grouping of detectors" at a particular 
+ * location in one direction.
  * @author jdalbey
  */
@@ -33 +34 @@
         lineScanner.next(); // skip City
         String raw_pm = lineScanner.next().trim();
-        if (raw_pm.startsWith("R"))
+        // remove any postmile prefix, if it exists.
+        if (Character.isAlphabetic(raw_pm.charAt(0)))
         {
             raw_pm = raw_pm.substring(1);