Changeset 202 in tmcsimulator for branches/FEPSimulator/HighwaysParser.h

Timestamp:

10/30/2017 06:35:42 PM (9 years ago)

Author:

jtorres

Message:

Further progress on condensed format reader, not all green dots showing

File:

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

branches/FEPSimulator/HighwaysParser.h

@@ -13 +13 @@
 #include <iostream>
 #include <sstream>
+#include <stdio.h>
+#include "DataPacker.h"
 
 class HighwaysParser {
@@ -18 +20 @@
     HighwaysParser(char * highwaysData);
     
-    vector<FEP_LINE*> getLines();
-    vector<STATION*> getStations();
-    
+    vector<FEP_LINE*> lines;
+    vector<STATION*> stations;
     virtual ~HighwaysParser();
 private:
-    vector<FEP_LINE*> lines;
-    vector<STATION*> stations;
-    
-    FEP_LINE * parseLine(istringstream highwaysData);
-    STATION * parseStation(istringstream highwaysData);
-    LOOP * parseLoop(istringstream highwaysData);
-    void parseLines(istringstream highwaysData);
+    void parseLines(char * highwaysData);
 };