Changeset 205 in tmcsimulator for branches

Timestamp:

11/01/2017 03:53:59 AM (9 years ago)

Author:

jtorres

Message:

LoadHighwaysTest?.java: now passing. HighwaysParser?.cpp: added a bunch of debugging output to stdout, bug still not found. FEPSim.h: changed buffer size. FEPSim.cpp: some local debugging outputs/config.

Location:

branches/FEPSimulator

Files:

• FEPSim.cpp (modified) (5 diffs)
• FEPSim.h (modified) (1 diff)
• HighwaysParser.cpp (modified) (2 diffs)
• nbproject/private/private.xml (modified) (1 diff)

branches/FEPSimulator/FEPSim.cpp

@@ -26 +26 @@
     vector<STATION*> ldsMap = highwaysParser.stations;
 
+    
     // Send one reply for every FEPLine
     for (int i = 0; i < lines.size(); i++) {
@@ -74 +75 @@
             fsa.msg.message[3 + aa] = 0xff;
             
-            for(int l = 0; l < fsa.msg.message_len + 2; l++)
+            /*for(int l = 0; l < fsa.msg.message_len + 2; l++)
             {
                 printf("%02X", (unsigned char) fsa.msg.message[l]);
             }
-            printf("\n");
+            printf("\n");*/
             
             // info
@@ -89 +90 @@
             fepReply.answers.fep_answer_list_u.shortp.answers[0] = fsa;
             // send out data
-            printf("Transferring line=%d, lds_drop_no=%d...\n", lines.at(i)->lineNum, (int)ldsMap.at(index)->drop);
+            //printf("Transferring line=%d, lds_drop_no=%d...\n", lines.at(i)->lineNum, (int)ldsMap.at(index)->drop);
             // Make RPC Call and handle response
             // printf("Handling ATMS response...\n");
@@ -178 +179 @@
         // zero out buffer
         bzero(buffer, BUFF_SIZE);
-
+        
         // read XML from socket
         int totBytes = 0;
@@ -184 +185 @@
             totBytes += n;
         }
+        HighwaysParser highwaysParser = HighwaysParser(buffer);
+
 
         if (n < 0) {

branches/FEPSimulator/FEPSim.h

@@ -43 +43 @@
 #include <unistd.h>
 
-// const int BUFF_SIZE = 5500000; // where it was
-// const int BUFF_SIZE = 11522291; // what it couldnt be :)
-const int BUFF_SIZE = 950401; // where it is now :) 
+const int BUFF_SIZE = 1266341; // where it is now :) 
 
 class FEPSim {

branches/FEPSimulator/HighwaysParser.cpp

@@ -76 +76 @@
             int numLoops = 0;
             getline(highwaysStream, currLine);
-            cout << currLine << endl;
             char direction;
             sscanf(currLine.c_str(), "%ld %hd %d %c %f %d", &lds, &dropNum, &routeNum, &direction,
                     &postmile, &numLoops);
-            cout << "NumberLoops: " << numLoops << endl;
-            cout << "DropNum: " << dropNum << endl;
-            cout << "LDS: " << lds << endl;
-            cout << "LDSIndex: " << ldsIndex << endl;
-            cout << "postmile: " << postmile << endl;
             newLine->lds.push_back(lds);
             newLine->ldsIndex.push_back(ldsIndex++);
@@ -101 +95 @@
                 cout << currLine << endl;
                 sscanf(currLine.c_str(), "%ld %f %d %s", &loopID, &occ, &vol, loopLoc);
-                cout << "LOOP ID: " << loopID << endl;
-                cout << "OCC: " << occ << endl;
-                cout << "VOL: " << vol << endl;
-                cout << "LOOPLOC: " << loopLoc << endl;
                 newLoop->loopID = loopID;
                 newLoop->occ = occ;
                 newLoop->vol = vol;
+                newLoop->spd = 0;
                 newLoop->loop_loc = loopLoc;
-                
+                cout << "Adding " << newLoop->loopID << " to " << newStation->lds << endl;
                 newStation->loops.push_back(newLoop);
             }
             newStation->length = newStation->loops.size() * 2 + CONTROL_DATA_LEN;
             newStation->dataPack = DataPacker::packData(newStation);
+            for(int byte = 0; byte < newStation->length; byte++)
+            {
+                printf("%02X", (unsigned char) newStation->dataPack[byte]);
+            }
             
-            cout << "NUMBER OF LOOPS: " << newStation->loops.size() << endl;
-            
+            cout << "Adding " << newStation->lds << " to ldsMap " << " at index " << ldsIndex << endl;
             this->stations.push_back(newStation);
         }
-        
+        cout << "Adding " << newLine->lineNum << " to lines" << endl;
         this->lines.push_back(newLine);
     }

branches/FEPSimulator/nbproject/private/private.xml

@@ -11 +11 @@
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.h</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/DataPacker.h</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/fep.h</file>
             <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file>