Commit 7aa3c924 authored by Ulrich Kemloh's avatar Ulrich Kemloh

added more todos

parent 52e87d23
......@@ -368,7 +368,7 @@ endif(CGAL_FOUND)
#protocol buffer
#find_package(Protobuf)
#if(PROTOBUF_FOUND)
#if(PROTOBUF_FOUND && GRPC)
# message(STATUS "Protocol buffer library found")
#
# include_directories(${PROTOBUF_INCLUDE_DIRS})
......
......@@ -529,7 +529,7 @@ int Simulation::RunBody(double maxSimTime)
if (0 == frameNr % writeInterval) {
_iod->WriteFrame(frameNr / writeInterval, _building.get());
}
Log->ProgressBar(initialnPeds, initialnPeds - _nPeds , t);
//Log->ProgressBar(initialnPeds, initialnPeds - _nPeds , t);
// needed to control the execution time PART 2
// time(&endtime);
......
......@@ -147,6 +147,7 @@
<atau mu="0.5" sigma="0.001" />
</agent_parameters>
</model>
<model operational_model_id="3" description="Tordeux2015">
<model_parameters>
<solver>euler</solver>
......@@ -165,7 +166,18 @@
<atau mu="0.0" sigma="0.00000" />
<T mu="1" sigma="0.001" />
</agent_parameters>
<agent_parameters agent_parameter_id="2">
<v0 mu="2.0" sigma="0.001" />
<bmax mu="0.15" sigma="0.00000" /> <!-- this is l, assuming peds are circles with constant radius -->
<bmin mu="0.15" sigma="0.00000" />
<amin mu="0.15" sigma="0.00000" />
<tau mu="0.5" sigma="0.001" />
<atau mu="0.0" sigma="0.00000" />
<T mu="1" sigma="0.001" />
</agent_parameters>
</model>
</operational_models>
<route_choice_models>
......
......@@ -178,6 +178,7 @@ double AccessPoint::DistanceTo(double x, double y)
{
return sqrt((x-_center[0])*(x-_center[0]) + (y-_center[1])*(y-_center[1]));
//return _navLine->DistTo(Point(x,y));
}
......
......@@ -106,6 +106,8 @@ bool GlobalRouter::Init(Building* building)
_building = building;
//only load the information if not previously loaded
//if(_building->GetNumberOfGoals()==0)
//TODO: implement the ParseAdditionalParameter Interface
LoadRoutingInfos(GetRoutingInfoFile());
if(_generateNavigationMesh)
......@@ -854,7 +856,7 @@ int GlobalRouter::GetBestDefaultRandomExit(Pedestrian* ped)
// if two doors are feasible to the final destination without much differences
// in the distances, then the nearest is preferred.
//value defined in the quickest path
//0.15 value defined in the quickest path
if(( (dist-minDistGlobal) / (dist+minDistGlobal)) < 0.15)
{
if (dist2 < minDistLocal) {
......
......@@ -715,6 +715,7 @@ int QuickestPathRouter::GetBestDefaultRandomExit(Pedestrian* ped)
//double normFactor=0.0;
//map <int, double> doorProb;
// get the relevant opened exits
vector <AccessPoint*> relevantAPs;
GetRelevantRoutesTofinalDestination(ped,relevantAPs);
......@@ -735,6 +736,7 @@ int QuickestPathRouter::GetBestDefaultRandomExit(Pedestrian* ped)
SubRoom* sub = _building->GetRoom(ped->GetRoomID())->GetSubRoom(
ped->GetSubRoomID());
for(unsigned int g=0; g<relevantAPs.size(); g++)
{
AccessPoint* ap=relevantAPs[g];
......@@ -766,6 +768,10 @@ int QuickestPathRouter::GetBestDefaultRandomExit(Pedestrian* ped)
double dist1 = ap->GetDistanceTo(ped->GetFinalDestination());
double dist2 = ap->DistanceTo(posA.GetX(), posA.GetY());
double dist=dist1+dist2;
//printf("distance to door %d is %f\n",ap->GetID(),dist);
//getc(stdin);
// doorProb[ap->GetID()]= exp(-alpha*dist);
// normFactor += doorProb[ap->GetID()];
......
......@@ -103,7 +103,7 @@ public:
/**
* The strategy is automatically set based on the description in the
* person file.
* ini file.
*/
void SetStrategy(const RoutingStrategy& strategy);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment