random number generator in the global router actualized

inputfiles/ship_msw/ini_ship2.xml

@@ -70,8 +70,8 @@
 			<group group_id="5" room_id="0" subroom_id="0" number="0" goal_id="" router_id="1" route_id=""  motivation=""/>
 			<group group_id="0" room_id="0" subroom_id="0" number="0" goal_id="" router_id="1" route_id="" />
 			<group group_id="1" room_id="0" subroom_id="1" number="0" goal_id="" router_id="2" route_id="" patience="5"/>
-			<group group_id="2" room_id="0" number="700" goal_id="-1" router_id="2" patience="40"/>
-			<group group_id="3" room_id="1" subroom_id="1" number="10" goal_id="-1" router_id="2" patience="20"/>
+			<group group_id="2" room_id="0" number="500" goal_id="-1" router_id="2" patience="40"/>
+			<group group_id="3" room_id="1" subroom_id="1" number="0" goal_id="-1" router_id="2" patience="20"/>
 		</agents_distribution>
 	</agents>
 

routing/GlobalRouter.cpp

@@ -48,11 +48,14 @@ using namespace std;
 GlobalRouter::GlobalRouter() :
 						                Router() {
     _accessPoints = map<int, AccessPoint*>();
-	_map_id_to_index = std::map<int, int>();
-	_map_index_to_id = std::map<int, int>();
+    _map_id_to_index = map<int, int>();
+    _map_index_to_id = map<int, int>();
     _distMatrix = NULL;
     _pathsMatrix = NULL;
     _building = NULL;
+    _rdDistribution = uniform_real_distribution<double> (0,1);
+    _rdGenerator = default_random_engine(56);
+
 
 }
 
@@ -626,6 +629,12 @@ int GlobalRouter::FindExit(Pedestrian* ped) {
 }
 
 int GlobalRouter::GetBestDefaultRandomExit(Pedestrian* ped) {
+
+    // prob parameters
+    //double alpha=0.2000005;
+    //double normFactor=0.0;
+    //map <int, double> doorProb;
+
     // get the opened exits
     SubRoom* sub = _building->GetRoom(ped->GetRoomID())->GetSubRoom(
             ped->GetSubRoomID());
@@ -642,6 +651,9 @@ int GlobalRouter::GetBestDefaultRandomExit(Pedestrian* ped) {
 
     //for (unsigned int i = 0; i < accessPointsInSubRoom.size(); i++) {
     //	int apID = accessPointsInSubRoom[i];
+
+
+
     for(unsigned int g=0;g<relevantAPs.size();g++){
         AccessPoint* ap=relevantAPs[g];
         //int exitid=ap->GetID();
@@ -669,9 +681,12 @@ int GlobalRouter::GetBestDefaultRandomExit(Pedestrian* ped) {
             continue;
         }
 
+
         double dist = ap->GetDistanceTo(ped->GetFinalDestination())
 										        + ap->DistanceTo(posA.GetX(), posA.GetY());
 
+//        doorProb[ap->GetID()]= exp(-alpha*dist);
+//        normFactor += doorProb[ap->GetID()];
 
         if (dist < minDist) {
             bestAPsID = ap->GetID();
@@ -679,6 +694,23 @@ int GlobalRouter::GetBestDefaultRandomExit(Pedestrian* ped) {
         }
     }
 
+    // normalize the probs
+//    double randomVar = _rdDistribution(_rdGenerator);
+//
+//    for (auto it = doorProb.begin(); it!=doorProb.end(); ++it){
+//        it->second =  it->second / normFactor;
+//    }
+//
+//    double cumProb= doorProb.begin()->second;
+//    auto it = doorProb.begin();
+//    while(cumProb<randomVar) {
+//        it++;
+//        cumProb+=it->second;
+//    }
+//    bestAPsID=it->first;
+
+    //exit(0);
+
     if (bestAPsID != -1) {
         ped->SetExitIndex(bestAPsID);
         ped->SetExitLine(_accessPoints[bestAPsID]->GetNavLine());

routing/GlobalRouter.h

@@ -184,6 +184,9 @@ private:
 	///map the internal crossings/transition id to
 	///the global ID (description) for that final destination
 	std::map<int, int> _mapIdToFinalDestination;
+    // normalize the probs
+    std::default_random_engine _rdGenerator;
+    std::uniform_real_distribution<double> _rdDistribution;
 
 protected:
 	std::map <int, AccessPoint*> _accessPoints;