Commit 97218519 authored by Ulrich Kemloh's avatar Ulrich Kemloh

First running version

parent daf7d627
......@@ -10,7 +10,7 @@
<!-- trajectories file and format -->
<trajectories format="xml-plain" fps="8">
<file location="big_room_trajectories.xml" />
<file location="hybrid_trajectories.xml" />
<socket hostname="127.0.0.1" port="8989" />
</trajectories>
......@@ -77,8 +77,8 @@
<group group_id="3" room_id="3" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" />
<group group_id="4" room_id="4" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" />
<!-- real start group -->
<group group_id="5" room_id="1" subroom_id="0" number="5" router_id="1" agent_parameter_id="1" goal_id="3" />
<group group_id="6" room_id="2" subroom_id="0" number="5" router_id="1" agent_parameter_id="1" goal_id="4" />
<group group_id="5" room_id="1" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="3" />
<group group_id="6" room_id="2" subroom_id="0" number="0" router_id="1" agent_parameter_id="1" goal_id="4" />
</agents_distribution>
<agents_sources><!-- frequency in persons/seconds -->
......
......@@ -135,11 +135,10 @@ bool HybridSimulationManager::Run(Simulation& sim)
// _rpcClient->NotifyExternalService();
//starting the simulation thread and waiting
std::thread t2(&JPSserver::RunSimulation, &jupedsimService);
_rpcServer->Wait();
//_rpcServer->Wait();
//TestWorkflow();
t2.join();
......
......@@ -125,7 +125,7 @@ const std::shared_ptr<StartDistribution> AgentsSource::GetStartDistribution() co
void AgentsSource::GenerateAgents(std::vector<Pedestrian*>& peds, int count, Building* building)
{
std::vector<Point> emptyPositions;
int pid=1; // will be discarded
int pid=Pedestrian::GetAgentsCreated(); // will be discarded
for(int i=0;i<count;i++)
{
peds.push_back(_startDistribution->GenerateAgent(building, &pid,emptyPositions));
......
......@@ -428,7 +428,7 @@ bool GlobalRouter::Init(Building* building)
" \tYou can solve this by enabling triangulation.",
from_AP->GetFriendlyName().c_str());
from_AP->Dump();
return false;
//return false;
}
}
_tmpPedPath.clear();
......
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