Changeset 177 in tmcsimulator for branches

Timestamp:

10/25/2017 01:04:40 PM (9 years ago)

Author:

jdalbey

Message:

FEPSim.cpp Clarify comments and variable names.

Location:

branches/FEPSimulator

Files:

• FEPSim.cpp (modified) (4 diffs)
• HighwaysParser.cpp (moved) (moved from branches/FEPSimulator/NetworkReader.cpp) (5 diffs)

branches/FEPSimulator/FEPSim.cpp

@@ -21 +21 @@
 }
 
-void FEPSim::sendReplys(char * xml) {
-    NetworkReader networkReader = NetworkReader(xml);
-    vector<FEP_LINE*> lines = networkReader.getLines();
-    vector<STATION*> ldsMap = networkReader.getStations();
+void FEPSim::sendReplys(char * buffer) {
+    HighwaysParser highwaysParser = HighwaysParser(buffer);
+    vector<FEP_LINE*> lines = highwaysParser.getLines();
+    vector<STATION*> ldsMap = highwaysParser.getStations();
 
     // Send one reply for every FEPLine
@@ -89 +89 @@
             fepReply.answers.fep_answer_list_u.shortp.answers[0] = fsa;
             // send out data
-            printf("Transferring line=%d, lds_drop_no=%d...\n", lines.at(i)->lineNum, ldsMap.at(index)->drop);
+            printf("Transferring line=%d, lds_drop_no=%d...\n", lines.at(i)->lineNum, (int)ldsMap.at(index)->drop);
             // Make RPC Call and handle response
             // printf("Handling ATMS response...\n");
+            // Transfer the station data to ATMS and listen for response
             handleCallResponse(fep_reply_xfer_32(&fepReply, clnt));
         }
@@ -97 +98 @@
 }
 
-void FEPSim::updateATMS(char * xml) {
-    if (createClient()) {
-        sendReplys(xml);
+void FEPSim::manageClientConnection(char * buffer) 
+{
+    // Attempt to create RPC client
+    if (createClient()) 
+    {
+        // Prepare and send the highway status as FEP replies
+        sendReplys(buffer);
         cout << "Destroying client..." << endl;
         clnt_destroy(clnt);
@@ -184 +189 @@
 
         // send data to atms
-        updateATMS(buffer);
+        manageClientConnection(buffer);
     }
 }

branches/FEPSimulator/HighwaysParser.cpp

@@ -1 +1 @@
 #include "NetworkReader.h"
 
-NetworkReader::NetworkReader(const char * xml) {
+HighwaysParser::HighwaysParser(const char * xml) {
     ldsIndex = 0;
     loadLines(xml);
 }
 
-LOOP * NetworkReader::parseLoop(TiXmlElement * loopElem) {
+LOOP * HighwaysParser::parseLoop(TiXmlElement * loopElem) {
     LOOP *loop = new LOOP;
 
@@ -24 +24 @@
 }
 
-STATION * NetworkReader::parseStation(TiXmlElement *stationElem, FEP_LINE *line) {
+STATION * HighwaysParser::parseStation(TiXmlElement *stationElem, FEP_LINE *line) {
     STATION *station = new STATION;
 
@@ -62 +62 @@
 }
 
-FEP_LINE * NetworkReader::parseLine(TiXmlElement * lineElem) {
+FEP_LINE * HighwaysParser::parseLine(TiXmlElement * lineElem) {
     FEP_LINE *line = new FEP_LINE;
 
@@ -89 +89 @@
 }
 
-void NetworkReader::loadLines(const char * xml) {
+void HighwaysParser::loadLines(const char * xml) {
     // Load network xml file
     TiXmlDocument doc;
@@ -107 +107 @@
 }
 
-vector<FEP_LINE*> NetworkReader::getLines() {
+vector<FEP_LINE*> HighwaysParser::getLines() {
 
     return lines;
 }
 
-vector<STATION*> NetworkReader::getStations() {
+vector<STATION*> HighwaysParser::getStations() {
 
     return stations;
 }
 
-NetworkReader::~NetworkReader() {
+HighwaysParser::~HighwaysParser() {
 
 }