Changeset 127 in tmcsimulator for trunk/src/atmsdriver/model

Timestamp:

10/16/2017 04:38:16 PM (9 years ago)

Author:

jdalbey

Message:

Station.java Enhance DOTCOLOR enum to have volume and occupancy fields. Minor changes to error messages in other files.

Location:

trunk/src/atmsdriver/model

Files:

• Highways.java (modified) (2 diffs)
• Station.java (modified) (1 diff)

trunk/src/atmsdriver/model/Highways.java

@@ -211 +211 @@
     public void writeToFEP() {
         try {
-            Socket sock = new Socket(/*FEPHostName*/ "192.168.251.130", 8080);
+            Socket sock = new Socket(FEPHostName /*"192.168.251.130"*/, 8080);
             PrintWriter out = new PrintWriter(sock.getOutputStream(), true);
             out.println(this.toXML());
@@ -217 +217 @@
         } catch (IOException ex) {
             Logger.getLogger(Highways.class.getName()).log(Level.SEVERE, null, ex);
+            System.out.println("Highway Model failed writing to FEPSim.");
         }
     }

trunk/src/atmsdriver/model/Station.java

@@ -166 +166 @@
             {
                 // UPDATE LOOP WITH VALUES
-                // TODO: Perhaps enhance DOTCOLOR enum to include constants for
-                // vol and occ along with each color.  Then the updateLoop call
-                // below could be update(dotColor.volume, dotColor.occ, speed)
-                int volume = 10;
-                int occ = 10;
                 int speed = 0;
-                loop.updateLoop(volume, occ, speed);
+                loop.updateLoop(dotColor.volume(), dotColor.occupancy(), speed);
             }
         }