Commit 7a42d1a1 authored by Erik Andresen's avatar Erik Andresen

remove bug

parent 5009eb6e
......@@ -6,7 +6,7 @@
<room id="0" caption="hall_offenbach">
<subroom id="0" class="subroom">
<subroom id="0" caption="hall" class="subroom">
<polygon caption="wall">
<vertex px="0" py="1"/>
......@@ -33,7 +33,7 @@
</subroom>
<subroom id="1" class="floor">
<subroom id="1" caption="Corridor" class="floor">
<polygon caption="wall">
<vertex px="0" py="-10"/>
......@@ -114,7 +114,7 @@
</subroom>
<subroom id="2" class="subroom">
<subroom id="2" caption="wardrobe" class="subroom">
<polygon caption="wall">
<vertex px="0" py="30"/>
......
This diff is collapsed.
......@@ -86,10 +86,18 @@ int CognitiveMapRouter::FindExit(Pedestrian * p)
}
//std::cout << p->GetGlobalTime() << std::endl;
if (std::fmod(p->GetGlobalTime(),30)==0.0)
{
sensor_manager->execute(p, SensorManager::PERIODIC);
int status = FindDestination(p);
//(*cm_storage)[p]->UpdateSubRoom();
return status;
}
return 1;
}
......
......@@ -56,7 +56,7 @@ void FireMeshStorage::CreateFireMeshes()
for (auto &i:_timelist)
{
std::string suffix = "Door_X_" + std::to_string(door.GetCentre().GetX())
+ "_Y_" + std::to_string(door.GetCentre().GetY()) + "\\t_"+std::to_string(i)+".csv";
+ "_Y_" + std::to_string(door.GetCentre().GetY()) + "/t_"+std::to_string(i)+".csv";
FireMesh mesh(_filepath+suffix);
std::string str = "Door_X_"+ std::to_string(door.GetCentre().GetX())
+ "_Y_" + std::to_string(door.GetCentre().GetY()) + "_t_"+std::to_string(i);
......
......@@ -46,7 +46,7 @@ void SmokeSensor::execute(const Pedestrian * pedestrian, CognitiveMap * cognitiv
double smokeFactor = _FMStorage->get_FireMesh(item->GetCrossing()->GetCentre(),
pedestrian->GetGlobalTime()).GetKnotValue(pedestrian->GetPos().GetX(),
pedestrian->GetPos().GetY());
std::cout << smokeFactor << std::endl;
//std::cout << smokeFactor << std::endl;
item->SetFactor(smokeFactor,GetName());
//std::cout << item->GetFactor() << std::endl;
}
......
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