Changeset 103 in tmcsimulator for trunk/src/atmsdriver/model/Station.java

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

File:

• trunk/src/atmsdriver/model/Station.java (modified) (8 diffs)

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