Changeset 146 in tmcsimulator for branches/BasicFEPClient

Timestamp:

10/18/2017 12:27:03 PM (9 years ago)

Author:

jtorres

Message:

BasicFEPClient with SandCanyon? (white dot) data, note: does not work

File:

• branches/BasicFEPClient/network_factory.cpp (modified) (1 diff)

branches/BasicFEPClient/network_factory.cpp

@@ -155 +155 @@
 }
 
-// TEST DATA
+// TEST DATA: WORKING
 // lds_id       line    drop sch lineinfo       system_key      sch_seq glo_seq         count   freeway Dir     ca_pm   lds_name                
 // 1203103      50      13      13      13      1123005873      24148   1357650         19      55      S       6.88    MACARTHU1 
+
+// SAND CANYON: NOT WORKING
+// 1204813      31      18      5       5       1123005744      26489   1357649         18      5       S       23.5    S OF SAND CNYN
+
 FEP_LINE * NetworkFactory::load_lines(int *size, const char * fName)
 {
         FEP_LINE *lines = (FEP_LINE *) calloc(sizeof(FEP_LINE), 1);
         *size = 1;
-        lines[0].lineNum = 50;
-        lines[0].lds.push_back(1203103);
+        lines[0].lineNum = 31;
+        lines[0].lds.push_back(1204813);
         lines[0].ldsIndex.push_back(0);
-        lines[0].count = 19;
-        lines[0].schedule = 13;
-        lines[0].globalSeq = 1357650;
-        lines[0].schedleSeq = 24148;
+        lines[0].count = 18;
+        lines[0].schedule = 5;
+        lines[0].globalSeq = 1357649;
+        lines[0].schedleSeq = 26489;
         return lines;   
 }
 
-// TEST DATA
+// TEST DATA: Working (MacAruthur))
 //FWY   Dir     POSTMI  LDS_ID  VDS_ID  LOOP_ID LOC    LANE LOOP_LOC            PARAMICS_NAME  PARAMICS_LANE    
 //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
+
+// TEST DATA: Not working (Sand canyon)
+//5       S       23.5    1204813 1204814 1204815 HV      1       SD_1            5s23.5hv        1
+//5       S       23.5    1204813 1204816 1204818 ML      2       ML_2            5s23.5ml        5
+//5       S       23.5    1204813 1204816 1204819 ML      3       ML_3            5s23.5ml        4
+//5       S       23.5    1204813 1204816 1204820 ML      4       ML_4            5s23.5ml        3
+//5       S       23.5    1204813 1204816 1204821 ML      5       ML_5            5s23.5ml        2
+//5       S       23.5    1204813 1204816 1204822 ML      6       ML_6            5s23.5ml        1
+//5       N       23.5    1204813 1204823 1204824 OH      1       SD_2            5n23.5hv        1
+//5       N       23.5    1204813 1204825 1204826 OS      1       OS_1            5n23.5ml        6
+//5       N       23.5    1204813 1204825 1204827 OS      2       OS_2            5n23.5ml        5
+//5       N       23.5    1204813 1204825 1204828 OS      3       OS_3            5n23.5ml        4
+//5       N       23.5    1204813 1204825 1204829 OS      4       OS_4            5n23.5ml        3
+//5       N       23.5    1204813 1204825 1204830 OS      5       OS_5            5n23.5ml        2
+//5       N       23.5    1204813 1204825 1204831 OS      6       OS_6            5n23.5ml        1
+
+
+//5       S       23.5    1204813 1204816 1204817 ML      1       ML_1            5s23.5ml        6
+
 STATION * NetworkFactory::load_lds(const char * fName)
 {
         /* Read loop meta data */
         STATION *lds_map = (STATION *) calloc(sizeof(STATION), 1);
-        lds_map[0].lds = 1203103;
-        lds_map[0].line_num = 50;
-        lds_map[0].drop = 13;
+        lds_map[0].lds = 1204813;
+        lds_map[0].line_num = 31;
+        lds_map[0].drop = 18;
         LOOP *loop = new LOOP;
-        loop->loopID = 1203113;
+        loop->loopID = 1204817;
         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(loop);