Changeset 90 in tmcsimulator for trunk

Timestamp:

10/10/2017 04:35:30 PM (9 years ago)

Author:

jdalbey

Message:

Station.java - DIRECTION enum shortened by using existing enum methods "values()" and "toString()".

Location:

trunk/src/atmsdriver

Files:

• NetworkLoader.java (modified) (2 diffs)
• model/Highways.java (modified) (1 diff)
• model/Station.java (modified) (8 diffs)

trunk/src/atmsdriver/NetworkLoader.java

@@ -228 +228 @@
         sc.nextInt(); // skip count
         sc.nextInt(); // fwy
-        DIRECTION dir = DIRECTION.getEnum(sc.next()); // direction
+        DIRECTION dir = DIRECTION.toDirection(sc.next()); // direction
         sc.nextDouble();
         
@@ -261 +261 @@
                 scLine.nextInt(); // skip count
                 int fwy = scLine.nextInt(); // fwy
-                DIRECTION dir = DIRECTION.getEnum(scLine.next()); // direction
+                DIRECTION dir = DIRECTION.toDirection(scLine.next()); // direction
                 double postmile = scLine.nextDouble();
                 String ldsName = getLocation(strLine); /************* DOESNT GRAB WHOLE???? */////

trunk/src/atmsdriver/model/Highways.java

@@ -102 +102 @@
             DIRECTION hwyDir = hwyKey.get(hwyNum);
             Collections.sort(highwayTable.get(hwyKey));
-            System.out.println("Adding highway: " + hwyNum + " " + hwyDir.name);
+            System.out.println("Adding highway: " + hwyNum + " " + hwyDir.toString().charAt(0));
             highways.add(new Highway(hwyNum, 
                     hwyDir, hwyStations));

trunk/src/atmsdriver/model/Station.java

@@ -25 +25 @@
     final private String location;
     final private List<LoopDetector> loops;
-    final private int freeway;
+    final private int highwayNum;
     final private double postmile;
     final private DIRECTION direction;
@@ -35 +35 @@
     /* Constructor */
     public Station(int lineNum, int ldsID, int drop,
-            String location, List<LoopDetector> loops, int fwy,
+            String location, List<LoopDetector> loops, int hwy,
             DIRECTION direction, double postmile) {
         this.lineNum = lineNum;
@@ -44 +44 @@
         this.postmile = postmile;
         this.direction = direction;
-        this.freeway = fwy;
+        this.highwayNum = hwy;
 
         this.MLTotVol = 0;
@@ -52 +52 @@
     public int getHighwayNumber()
     {
-        return this.freeway;
+        return this.highwayNum;
     }
     
@@ -73 +73 @@
         build.append(Integer.toString(this.drop));
         build.append(" ");
-        build.append(Integer.toString(this.freeway));
-        build.append(" ");
-        build.append(this.direction.name);
+        build.append(Integer.toString(this.highwayNum));
+        build.append(" ");
+        build.append(this.direction.getLetter());
         build.append(" ");
         build.append(Double.toString(this.postmile));
@@ -93 +93 @@
     }
 
+    /** Compare this Station to another by postmile.
+     * Note: This might be better as a Comparator since it checks only one field.
+     */
     @Override
     public int compareTo(Object otherStation) {
+        // check for identity
+        if (this == otherStation) return 0;
         // check that Object is of type Station, if not throw exception
         if (!(otherStation instanceof Station)) {
@@ -163 +168 @@
 
         Element directionElement = theDoc.createElement(XML_TAGS.DIRECTION.tag);
-        directionElement.appendChild(theDoc.createTextNode(this.direction.name));
+        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.freeway)));
+        freewayElement.appendChild(theDoc.createTextNode(String.valueOf(this.highwayNum)));
         stationElement.appendChild(freewayElement);
 
@@ -194 +199 @@
     public static enum DIRECTION {
 
-        NORTH("N"),
-        SOUTH("S"),
-        EAST("E"),
-        WEST("W");
-
-        String name;
-
-        DIRECTION(String name) {
-            this.name = name;
-        }
-
+        NORTH,
+        SOUTH,
+        EAST,
+        WEST;
+
+        // All the first letters of the values, in order.
+        private static String allLetters = "NSEW";
+
+        /** Return the first letter of this enum.
+         * 
+         * @return String first letter of this enum.
+         */
+        public String getLetter()
+        {
+            return this.toString().substring(0,1);
+        }
+        
         /**
-         * Returns the direction enum, given a string value.
+         * Returns a direction given its first character.
          *
-         * @param name str value for enum
-         * @return enum for given str value
+         * @param letter the first character of a direction
+         * @return direction corresponding to letter
+         * @pre letter must be one of allLetters
          */
-        public static DIRECTION getEnum(String name) {
-            switch (name) {
-                case "S":
-                    return SOUTH;
-                case "N":
-                    return NORTH;
-                case "E":
-                    return EAST;
-                case "W":
-                    return WEST;
-                default:
-                    return null;
-            }
-        }
+        public static DIRECTION toDirection(String letter)
+        {
+            return values()[allLetters.indexOf(letter.charAt(0))];
+        }
+        
     }
 }