Changeset 84 in tmcsimulator

Timestamp:

10/06/2017 11:44:52 PM (9 years ago)

Author:

jtorres

Message:

FEPSimulator.cpp: FEPSimulator socket server is now receiving full messages, no more partial messages over the TCP socket. General housekeeping on FEPSim.cpp, NetworkReader?.cpp, ATMSDriver.java, NetworkLoader?.java.

Files:

• branches/FEPSimulator/FEPSim.cpp (modified) (13 diffs)
• branches/FEPSimulator/FEPSim.h (modified) (1 diff)
• branches/FEPSimulator/NetworkReader.cpp (modified) (3 diffs)
• branches/trunk/IDE_metadata/NetBeans/TMCSim/build/built-jar.properties (modified) (1 diff)
• branches/trunk/IDE_metadata/NetBeans/TMCSim/build/classes/atmsdriver/ATMSDriver$PROPERTIES.class (modified) (previous)
• branches/trunk/IDE_metadata/NetBeans/TMCSim/build/classes/atmsdriver/ATMSDriver.class (modified) (previous)
• branches/trunk/IDE_metadata/NetBeans/TMCSim/build/classes/atmsdriver/model/HighwayStatusWriter.class (modified) (previous)
• branches/trunk/IDE_metadata/NetBeans/TMCSim/build/classes/tmcsim/application.properties (modified) (1 diff)
• branches/trunk/IDE_metadata/NetBeans/TMCSim/dist/TMCSim.jar (modified) (previous)
• branches/trunk/src/atmsdriver/ATMSDriver.java (modified) (1 diff)
• branches/trunk/src/atmsdriver/NetworkLoader.java (modified) (1 diff)
• branches/trunk/src/atmsdriver/model/HighwayStatusWriter.java (modified) (1 diff)
• branches/trunk/src/tmcsim/application.properties (modified) (1 diff)
• trunk/config/atms_driver_config.properties (modified) (1 diff)
• trunk/src/atmsdriver/NetworkLoader.java (modified) (7 diffs)
• trunk/src/atmsdriver/model/FEPLine.java (modified) (3 diffs)
• trunk/src/atmsdriver/model/Station.java (moved) (moved from trunk/src/atmsdriver/model/LoopDetectorStation.java) (3 diffs)

branches/FEPSimulator/FEPSim.cpp

@@ -7 +7 @@
  * @param networkFile the xml network file
  */
-FEPSim::FEPSim(char * ATMShost, char * xml) {
-    networkReader = new NetworkReader(xml);
+FEPSim::FEPSim(char * ATMShost) {
     this->ATMSHost = ATMShost;
-    updateATMS();
 }
 
@@ -26 +24 @@
  */
 void FEPSim::handleCallResponse(void *response) {
-    /* If ATMS reply call fails */
+    // Failed RPC Call
     if (response == NULL) {
         clnt_perror(clnt, "RPC call failed");
-    }/* If ATMS reply is successful */
+    }
+    // Successful RPC Call
     else {
         cout << "Successful RPC call to ATMS..." << endl;
@@ -35 +34 @@
 }
 
-/**
- * Sends an fep_reply for every line in the FEP.
- */
-void FEPSim::updateATMS() {
-    int i, j; // i == line_index, j == lds_index
-    void *rv;
-    vector<FEP_LINE*> lines = networkReader->getLines();
-    vector<STATION*> ldsMap = networkReader->getStations();
-
-    // Send one reply for every "line" in the FEP
-    for (i = 0; i < lines.size(); i++) {
+void FEPSim::sendReplys(char * xml)
+{
+    NetworkReader networkReader = NetworkReader(xml);
+    vector<FEP_LINE*> lines = networkReader.getLines();
+    vector<STATION*> ldsMap = networkReader.getStations();
+    
+    // Send one reply for every FEPLine
+    for (int i = 0; i < lines.size(); i++) {
         fep_reply fepReply;
         cout << "Sending fepReply for line #" << lines.at(i)->lineNum << endl;
@@ -56 +52 @@
 
         /***********************************
-                 This is an update to an extern, this should happen on the Java driver side??
+         * We might need to handle this on the java side if its an
+         * issue
         lines.at(i).schedleSeq += 1;
         lines.at(i).globalSeq += 51;
@@ -63 +60 @@
         fepReply.schedule_sequence = lines.at(i)->schedleSeq;
         fepReply.global_sequence = lines.at(i)->globalSeq;
-        /************************************
-                 Need to find out what appropriate schedule time is: look at uci_unix_simulation_time src code
-        fepReply.schedule_time =
-                uci_unix_simulation_time(uci_simulation_time());        // GMT time
-         */
+
+        // using current unix time, may need to look at later
         fepReply.schedule_time = time(NULL);
 
@@ -77 +71 @@
         fepReply.answers.fep_answer_list_u.shortp.count = 1;
 
-        /* for each LDS in the Line.... (constructs the short_answer message) */
-        for (j = 0; j < lines.at(i)->lds.size(); j++) {
+        // construct a shortanswer for each station in line
+        for (int j = 0; j < lines.at(i)->lds.size(); j++) {
             fep_shortanswer fsa;
             int index = lines.at(i)->ldsIndex.at(j);
@@ -90 +84 @@
             int aa = ldsMap.at(index)->length;
             fsa.msg.message[2 + aa] = 0x0d;
-            fsa.msg.message[3 + aa] = 0xff; //????????????? warning ?????
+            fsa.msg.message[3 + aa] = 0xff;
 
             // info
             fsa.info.poll_error_count = 0;
-            /***************************************
-                     Need to find out polltime uci time function src code
-            fsa.info.poll_time = uci_unix_simulation_time(uci_simulation_time());
-             */
             fsa.info.poll_user_info1 = ldsMap.at(index)->drop; // drop number
             fsa.info.poll_user_info2 = 1; //always 1
@@ -103 +93 @@
             fsa.info.status = (enum replystatus) 1;
 
-            //fepReply.answers.fep_answer_list_u.shortp.answers[j +1] = fsa;
             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);
-            rv = fep_reply_xfer_32(&fepReply, clnt);
-
-            /* Handle ATMS response to RPC Call */
+            // Make RPC Call and handle response
             printf("Handling ATMS response...\n");
-            handleCallResponse(rv);
-        }
+            handleCallResponse(fep_reply_xfer_32(&fepReply, clnt));
+        }
+    }
+}
+
+/**
+ * Sends an fep_reply for every line in the FEP.
+ */
+void FEPSim::updateATMS(char * xml) {
+    if(createClient(this->ATMSHost))
+    {
+        sendReplys(xml);
     }
 }
@@ -121 +118 @@
  * @param host rpc server ip
  */
-void FEPSim::createClient(char * host) {
+bool FEPSim::createClient(char * host) {
     /* Create RPC Client to communicate with ATMS */
+    bool success = true;
     cout << "Creating RPC Client" << endl;
     clnt = clnt_create(host, /*100090,*/ 103121, 32, "tcp");
-    cout << "Client created" << endl;
     /* Check if client creation failed */
     if (clnt == (CLIENT *) NULL) {
         cerr << "Can't create client to " << host << endl;
-        exit(1);
-    }
+        success = false;
+    }
+    else {
+        cout << "Client created" << endl;
+    }
+    return success;
 }
 
@@ -140 +141 @@
  */
 int main(int argc, char *argv[]) {
-
+    if(argc != 3)
+    {
+        cerr << "Usage: FEPSim <ATMS_Host> <FEP_ATMSDriver_PortNo" << endl;
+        exit(1);
+    }
+    char *FEPSimHost = argv[1];    
+    FEPSim fep = FEPSim(FEPSimHost);
+    
     int sockfd, newsockfd, portno, clilen;
     char buffer[BUFF_SIZE];
     struct sockaddr_in serv_addr, cli_addr;
     int n;
-    
-    char *FEPSimHost = argv[1];
     portno = atoi(argv[2]);
 
@@ -177 +183 @@
     clilen = sizeof (cli_addr);
 
-    /* Accept actual connection from the client */
+    /* Accept actual connections from the client */
     while(1) {
         newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, (socklen_t *)&clilen);
@@ -187 +193 @@
 
         /* If connection is established then start communicating */
+        // zero out buffer
         bzero(buffer, BUFF_SIZE);
         
-        // NEEDS OUTER LOOP TO GET WHOLE MESSAGE FROM TCP CONN
-        n = read(newsockfd, buffer, sizeof(buffer));
-
+        // read XML from socket
+        int totBytes = 0;
+        while ((n = recv(newsockfd, &buffer[totBytes], sizeof(buffer), 0)) > 0) {
+            totBytes += n;
+        }
+        
         if (n < 0) {
             perror("ERROR reading from socket");
@@ -197 +207 @@
         }
         
-        /* Create RPC Client to send an fep_reply to ATMS */
-
-        FEPSim *client = new FEPSim(FEPSimHost, buffer);
-        delete client;
+        // send data to atms
+        fep.updateATMS(buffer);
     }
 

branches/FEPSimulator/FEPSim.h

@@ -40 +40 @@
 const int BUFF_SIZE = 1000000;
 
-class FEPSim
-{
-        public:
-        /* members */
-                CLIENT *clnt; // RPC Client
+class FEPSim {
+public:
+    /* members */
+    CLIENT *clnt; // RPC Client
 
-        /* methods */
-                FEPSim(char * host, char * networkFile); // Constructor
-                ~FEPSim(); // Destructor
+    /* methods */
+    FEPSim(char * ATMSHost); // Constructor
+    
+    void updateATMS(char * xml); // updates ATMS
 
-        private:
-        /* members */
-        NetworkReader *networkReader;
-        char * ATMSHost;
-        
-        /* methods */
-        void handleCallResponse(void *response); //
-        void createClient(char *host);
-        void updateATMS(); // updates ATMS
+    ~FEPSim(); // Destructor
+
+private:
+    /* members */
+    char * ATMSHost;
+
+    /* methods */
+    void handleCallResponse(void *response); //
+    bool createClient(char *host);
+    void sendReplys(char * xml);
 
 };

branches/FEPSimulator/NetworkReader.cpp

@@ -15 +15 @@
         TiXmlElement *subLoopElem = loopElem->FirstChildElement();
         loop->loopID = atoi(subLoopElem->GetText());
-        cout << "LOOPID: " << subLoopElem->GetText() << endl;
         subLoopElem = subLoopElem->NextSiblingElement();
         loop->loop_loc = (char *) subLoopElem->GetText();
@@ -40 +39 @@
     TiXmlElement *stationSubElem = stationElem->FirstChildElement();
     station->lds = atol(stationSubElem->GetText());
+    cout << "Station: " << station->lds << endl;
     line->lds.push_back(station->lds);
     line->ldsIndex.push_back(ldsIndex++);
@@ -63 +63 @@
         station->loops.push_back(loop);
     }
-
+    cout << "Number of Loops: " << station->loops.size() << endl;
     // Data pack ATMS message
     station->length = station->loops.size() * 2 + CONTROL_DATA_LEN;

branches/trunk/IDE_metadata/NetBeans/TMCSim/build/built-jar.properties

@@ -1 @@
-#Fri, 06 Oct 2017 19:49:49 -0700
+#Sat, 07 Oct 2017 00:43:14 -0700
 
 

branches/trunk/IDE_metadata/NetBeans/TMCSim/build/classes/tmcsim/application.properties

@@ -1 @@
-#Fri, 06 Oct 2017 19:49:49 -0700
+#Sat, 07 Oct 2017 00:43:14 -0700
 
-Application.revision=0
+Application.revision=83
 
-Application.buildnumber=50
+Application.buildnumber=58

branches/trunk/src/atmsdriver/ATMSDriver.java

@@ -53 +53 @@
     
     /** Sleep Time (10 seconds). **/
-    private static final int SLEEP_TIME = 10000;
+    private static final int SLEEP_TIME = 30000;
     
     /** Exchange Reader */

branches/trunk/src/atmsdriver/NetworkLoader.java

@@ -143 +143 @@
     private void constructFEPLines()
     {
-        try {
-            System.out.println("Building network...");
-            
+        try {            
             // Get FEPLine IDs
             ArrayList<Integer> lineNums = getLineNums(new Scanner(LDSFile));

branches/trunk/src/atmsdriver/model/HighwayStatusWriter.java

@@ -31 +31 @@
         Socket sock = new Socket(host, port);
         PrintWriter out = new PrintWriter(sock.getOutputStream(), true);
-        out.print(xml);
+        out.println(xml);
         sock.close();
     }

branches/trunk/src/tmcsim/application.properties

@@ -1 @@
-#Fri, 06 Oct 2017 19:49:49 -0700
+#Sat, 07 Oct 2017 00:43:14 -0700
 
-Application.revision=0
+Application.revision=83
 
-Application.buildnumber=50
+Application.buildnumber=58

trunk/config/atms_driver_config.properties

@@ -3 +3 @@
 NetworkFileName = networkFile.txt
 ExchangeFileName = exchange.xml
+FEPWriterHost = localhost
+FEPWriterPort = 8080

trunk/src/atmsdriver/NetworkLoader.java

@@ -2 +2 @@
 
 import atmsdriver.model.FEPLine;
-import atmsdriver.model.LoopDetectorStation;
+import atmsdriver.model.Station;
 import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetectorStation.DIRECTION;
+import atmsdriver.model.Station.DIRECTION;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -17 +17 @@
  * 
  *  The public method getFEPLines() method can be used to get all the FEPLines 
- *  within a network. All other methods are private and are used to construct
- *  the FEPLines.
- * 
- *  The "LDSFile" contains LoopDetectorStation and FEPLine information.
- *  ex.
- *   < Insert file here >
+  within a network. All other methods are private and are used to construct
+  the FEPLines.
+ 
+  The "LDSFile" contains Station and FEPLine information.
+  ex.
+   < Insert file here >
  *  The "loopFile" contains individual LoopDetector information.
  *  ex.
@@ -157 +157 @@
                 
                 // Create each Station for the current FEPLine
-                ArrayList<LoopDetectorStation> stns = new ArrayList<>();
+                ArrayList<Station> stns = new ArrayList<>();
                 for(Integer stnNum : stnNums)
                 {
@@ -165 +165 @@
                     
                     // Create the Station and add to list for curr FEPLine
-                    LoopDetectorStation stn =
+                    Station stn =
                             createStation(stnNum, new Scanner(LDSFile), loops);
                     stns.add(stn);
@@ -181 +181 @@
     
     // Creates  line
-    private FEPLine createLine(int lineNum, Scanner scLine, ArrayList<LoopDetectorStation> stns)
+    private FEPLine createLine(int lineNum, Scanner scLine, ArrayList<Station> stns)
     {
         FEPLine line = null;
@@ -239 +239 @@
     
     // creates a Station
-    private LoopDetectorStation createStation(int stnNum, Scanner sc, ArrayList<LoopDetector> detectors)
-    {
-        LoopDetectorStation LDS = null;
+    private Station createStation(int stnNum, Scanner sc, ArrayList<LoopDetector> detectors)
+    {
+        Station LDS = null;
         
         sc.nextLine();
@@ -264 +264 @@
                 double postmile = scLine.nextDouble();
                 String ldsName = getLocation(strLine); /************* DOESNT GRAB WHOLE???? */////
-                LDS = new LoopDetectorStation(lineNum, ldsID, drop, ldsName, detectors, fwy, dir, postmile);
+                LDS = new Station(lineNum, ldsID, drop, ldsName, detectors, fwy, dir, postmile);
                 
                 break;

trunk/src/atmsdriver/model/FEPLine.java

@@ -19 +19 @@
     /* Static FEPLine meta data */
     final private int lineNum;
-    final private List<LoopDetectorStation> stations;
+    final private List<Station> stations;
     final private int count;
     // NOT SURE IF NEXT IS FINAL
@@ -28 +28 @@
     final private long scheduleSeq;
     
-    public FEPLine(int lineNum, List<LoopDetectorStation> stations, int count,
+    public FEPLine(int lineNum, List<Station> stations, int count,
             int schedule, int lineInfo, long systemKey, long globalSeq,
             long scheduleSeq)
@@ -79 +79 @@
         Element stationsElement = theDoc.createElement(XML_TAGS.STATIONS.tag);
         lineElement.appendChild(stationsElement);
-        for(LoopDetectorStation station : stations)
+        for(Station station : stations)
         {
             station.toXML(stationsElement);

trunk/src/atmsdriver/model/Station.java

@@ -5 +5 @@
 import org.w3c.dom.Element;
 
-/** A LoopDetectorStation is a simulation of a station in a traffic network.
+/** A Station is a simulation of a station in a traffic network.
  *  
- *  A LoopDetectorStation (LDS) contains static meta data about the station, and
- *  two dynamic attributes, MLTotVol and OppTotVol. 
- * 
- *  A single LDS contains multiple LoopDetectors, which
- *  contain data for a single lane on one direction of the freeway. A LDS
- *  is specific to a single freeway, direction, and postmile.
+ *  A Station (LDS) contains static meta data about the station, and
+  two dynamic attributes, MLTotVol and OppTotVol. 
+ 
+  A single LDS contains multiple LoopDetectors, which
+  contain data for a single lane on one direction of the freeway. A LDS
+  is specific to a single freeway, direction, and postmile.
  *
  * @author John A. Torres
  * @version 9/10/2017
  */
-public class LoopDetectorStation {
-    /* Static LoopDetectorStation meta data */
+public class Station implements Comparable {
+    /* Static Station meta data */
     final private int lineNum;
     final private int ldsID; // double check
@@ -28 +28 @@
     final private DIRECTION direction;
     
-    /* Dynamic LoopDetectorStation data */
+    /* Dynamic Station data */
     private int MLTotVol;
     private int OppTotVol;
     
     /* Constructor */
-    public LoopDetectorStation(int lineNum, int ldsID, int drop,
+    public Station(int lineNum, int ldsID, int drop,
             String location, List<LoopDetector> loops, int fwy, 
             DIRECTION direction, double postmile)
@@ -48 +48 @@
         this.MLTotVol = 0;
         this.OppTotVol = 0;
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        
     }