Changeset 195 in tmcsimulator for branches/FEPSimulator

Timestamp:

10/30/2017 03:33:04 PM (9 years ago)

Author:

jtorres

Message:

FEPSim.h: changed buffer size. HighwaysParser?.cpp: began new condensed format parsing, not finished. atms_driver_config_local.properties: changed properties file for new highways_fullmap.txt. Highways.java: comments.

Location:

branches/FEPSimulator

Files:

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

branches/FEPSimulator/FEPSim.h

@@ -36 +36 @@
 #include <stdlib.h>
 #include "time.h"
-#include "NetworkReader.h"
+#include "HighwaysParser.h"
 #include <netdb.h>
 #include <sys/types.h> 
@@ -43 +43 @@
 #include <unistd.h>
 
-const int BUFF_SIZE = 5500000;
+// 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 :) 
 
 class FEPSim {

branches/FEPSimulator/HighwaysParser.cpp

@@ -8 +8 @@
 #include "HighwaysParser.h"
 
-HighwaysParser::HighwaysParser() {
+HighwaysParser::HighwaysParser(char * hwyData) {
+    string highwaysData = hwyData;
+    istringstream stream(highwaysData);
+    parseLines(highwaysData);
 }
 
@@ -14 +17 @@
 }
 
+vector<FEP_LINE *> HighwaysParser::getLines() {
+    
+}
+
+vector<STATION *> HighwaysParser::getStations() {
+    
+}
+// FEP line: Represents a serial communication line from field stations to the 
+// An FEP Line has several Loop Detector Stations (Stations) connected)
+typedef struct fep_line FEP_LINE;
+struct  fep_line
+{
+        int             lineNum;
+        vector<long>    lds;
+        vector<long>    ldsIndex;       // location in ldsMap
+
+        short   count;  // actual count from caltrans
+        int     schedule;
+        int     lineInfo;
+        long    systemKey;
+        long    globalSeq;
+        long    schedleSeq;
+};
+void HighwaysParser::parseLines(istringstream highwaysData)
+{
+    string currLine;
+    getline(highwaysData, currLine);
+    int numLines;
+    sscanf(highwaysData, "%d", &numLines);
+    
+    int lineNum = 0;
+    long lds = 0;
+    long ldsIndex = 0;
+    short count = 0;
+    int schedule = 0;
+    int lineInfo = 0;
+    long systemKey = 0;
+    long globalSeq = 0;
+    long schedleSeq = 0;
+    
+    for(int lineIndex = 0; lineIndex < numLines; lineIndex++)
+    {
+        getline(highwaysData, currLine);
+        int numStations = 0;
+        sscanf(currLine, "%d %d %d", &lineNum, &count, &numStations);
+        for(int stationIndex = 0; stationIndex < numStations; stationIndex++)
+        {
+            getline(highwaysData, currLine);
+            sscanf(currLine, "%d %d %d %d %d %d", &lds, )
+            
+        }
+    }
+    getline(highwaysData, currLine);
+}
+
+FEP_LINE * HighwaysParser::parseLine(istringstream highwaysData)
+{
+
+}
+
+STATION * HighwaysParser::parseStation(istringstream highwaysData)
+{
+    
+}
+
+LOOP * HighwaysParser::parseLoop(istringstream highwaysData)
+{
+    
+}

branches/FEPSimulator/nbproject/private/private.xml

@@ -7 +7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/network.h</file>
+            <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/FEPSim.cpp</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/fep.h</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/FEPSim.h</file>
+            <file>file:/Users/jtorres/tmcsimulator/branches/FEPSimulator/HighwaysParser.cpp</file>
+        </group>
     </open-files>
 </project-private>