Merge branch 'development' into issue-516-rename-summationMap

Author: d-kamath

Simulator/Connections/NG911/Connections911.cpp

@@ -3,14 +3,12 @@
 *
 * @ingroup Simulator/Connections/NG911
 * 
-* @brief The model of the static network
-*
+* @brief This class manages the Connections of the NG911 network
 */
 
 #include "Connections911.h"
-#include "All911Vertices.h"
+#include "All911Edges.h"
 #include "GraphManager.h"
-#include "Layout911.h"
 #include "ParameterManager.h"
 
 void Connections911::setup()
@@ -64,9 +62,6 @@ void Connections911::printParameters() const
 
 #if !defined(USE_GPU)
 ///  Update the connections status in every epoch.
-///
-///  @param  vertices  The Vertex list to search from.
-///  @return true if successful, false otherwise.
 bool Connections911::updateConnections(AllVertices &vertices)
 {
    // Only run on the first epoch
@@ -92,11 +87,55 @@ bool Connections911::updateConnections(AllVertices &vertices)
    return true;
 }
 
+
+/// Finds the outgoing edge from the given vertex to the Responder closest to
+/// the emergency call location
+BGSIZE Connections911::getEdgeToClosestResponder(const Call &call, BGSIZE vertexIdx)
+{
+   All911Edges &edges911 = dynamic_cast<All911Edges &>(*edges_);
+
+   vertexType requiredType;
+   if (call.type == "Law")
+      requiredType = LAW;
+   else if (call.type == "EMS")
+      requiredType = EMS;
+   else if (call.type == "Fire")
+      requiredType = FIRE;
+
+   // loop over the outgoing edges looking for the responder with the shortest
+   // Euclidean distance to the call's location.
+   BGSIZE startOutEdg = synapseIndexMap_->outgoingEdgeBegin_[vertexIdx];
+   BGSIZE outEdgCount = synapseIndexMap_->outgoingEdgeCount_[vertexIdx];
+   Layout &layout = Simulator::getInstance().getModel().getLayout();
+
+   BGSIZE resp, respEdge;
+   double minDistance = numeric_limits<double>::max();
+   for (BGSIZE eIdxMap = startOutEdg; eIdxMap < startOutEdg + outEdgCount; ++eIdxMap) {
+      BGSIZE outEdg = synapseIndexMap_->outgoingEdgeIndexMap_[eIdxMap];
+      assert(edges911.inUse_[outEdg]);   // Edge must be in use
+
+      BGSIZE dstVertex = edges911.destVertexIndex_[outEdg];
+      if (layout.vertexTypeMap_[dstVertex] == requiredType) {
+         double xDelta = call.x - layout.xloc_[dstVertex];
+         double yDelta = call.y - layout.yloc_[dstVertex];
+         double distance = sqrt(pow(xDelta, 2) + pow(yDelta, 2));
+
+         if (distance < minDistance) {
+            minDistance = distance;
+            resp = dstVertex;
+            respEdge = outEdg;
+         }
+      }
+   }
+
+   // We must have found the closest responder of the right type
+   assert(minDistance < numeric_limits<double>::max());
+   assert(layout.vertexTypeMap_[resp] == requiredType);
+   return respEdge;
+}
+
+
 ///  Randomly delete 1 PSAP and rewire all the edges around it.
-///
-///  @param  vertices  The Vertex list to search from.
-///  @param  layout   Layout information of the vertex network.
-///  @return true if successful, false otherwise.
 bool Connections911::erasePSAP(AllVertices &vertices, Layout &layout)
 {
    int numVertices = Simulator::getInstance().getTotalVertices();
@@ -155,7 +194,8 @@ bool Connections911::erasePSAP(AllVertices &vertices, Layout &layout)
          }
 
          // Identify all psap-less responders
-         if (layout.vertexTypeMap_[destVertex] == RESP) {
+         if (layout.vertexTypeMap_[destVertex] == LAW || layout.vertexTypeMap_[destVertex] == FIRE
+             || layout.vertexTypeMap_[destVertex] == EMS) {
             respsToReroute.push_back(destVertex);
          }
       }
@@ -232,10 +272,6 @@ bool Connections911::erasePSAP(AllVertices &vertices, Layout &layout)
 }
 
 ///  Randomly delete 1 RESP.
-///
-///  @param  vertices  The Vertex list to search from.
-///  @param  layout   Layout information of the vertex network.
-///  @return true if successful, false otherwise.
 bool Connections911::eraseRESP(AllVertices &vertices, Layout &layout)
 {
    int numVertices = Simulator::getInstance().getTotalVertices();
@@ -245,7 +281,8 @@ bool Connections911::eraseRESP(AllVertices &vertices, Layout &layout)
 
    // Find all resps
    for (int i = 0; i < numVertices; i++) {
-      if (layout.vertexTypeMap_[i] == RESP) {
+      if (layout.vertexTypeMap_[i] == LAW || layout.vertexTypeMap_[i] == FIRE
+          || layout.vertexTypeMap_[i] == EMS) {
          resps.push_back(i);
       }
    }
@@ -294,7 +331,8 @@ bool Connections911::eraseRESP(AllVertices &vertices, Layout &layout)
    return changesMade;
 }
 
-///  @return xml representation of a single edge
+
+///  Returns an xml representation of a single edge
 string Connections911::ChangedEdge::toString()
 {
    stringstream os;
@@ -331,8 +369,6 @@ string Connections911::ChangedEdge::toString()
 }
 
 ///  Returns the complete list of all deleted or added edges as a string.
-///  @param added    true returns the list of added edges, false = erased
-///  @return xml representation of all deleted or added edges
 string Connections911::changedEdgesToXML(bool added)
 {
    stringstream os;
@@ -357,7 +393,6 @@ string Connections911::changedEdgesToXML(bool added)
 }
 
 ///  Returns the complete list of deleted vertices as a string.
-///  @return xml representation of all deleted vertices
 string Connections911::erasedVerticesToXML()
 {
    stringstream os;

Simulator/Connections/NG911/Connections911.h

@@ -3,15 +3,18 @@
  *
  * @ingroup Simulator/Connections/NG911
  * 
- * @brief The model of the static network
- *
+ * @brief This class manages the Connections of the NG911 network
+ * 
+ * Connections in the NG911 models, represent communication links between the
+ * various network nodes. These are potentially dynamic connections, where
+ * edges between nodes are erased and added, representing loss of communication
+ * between nodes and re-routing of disconnected nodes.
  */
 
 #pragma once
 
 #include "Connections.h"
-#include "Global.h"
-#include "Simulator.h"
+#include "InputEvent.h"
 #include <vector>
 
 using namespace std;
@@ -73,6 +76,14 @@ class Connections911 : public Connections {
    ///  @return true if successful, false otherwise.
    virtual bool updateConnections(AllVertices &vertices) override;
 
+   /// Finds the outgoing edge from the given vertex to the Responder closest to
+   /// the emergency call location
+   ///
+   /// @param call         The call that needs a Responder
+   /// @param vertexIdx    The index of the vertex serving the call (A PSAP)
+   /// @return    The index of the outgoing edge to the closest Responder
+   BGSIZE getEdgeToClosestResponder(const Call &call, BGSIZE vertexIdx);
+
    ///  Returns the complete list of all deleted or added edges as a string.
    ///  @return xml representation of all deleted or added edges
    string changedEdgesToXML(bool added);

Simulator/Core/Model.cpp

@@ -14,7 +14,6 @@
  */
 
 #include "Model.h"
-#include "ConnGrowth.h"
 #include "Connections.h"
 #include "Factory.h"
 #include "ParameterManager.h"
@@ -106,55 +105,17 @@ void Model::setupSim()
    connections_->createEdgeIndexMap();
 }
 
+// Note: This method was previously used for debugging, but it is now dead code left behind.
 /// Log this simulation step.
-void Model::logSimStep() const
-{
-   ConnGrowth *pConnGrowth = dynamic_cast<ConnGrowth *>(connections_.get());
-   if (pConnGrowth == nullptr)
-      return;
-
-   cout << "format:\ntype,radius,firing rate" << endl;
-
-   for (int y = 0; y < Simulator::getInstance().getHeight(); y++) {
-      stringstream ss;
-      ss << fixed;
-      ss.precision(1);
-
-      for (int x = 0; x < Simulator::getInstance().getWidth(); x++) {
-         switch (layout_->vertexTypeMap_[x + y * Simulator::getInstance().getWidth()]) {
-            case EXC:
-               if (layout_->starterMap_[x + y * Simulator::getInstance().getWidth()])
-                  ss << "s";
-               else
-                  ss << "e";
-               break;
-            case INH:
-               ss << "i";
-               break;
-            case VTYPE_UNDEF:
-               assert(false);
-               break;
-         }
-
-         ss << " " << pConnGrowth->radii_[x + y * Simulator::getInstance().getWidth()];
-
-         if (x + 1 < Simulator::getInstance().getWidth()) {
-            ss.width(2);
-            ss << "|";
-            ss.width(2);
-         }
-      }
-
-      ss << endl;
-
-      for (int i = ss.str().length() - 1; i >= 0; i--) {
-         ss << "_";
-      }
-
-      ss << endl;
-      cout << ss.str();
-   }
-}
+// void Model::logSimStep() const
+// {
+//    FixedLayout *fixedLayout = dynamic_cast<FixedLayout *>(layout_.get());
+//    if (fixedLayout == nullptr) {
+//       return;
+//    }
+
+//    fixedLayout->printLayout();
+// }
 
 /// Update the simulation history of every epoch.
 void Model::updateHistory()

Simulator/Core/Model.h

@@ -80,8 +80,9 @@ class Model {
    virtual void updateConnections() = 0;
 
 protected:
+   // Note: This method was previously used for debugging, but it is now dead code left behind.
    /// Prints debug information about the current state of the network.
-   void logSimStep() const;
+   // void logSimStep() const;
 
    /// Copy GPU Edge data to CPU.
    virtual void copyGPUtoCPU() = 0;

Simulator/Core/Simulator.cpp

@@ -76,10 +76,6 @@ void Simulator::finish()
 /// Load member variables from configuration file
 void Simulator::loadParameters()
 {
-   ParameterManager::getInstance().getIntByXpath("//PoolSize/x/text()", width_);
-   ParameterManager::getInstance().getIntByXpath("//PoolSize/y/text()", height_);
-   // numVertices_ = width_ * height_;
-
    ParameterManager::getInstance().getBGFloatByXpath("//SimParams/epochDuration/text()",
                                                      epochDuration_);
    ParameterManager::getInstance().getIntByXpath("//SimParams/numEpochs/text()", numEpochs_);
@@ -110,7 +106,6 @@ void Simulator::printParameters() const
    LOG4CPLUS_DEBUG(fileLogger_,
                    "\nSIMULATION PARAMETERS"
                       << endl
-                      << "\tpool size x:" << width_ << " y:" << height_ << endl
                       << "\tTime between growth updates (in seconds): " << epochDuration_ << endl
                       << "\tNumber of epochs to run: " << numEpochs_ << endl
                       << "\tMax firing rate: " << maxFiringRate_ << endl
@@ -284,16 +279,6 @@ void Simulator::setStimulusFileName(const string &fileName)
  *  Accessors
  ***********************************************/
 ///@{
-int Simulator::getWidth() const
-{
-   return width_;
-}
-
-int Simulator::getHeight() const
-{
-   return height_;
-}
-
 int Simulator::getTotalVertices() const
 {
    return model_->getLayout().getNumVertices();

Simulator/Core/Simulator.h

@@ -61,10 +61,6 @@ class Simulator {
    *  Accessors
    ***********************************************/
    ///@{
-   int getWidth() const;   /// Width of neuron map (assumes square)
-
-   int getHeight() const;   /// Height of neuron map
-
    int getTotalVertices() const;   /// Count of neurons in the simulation
 
    int getCurrentStep() const;   /// Current simulation step
@@ -130,10 +126,6 @@ class Simulator {
    Simulator();   /// Constructor is private to keep a singleton instance of this
                   /// class.
 
-   int width_;   /// Width of neuron map (assumes square)
-
-   int height_;   /// Height of neuron map
-
    int totalNeurons_;   /// Count of neurons in the simulation
 
    int currentEpoch_;   /// Current epoch step

Simulator/Edges/NG911/All911Edges.cpp

@@ -3,7 +3,7 @@
  *
  *  @ingroup Simulator/Edges/NG911
  *
- *  @brief A container of all 911 edge data
+ *  @brief Specialization of the AllEdges class for the NG911 network
  */
 
 #include "All911Edges.h"
@@ -44,9 +44,6 @@ void All911Edges::createEdge(const BGSIZE iEdg, int srcVertex, int destVertex, c
 #if !defined(USE_GPU)
 
 ///  Advance all the edges in the simulation.
-///
-///  @param  vertices           The vertex list to search from.
-///  @param  edgeIndexMap   Pointer to EdgeIndexMap structure.
 void All911Edges::advanceEdges(AllVertices &vertices, EdgeIndexMap &edgeIndexMap)
 {
    Simulator &simulator = Simulator::getInstance();
@@ -72,22 +69,25 @@ void All911Edges::advanceEdges(AllVertices &vertices, EdgeIndexMap &edgeIndexMap
          }   // Edge doesn't have a call
 
          int dst = destVertexIndex_[edgeIdx];
-
          // The destination vertex should be the one pulling the information
          assert(dst == vertex);
-         if (all911Vertices.vertexQueues_[dst].isFull()) {
+
+         CircularBuffer<Call> &dstQueue = all911Vertices.vertexQueues_[dst];
+         if (dstQueue.size() == dstQueue.capacity() - all911Vertices.busyServers_[dst]) {
             // Call is dropped because there is no space in the waiting queue
             if (!isRedial_[edgeIdx]) {
                // Only count the dropped call if it's not a redial
                all911Vertices.droppedCalls_[dst]++;
                // Record that we received a call
                all911Vertices.receivedCalls_[dst]++;
-               LOG4CPLUS_DEBUG(edgeLogger_, "Call dropped: " << all911Vertices.droppedCalls_[dst]
-                                                             << ", time: " << call_[edgeIdx].time
-                                                             << ", eIdx: " << edgeIdx);
+               LOG4CPLUS_DEBUG(edgeLogger_,
+                               "Call dropped: " << all911Vertices.droppedCalls_[dst] << ", time: "
+                                                << call_[edgeIdx].time << ", vertex: " << dst
+                                                << ", queue size: " << dstQueue.size());
             }
          } else {
-            all911Vertices.vertexQueues_[dst].put(call_[edgeIdx]);
+            // Transfer call to destination
+            dstQueue.put(call_[edgeIdx]);
             // Record that we received a call
             all911Vertices.receivedCalls_[dst]++;
             isAvailable_[edgeIdx] = true;