Changeset 114 in tmcsimulator

Timestamp:

10/14/2017 10:11:04 AM (9 years ago)

Author:

jtorres

Message:

Updating FEPSimulator for JD's linux machine. Modified ATMS/Console Driver to show red dots.

Files:

• branches/FEPSimulator/DataPacker.cpp (modified) (1 diff)
• branches/FEPSimulator/FEPSim.cpp (modified) (1 diff)
• branches/FEPSimulator/nbproject/private/private.xml (modified) (1 diff)
• branches/WorkingFEPSimulator (deleted)
• trunk/src/atmsdriver/ConsoleDriver.java (modified) (1 diff)
• trunk/src/atmsdriver/model/Highways.java (modified) (1 diff)
• trunk/src/atmsdriver/model/LoopDetector.java (modified) (2 diffs)
• trunk/src/atmsdriver/model/Station.java (modified) (2 diffs)
• trunk/src/tmcsim/application.properties (modified) (1 diff)

branches/FEPSimulator/DataPacker.cpp

@@ -37 +37 @@
 
     return msg; 
+    return msg;
 }
 

branches/FEPSimulator/FEPSim.cpp

@@ -72 +72 @@
             fsa.msg.message[2 + aa] = 0x0d;
             fsa.msg.message[3 + aa] = 0xff;
-   // info
+            
+            for(int l = 0; l < fsa.msg.message_len + 2; l++)
+            {
+                printf("%02X", (unsigned char) fsa.msg.message[l]);
+            }
+            printf("\n");
+            
+            // info
             fsa.info.poll_error_count = 0;
             fsa.info.poll_user_info1 = ldsMap.at(index)->drop; // drop number

branches/FEPSimulator/nbproject/private/private.xml

@@ -8 +8 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.cpp</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.cpp</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/Main.cpp</file>
-            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/NetworkReader.cpp</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file>
         </group>
     </open-files>

trunk/src/atmsdriver/ConsoleDriver.java

@@ -150 +150 @@
         }
         System.out.println("");
+        highways.writeToFEP();
     }
     

trunk/src/atmsdriver/model/Highways.java

@@ -211 +211 @@
     public void writeToFEP() {
         try {
-            Socket sock = new Socket(FEPHostName, FEPPortNum);
+            Socket sock = new Socket(FEPHostName /*"192.168.251.130"*/, 8080);
             PrintWriter out = new PrintWriter(sock.getOutputStream(), true);
             out.println(this.toXML());

trunk/src/atmsdriver/model/LoopDetector.java

@@ -22 +22 @@
     
     /* dynamic data */
-    private int vol;
-    private int occ;
+    public int vol;
+    public int occ;
     private int spd;
     
@@ -34 +34 @@
         
         /* Init dynamic data */
-        this.vol = 0;
+        this.vol = 100;
         this.spd = 0;
-        this.occ = 0;
+        this.occ = 100;
     }
     

trunk/src/atmsdriver/model/Station.java

@@ -50 +50 @@
         this.routeNumber = hwy;
 
-        this.MLTotVol = 0;
-        this.OppTotVol = 0;
+        this.MLTotVol = getMLTotVol();
+        this.OppTotVol = getOPPTotVol();
+    }
+    
+    private int getMLTotVol()
+    {
+        int mlTotVol = 0;
+        for(LoopDetector loop : loops)
+        {
+            if(loop.loopLocation.startsWith("ML"))
+            {
+                mlTotVol += loop.vol;
+            }
+        }
+        return mlTotVol;
+    }
+    
+    private int getOPPTotVol()
+    {
+        int oppTotVol = 0;
+        for(LoopDetector loop : loops)
+        {
+            if(loop.loopLocation.startsWith("OP"))
+            {
+                oppTotVol += loop.vol;
+            }
+        }
+        return oppTotVol;
     }
 
@@ -143 +169 @@
                 // vol and occ along with each color.  Then the updateLoop call
                 // below could be update(dotColor.volume, dotColor.occ, speed)
-                int volume = 0;
-                int occ = 0;
+                int volume = 10;
+                int occ = 10;
                 int speed = 0;
                 loop.updateLoop(volume, occ, speed);

trunk/src/tmcsim/application.properties

@@ -1 @@
-#Thu, 12 Oct 2017 01:19:36 -0700
+#Sat, 14 Oct 2017 11:10:53 -0700
 
-Application.revision=101
+Application.revision=110
 
-Application.buildnumber=51
+Application.buildnumber=52