Changeset 74 in tmcsimulator for branches/fep_client_cpp/network_factory.cpp

Timestamp:

09/07/2017 07:34:43 PM (9 years ago)

Author:

jtorres

Message:

network_factory.cpp: changed test data, successful green dot

File:

• branches/fep_client_cpp/network_factory.cpp (modified) (4 diffs)

branches/fep_client_cpp/network_factory.cpp

@@ -4 +4 @@
 
 // determine if a loop has data based on lane config data
-bool DataAvail(char flag, int num)
-{
+bool DataAvail(char flag, int num) {
         int mag, fel;
 
@@ -155 +154 @@
 // TEST DATA
 // lds_id       line    drop sch lineinfo       system_key      sch_seq glo_seq         count   freeway Dir     ca_pm   lds_name                
-// 1208926      29      4       28      28      1123006080      26480   1357609         13      73      S       23.7    MACARTHUR 1  
+// 1203103      50      13      13      13      1123005873      24148   1357650         19      55      S       6.88    MACARTHU1 
 FEP_LINE_LDS * load_lines(int *size, const char * fName)
 {
         FEP_LINE_LDS *lines = (FEP_LINE_LDS *) calloc(sizeof(FEP_LINE_LDS), 1);
         *size = 1;
-        lines[0].lineNum = 29;
-        lines[0].lds.push_back(1208926);
+        lines[0].lineNum = 50;
+        lines[0].lds.push_back(1203103);
         lines[0].ldsIndex.push_back(0);
         lines[0].ldsNum = 1;
-        lines[0].count = 13;
-        lines[0].schedule = 28;
-        lines[0].globalSeq = 1357609;
-        lines[0].schedleSeq = 26480;
+        lines[0].count = 19;
+        lines[0].schedule = 13;
+        lines[0].globalSeq = 1357650;
+        lines[0].schedleSeq = 24148;
         return lines;   
 }
@@ -173 +172 @@
 // TEST DATA
 //FWY   Dir     POSTMI  LDS_ID  VDS_ID  LOOP_ID LOC    LANE LOOP_LOC            PARAMICS_NAME  PARAMICS_LANE    
-//73    S       23.7    1208926 1210494 1210490 ML      1       ML_1            ?               0
-//73    S       23.7    1208926 1210494 1210492 ML      2       ML_2            ?               0
-//73    S       23.7    1208926 1210494 1210493 ML      3       ML_3            ?               0
-//73    S       23.7    1208926 1210770 1210769 OR      1       RAMP_ON         ?               0
+//55    S       6.88    1203103 1203104 1203105 QU      1       QUEUE           55s6.88ora      0
+
+//55    S       6.88    1203103 1203104 1203106 DM      2       DEMAND          55s6.88ora      0
+
+//55    S       6.88    1203103 1203104 1203107 PA      3       PASSAGE         55s6.88ora      0
+
+//55    S       6.88    1203103 1203108 1203109 HV      1       SD_1            ?               0
+
+//55    S       6.88    1203103 1203110 1203111 ML      1       ML_1            55s6.88ml       4
+
+//55    S       6.88    1203103 1203110 1203112 ML      2       ML_2            55s6.88ml       3
+
+//55    S       6.88    1203103 1203110 1203113 ML      3       ML_3            55s6.88ml       2
+
+//55    S       6.88    1203103 1203110 1203114 ML      4       ML_4            55s6.88ml       1
 LDS_LOOP * load_lds(const char * fName)
 {
         /* Read loop meta data */
         LDS_LOOP *lds_map = (LDS_LOOP *) calloc(sizeof(LDS_LOOP), 1);
-        lds_map[0].lds = 1208926;
-        lds_map[0].line_num = 29;
-        lds_map[0].drop = 4;
-        lds_map[0].num = 4;
+        lds_map[0].lds = 1203103;
+        lds_map[0].line_num = 50;
+        lds_map[0].drop = 13;
+        lds_map[0].num = 1;
 
         // Loop ids
         long *loopIDs = (long *) calloc(sizeof(long), lds_map[0].num);
-        loopIDs[0] = 1210490;
-        loopIDs[1] = 1210492;
-        loopIDs[2] = 1210493;
-        loopIDs[3] = 1210769;
+        loopIDs[0] = 1203113;
         lds_map[0].loopID = loopIDs;
         
         // Loop locations
-        char *one = "ML_1";
-        char *two = "ML_2";
-        char *three = "ML_3";
-        char *four = "RAMP_ON";
-        char **loc = (char **) calloc(sizeof(char *), lds_map[0].num);
-        loc[0] = one; 
-        loc[1] = two;
-        loc[2] = three;
-        loc[3] = four;
-        lds_map[0].loop_loc = loc;
+        char *loc = "ML_3";
+        lds_map[0].loop_loc = &loc;
 
         // Init Loop dataPack
@@ -212 +211 @@
         lds_map[0].pos = 0;
 
-        lds_map[0].MlTotVol = 0;
-        lds_map[0].OppTotVol = 0;
+        lds_map[0].MlTotVol = 150;
+        lds_map[0].OppTotVol = 150;
 
         return lds_map;