Changeset 424 in tmcsimulator

Timestamp:

06/23/2019 01:08:58 PM (7 years ago)

Author:

jdalbey

Message:

Station.java removed obsolete toXML method.

Location:

trunk

Files:

• src/tmcsim/application.properties (modified) (1 diff)
• src/tmcsim/highwaymodel/Station.java (modified) (5 diffs)
• test/tmcsim/highwaymodel/StationTest.java (modified) (1 diff)

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Sun, 23 Jun 2019 11:49:46 -0700
+#Sun, 23 Jun 2019 14:38:34 -0700
 
-Application.revision=419
+Application.revision=423
 
 Application.buildnumber=140

trunk/src/tmcsim/highwaymodel/Station.java

@@ -21 +21 @@
 public final class Station implements Comparable
 {
-
     /* Static Station meta data */
     final public int lineID;
@@ -33 +32 @@
 
     /* Dynamic Station data */
-    private int MLTotVol;
-    private int OppTotVol;
+    private int totalVolume;
 
     /* Constructor */
@@ -50 +48 @@
         this.routeNumber = hwy;
 
-        this.MLTotVol = getMLTotVol();
-        this.OppTotVol = getOPPTotVol();
-    }
-
-    /**
-     * Calculates the total ML Volume.
-     *
-     * @return total ML volume.
-     */
-    private int getMLTotVol()
+        this.totalVolume = calcTotalVolume();
+    }
+
+    /**
+     * Calculates the total lane Volume.
+     * Reserved for future use.
+     * @return total lane volume.
+     */
+    private int calcTotalVolume()
     {
         int mlTotVol = 0;
         for (LoopDetector loop : loops)
         {
-            if (loop.loopLocation.startsWith("ML"))
-            {
                 mlTotVol += loop.vol;
-            }
         }
         return mlTotVol;
-    }
-
-    /**
-     * Calculates the total OPP Volume
-     *
-     * @return total OPP volume.
-     */
-    private int getOPPTotVol()
-    {
-        int oppTotVol = 0;
-        for (LoopDetector loop : loops)
-        {
-            if (loop.loopLocation.startsWith("OS"))
-            {
-                oppTotVol += loop.vol;
-            }
-        }
-        return oppTotVol;
-    }
-
-    /**
-     * Returns a string of highways data. If MetaDataOnly is true, you get a
-     * full dump of the highways meta data, which does not include dynamic loop
-     * values, and does include the string location names. If MetaDataOnly is
-     * false, dynamic loop values are included, and unnecessary information like
-     * string location values are included.
-     *
-     * The FEPSimulator takes in the toCondensedFormat() output, with a
-     * MetaDataOnly value of false, over the socket.
-     *
-     * The MetaDataOnly flag should be used to get a full dump of the highways
-     * information. This was used to get the highways_fullmap.txt output.
-     *
-     * @param MetaDataOnly Whether you want meta data, or a full dump for FEPSim
-     * @return String, highways data in condensed format
-     */
-    public String toCondensedFormat(boolean MetaDataOnly)
-    {
-        StringBuilder build = new StringBuilder();
-        build.append(Integer.toString(this.vdsID));
-        build.append(" ");
-        build.append(Integer.toString(this.drop));
-        build.append(" ");
-        build.append(Integer.toString(this.routeNumber));
-        build.append(" ");
-        build.append(this.direction.getLetter());
-        build.append(" ");
-        build.append(Double.toString(this.postmile));
-        build.append(" ");
-        build.append(Integer.toString(loops.size()));
-        build.append(" ");
-        if (MetaDataOnly)
-        {
-            build.append(this.location);
-        }
-        build.append("\n");
-        for (LoopDetector loop : loops)
-        {
-            build.append(loop.toCondensedFormat(MetaDataOnly));
-        }
-        return build.toString();
     }
 
@@ -201 +134 @@
             }
 
-            this.MLTotVol = getMLTotVol();
-            this.OppTotVol = getOPPTotVol();
+            this.totalVolume = calcTotalVolume();
         }
     }
@@ -252 +184 @@
                 OPP_ML, this.location, Double.toString(this.postmile),
                 dotcolor.name());
-    }
-
-    /**
-     * XML tags used for toXML() method.
-     */
-    private static enum XML_TAGS
-    {
-
-        STATION("Station"),
-        LDS_ID("LDS_ID"),
-        LINE_NUM("Line_Num"),
-        DROP("Drop"),
-        LOOPS("Loops"),
-        LOCATION("Location"),
-        POST_MILE("Post_Mile"),
-        DIRECTION("Direction"),
-        FREEWAY("Freeway"),
-        ML_TOT_VOL("ML_Tot_Vol"),
-        OPP_TOT_VOL("Opp_Tot_Vol");
-
-        String tag;
-
-        private XML_TAGS(String n)
-        {
-            tag = n;
-        }
-    }
-
-    /**
-     * Returns the Station data in XMLFormat.
-     *
-     * @param currElem The current XML <Station> element
-     */
-    public void toXML(Element currElem)
-    {
-        Document theDoc = currElem.getOwnerDocument();
-
-        Element stationElement = theDoc.createElement(XML_TAGS.STATION.tag);
-        currElem.appendChild(stationElement);
-
-        Element ldsIDElement = theDoc.createElement(XML_TAGS.LDS_ID.tag);
-        ldsIDElement.appendChild(theDoc.createTextNode(String.valueOf(this.vdsID)));
-        stationElement.appendChild(ldsIDElement);
-
-        Element lineNumElement = theDoc.createElement(XML_TAGS.LINE_NUM.tag);
-        lineNumElement.appendChild(theDoc.createTextNode(String.valueOf(this.lineID)));
-        stationElement.appendChild(lineNumElement);
-
-        Element dropElement = theDoc.createElement(XML_TAGS.DROP.tag);
-        dropElement.appendChild(theDoc.createTextNode(String.valueOf(this.drop)));
-        stationElement.appendChild(dropElement);
-
-        Element locationElement = theDoc.createElement(XML_TAGS.LOCATION.tag);
-        locationElement.appendChild(theDoc.createTextNode(this.location));
-        stationElement.appendChild(locationElement);
-
-        Element postMileElement = theDoc.createElement(XML_TAGS.POST_MILE.tag);
-        postMileElement.appendChild(theDoc.createTextNode(String.valueOf(this.postmile)));
-        stationElement.appendChild(postMileElement);
-
-        Element directionElement = theDoc.createElement(XML_TAGS.DIRECTION.tag);
-        directionElement.appendChild(theDoc.createTextNode("" + this.direction.getLetter()));
-        stationElement.appendChild(directionElement);
-
-        Element freewayElement = theDoc.createElement(XML_TAGS.FREEWAY.tag);
-        freewayElement.appendChild(theDoc.createTextNode(String.valueOf(this.routeNumber)));
-        stationElement.appendChild(freewayElement);
-
-        Element mlElement = theDoc.createElement(XML_TAGS.ML_TOT_VOL.tag);
-        mlElement.appendChild(theDoc.createTextNode(String.valueOf(this.MLTotVol)));
-        stationElement.appendChild(mlElement);
-
-        Element oppElement = theDoc.createElement(XML_TAGS.OPP_TOT_VOL.tag);
-        oppElement.appendChild(theDoc.createTextNode(String.valueOf(this.OppTotVol)));
-        stationElement.appendChild(oppElement);
-
-        Element loopsElement = theDoc.createElement(XML_TAGS.LOOPS.tag);
-        stationElement.appendChild(loopsElement);
-
-        for (LoopDetector loop : loops)
-        {
-            loop.toXML(loopsElement);
-        }
     }
 

trunk/test/tmcsim/highwaymodel/StationTest.java

@@ -47 +47 @@
 
     /**
-     * Test of getStationMeta method, of class Station.
-     */
-    public void testGetStationMeta() {
-        System.out.println("getStationMeta");
-        String expResult = "2 3 4 N 1.0 0 A\n";
-        String result = alpha.toCondensedFormat(true);
-        assertEquals(expResult, result);
-    }
-
-    /**
      * Test of getPostmile method, of class Station.
      */