Commit cfe67547 authored by carlos's avatar carlos

works?

parent 3ac6280a
......@@ -249,7 +249,7 @@ bool IniFileParser::Parse(std::string iniFile)
string modelName = string(xModel->Attribute("description"));
int model_id = xmltoi(xModel->Attribute("operational_model_id"), -1);
if ((_model==MODEL_GFCM) && (model_id==MODEL_GFCM)) {
if ((_model==MODEL_GCFM) && (model_id==MODEL_GCFM)) {
if (modelName!="gcfm") {
Log->Write("ERROR: \t mismatch model ID and description. Did you mean gcfm?");
return false;
......
......@@ -43,7 +43,7 @@
<!--persons information and distribution -->
<agents operational_model_id="1">
<agents operational_model_id="[1, 5]">
<agents_distribution>
<group group_id="0" agent_parameter_id="0" room_id="0" subroom_id="0" number="2000" goal_id="-1" router_id="1" start_x="2" start_y="2"/>
</agents_distribution>
......
......@@ -131,7 +131,7 @@ enum RoutingStrategy {
};
enum OperativModels {
MODEL_GFCM=1,
MODEL_GCFM=1,
MODEL_GOMPERTZ,
MODEL_VELOCITY,
MODEL_GRADIENT,
......
......@@ -477,12 +477,12 @@ inline Point KrauszModel::ForceRepRoom(Pedestrian* ped, SubRoom* subroom) const
* */
inline Point KrauszModel::AccelOscil(Pedestrian* ped) const
{
printf("calculating AccelOscil");
double v = ped->GetV().Norm();
double omega = 2*M_PI*OscilFreq(v);
//omega^2 A sin(omega t)
double accel = omega*omega * OscilAmp(v) * sin(omega*ped->GetGlobalTime()); //TODO: inclue phase of oscillations
return v == 0 ? 0 : Point(-ped->GetV()._y, ped->GetV()._x) / v * accel;
}
......
......@@ -177,7 +177,10 @@ double JEllipse::GetBmin() const
double JEllipse::GetBmax() const
{
return _Bmax;
if (_do_stretch)
return _Bmax;
else
return _Bmin;
}
double JEllipse::GetV0() const
......
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