Changeset 145 in tmcsimulator

Timestamp:

10/18/2017 12:16:08 PM (9 years ago)

Author:

jtorres

Message:

BasicFEPClient is working for single green dot

Location:

branches/BasicFEPClient

Files:

• build/Debug/GNU-MacOSX/network_factory.o.d (modified) (1 diff)
• network_factory.cpp (modified) (6 diffs)

branches/BasicFEPClient/build/Debug/GNU-MacOSX/network_factory.o.d

@@ -1 +1 @@
 build/Debug/GNU-MacOSX/network_factory.o: network_factory.cpp network.h \
-  network_factory.h
+  network_factory.h DataPacker.h
 
 network.h:
 
 network_factory.h:
+
+DataPacker.h:

branches/BasicFEPClient/network_factory.cpp

@@ -3 +3 @@
 #include <math.h>
 #include "network_factory.h"
+#include "DataPacker.h"
 
 // determine if a loop has data based on lane config data
@@ -46 +47 @@
         for (j = 0; j < loop->loops.size(); j++)
         {
-            char * currLoc = loop->loops[j].loop_loc;
+            char * currLoc = loop->loops[j]->loop_loc;
                 for (int k = 0; k < 8; k++)
                 {
@@ -97 +98 @@
         for (j = 0; j < loop->loops.size(); j++)
         {
-                if (strcmp(loop->loops.at(0).loop_loc, "DEMAND") == 0)
+                if (strcmp(loop->loops.at(0)->loop_loc, "DEMAND") == 0)
                 {
                         found = true;
@@ -164 +165 @@
         lines[0].lds.push_back(1203103);
         lines[0].ldsIndex.push_back(0);
-        lines[0].lds.size() = 1;
         lines[0].count = 19;
         lines[0].schedule = 13;
@@ -196 +196 @@
         lds_map[0].line_num = 50;
         lds_map[0].drop = 13;
-
+        LOOP *loop = new LOOP;
+        loop->loopID = 1203113;
+        loop->loop_loc = "ML_1";
+        loop->occ = 0;
+        loop->vol = 0;
+        
         // Loop ids
         long *loopIDs = (long *) calloc(sizeof(long), lds_map[0].loops.size());
         loopIDs[0] = 1203113;
-        lds_map[0].loops.push_back(1203113);
+        lds_map[0].loops.push_back(loop);
 
         // Init Loop dataPack
@@ -212 +217 @@
         
         DataPacker dp;
-        lds_map[0].dataPack = dp.packData(lds_map[0]);
+        lds_map[0].dataPack = dp.packData(&lds_map[0]);