Commit e0cc4a3f authored by Mohcine Chraibi's avatar Mohcine Chraibi

correct some inifiles and reduce visibility range

parent acb7c60b
......@@ -5,7 +5,7 @@
<!-- seed used for initialising random generator -->
<seed>12542</seed>
<!-- geometry file -->
<geometry>geometry.xml</geometry>
<geometry>bidirectional_geo.xml</geometry>
<max_sim_time>130</max_sim_time>
<!-- trajectories file and format -->
......@@ -53,16 +53,19 @@
</routing>
<!--persons information and distribution -->
<agents operational_model_id="4">
<agents operational_model_id="2">
<agents_distribution>
<group group_id="2" room_id="0" subroom_id="0" number="50" router_id="1" agent_parameter_id="1" goal_id="2" x_min="23" x_max="29" y_min="-3" y_max="3" />
<group group_id="1" room_id="0" subroom_id="0" number="50" router_id="1" agent_parameter_id="1" goal_id="1" x_min="1" x_max="7" y_min="-3" y_max="3"/>
<group group_id="2" room_id="0" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="2" />
<group group_id="1" room_id="0" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="1" x_min="7" x_max="9" />
<group group_id="3" room_id="0" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="2" />
<group group_id="4" room_id="0" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="1" />
<!-- uncomment this line and comment out the line above. This creates a SegFault because GetRoom returns nullptr -->
<!-- <group group_id="1" room_id="1" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="2" x_min="1" x_max="5" y_min="-2" y_max="2"/> -->
</agents_distribution>
<agents_sources><!-- frequency in persons/seconds -->
<source_ id="1" frequency="3" agents_max="30" group_id="1" caption="source 1" />
<source id="1" frequency="3" agents_max="30" group_id="1" caption="source 1" />
<source_ id="2" frequency="3" agents_max="30" group_id="2" caption="source 2" />
</agents_sources>
......
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry version="0.8" caption="hybrid test" unit="m" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_geometry.xsd">
<geometry version="0.8" caption="hybrid test" unit="m" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.8/jps_geometry.xsd">
<rooms>
<room id="0" caption="hall0">
<subroom id="0" closed="0" class="floor">
......
......@@ -86,7 +86,7 @@ bool ComputeBestPositionVoronoiBoost(AgentsSource* src, std::vector<Pedestrian*>
auto dist = src->GetStartDistribution();
int roomID = dist->GetRoomId();
int subroomID = dist->GetSubroomID();
std::string caption = (building->GetRoom( roomID ))->GetCaption();
// std::string caption = (building->GetRoom( roomID ))->GetCaption();
std::vector<Pedestrian*> existing_peds;
std::vector<Pedestrian*> peds_without_place;
......@@ -258,7 +258,7 @@ void VoronoiAdjustVelocityNeighbour(voronoi_diagram<double>::const_vertex_iterat
const voronoi_diagram<double>::edge_type *edge = vertex.incident_edge();
double no1=0,no2=0;
double backup_speed = 0;
std::size_t index;
//std::size_t index;
Point v(0,0);
if(ped->GetExitLine() != nullptr)
v = (ped->GetExitLine()->ShortestPoint(ped->GetPos())- ped->GetPos()).Normalized(); //the direction
......@@ -270,7 +270,7 @@ void VoronoiAdjustVelocityNeighbour(voronoi_diagram<double>::const_vertex_iterat
double speed = 0;
do
{
index = ( edge->cell() )->source_index();
std::size_t index = ( edge->cell() )->source_index();
if( ped->GetFinalDestination() == goal_vector[index] )
{
no1++;
......
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