Commit bad871d3 authored by Mohcine Chraibi's avatar Mohcine Chraibi

Change tau in other tests

 1. and silence some warnings
parent 91ea845b
......@@ -67,7 +67,7 @@
<bmax mu="0.25" sigma="0.001" />
<bmin mu="0.20" sigma="0.001" />
<amin mu="0.18" sigma="0.001" />
<tau mu="0.01" sigma="0.001" />
<tau mu="0.5" sigma="0.001" />
<atau mu="0.5" sigma="0.001" />
</agent_parameters>
</model>
......@@ -86,7 +86,7 @@
<bmax mu="0.25" sigma="0.001" />
<bmin mu="0.40" sigma="0.001" />
<amin mu="0.18" sigma="0.001" />
<tau mu="0.01" sigma="0.001" />
<tau mu="0.5" sigma="0.001" />
<atau mu="0.2" sigma="0.001" />
</agent_parameters>
</model>
......
......@@ -69,7 +69,7 @@
<bmax mu="0.25" sigma="0.001" />
<bmin mu="0.20" sigma="0.001" />
<amin mu="0.18" sigma="0.001" />
<tau mu="0.01" sigma="0.001" />
<tau mu="0.5" sigma="0.001" />
<atau mu="0.5" sigma="0.001" />
</agent_parameters>
</model>
......@@ -88,7 +88,7 @@
<bmax mu="0.25" sigma="0.001" />
<bmin mu="0.40" sigma="0.001" />
<amin mu="0.18" sigma="0.001" />
<tau mu="0.01" sigma="0.001" />
<tau mu="0.5" sigma="0.001" />
<atau mu="0.2" sigma="0.001" />
</agent_parameters>
</model>
......
......@@ -276,9 +276,11 @@ void Building::AddSurroundingRoom()
bool Building::InitGeometry()
{
int r;
unsigned int i;
Log->Write("INFO: \tInit Geometry");
for (int i = 0; i < GetNumberOfRooms(); i++) {
Room* room = GetRoom(i);
for (r = 0; r < GetNumberOfRooms(); r++) {
Room* room = GetRoom(r);
// Polygone berechnen
for (int j = 0; j < room->GetNumberOfSubRooms(); j++) {
SubRoom* s = room->GetSubRoom(j);
......@@ -288,13 +290,13 @@ bool Building::InitGeometry()
// crossings
const vector<Crossing*>& crossings = s->GetAllCrossings();
for (unsigned int i = 0; i < crossings.size(); i++) {
for (i = 0; i < crossings.size(); i++) {
goals.push_back(crossings[i]);
}
// and transitions
const vector<Transition*>& transitions = s->GetAllTransitions();
for (unsigned int i = 0; i < transitions.size(); i++) {
for (i = 0; i < transitions.size(); i++) {
goals.push_back(transitions[i]);
}
......@@ -436,7 +438,7 @@ bool Building::LoadGeometry(const std::string &geometryfile)
string subroom_id = xmltoa(xSubRoom->Attribute("id"), "-1");
string closed = xmltoa(xSubRoom->Attribute("closed"), "0");
string SubroomClosed = xmltoa(xSubRoom->Attribute("closed"), "0");
string type = xmltoa(xSubRoom->Attribute("class"),"subroom");
//get the equation of the plane if any
......@@ -496,13 +498,13 @@ bool Building::LoadGeometry(const std::string &geometryfile)
int id = xmltof(xObstacle->Attribute("id"), -1);
int height = xmltof(xObstacle->Attribute("height"), 0);
double closed = xmltof(xObstacle->Attribute("closed"), 0);
string caption = xmltoa(xObstacle->Attribute("caption"),"-1");
double ObstClosed = xmltof(xObstacle->Attribute("closed"), 0);
string ObstCaption = xmltoa(xObstacle->Attribute("caption"),"-1");
Obstacle* obstacle = new Obstacle();
obstacle->SetId(id);
obstacle->SetCaption(caption);
obstacle->SetClosed(closed);
obstacle->SetCaption(ObstCaption);
obstacle->SetClosed(ObstClosed);
obstacle->SetHeight(height);
//looking for polygons (walls)
......
......@@ -244,8 +244,9 @@ Point DirectionInRangeBottleneck::GetTarget(Room* room, Pedestrian* ped) const
#endif
if( ped->GetID() == 12)
fprintf(stderr, "%.2f %.2f %.2f %.2f %f %f %d %.2f %.2f %.2f\n", NextPointOnLine.GetX(), NextPointOnLine.GetY(), ped->GetPos().GetX(), ped->GetPos().GetY(), G.GetX(), G.GetY(), ped->GetID(), ped->GetV0().GetX(), ped->GetV0().GetY(), ped->GetGlobalTime());
// if( ped->GetID() == 12)
// fprintf(stderr, "%.2f %.2f %.2f %.2f %f %f %d %.2f %.2f %.2f\n", NextPointOnLine.GetX(), NextPointOnLine.GetY(),
// ped->GetPos().GetX(), ped->GetPos().GetY(), G.GetX(), G.GetY(), ped->GetID(), ped->GetV0().GetX(), ped->GetV0().GetY(), ped->GetGlobalTime());
// this stderr output can be used with plot_desired_velocity.py
return G;
......
......@@ -620,7 +620,7 @@ int TiXmlElement::QueryIntAttribute( const char* name, int* ival ) const
}
int TiXmlElement::QueryUnsignedAttribute( const char* name, unsigned* value ) const
int TiXmlElement::QueryUnsignedAttribute( const char* name, unsigned* val ) const
{
const TiXmlAttribute* node = attributeSet.Find( name );
if ( !node )
......@@ -628,7 +628,7 @@ int TiXmlElement::QueryUnsignedAttribute( const char* name, unsigned* value ) co
int ival = 0;
int result = node->QueryIntValue( &ival );
*value = (unsigned)ival;
*val = (unsigned)ival;
return result;
}
......
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