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

Timestamp:

11/02/2017 12:07:25 AM (9 years ago)

Author:

jtorres

Message:

branches/FEPSimulator/tests: added unit test HighwaysParserTest?.cpp, which yielded a bug in HighwayParser?.cpp (not returning correct loop_loc... garbage data...), this likely explains why not all green dots were showing

File:

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

branches/FEPSimulator/HighwaysParser.cpp

@@ -35 +35 @@
     int numLines;
     sscanf(currLine.c_str(), "%d", &numLines);
-    cout << currLine << endl;
     int lineNum = 0;
     long lds = 0;
@@ -51 +50 @@
     float occ = 0;
     int vol = 0;
-    char loopLoc[25];
+
     for(int lineIndex = 0; lineIndex < numLines; lineIndex++)
     {
@@ -59 +58 @@
         int numStations = 0;
         sscanf(currLine.c_str(), "%d %hd %d", &lineNum, &count, &numStations);
-        cout << "Line num: " << lineNum << endl;
-        cout << "Count: " << count << endl;
-        cout << "numStations: " << numStations << endl;
         newLine->lineNum = lineNum;
         newLine->count = count;
@@ -93 +89 @@
                 
                 getline(highwaysStream, currLine);
-                cout << currLine << endl;
-                sscanf(currLine.c_str(), "%ld %f %d %s", &loopID, &occ, &vol, loopLoc);
+                newLoop->loop_loc = (char *) malloc(25 * sizeof(char));
+                sscanf(currLine.c_str(), "%ld %f %d %s", &loopID, &occ, &vol, newLoop->loop_loc);
                 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);
             }
@@ -109 +103 @@
                 printf("%02X", (unsigned char) newStation->dataPack[byte]);
             }
+            printf("\n");
             
-            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);
     }