Changeset 205 in tmcsimulator for branches/FEPSimulator/HighwaysParser.cpp

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.

File:

• branches/FEPSimulator/HighwaysParser.cpp (modified) (2 diffs)

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);
     }