Commit 7d8dd185 authored by Mohcine Chraibi's avatar Mohcine Chraibi

bug in makeini. lists or arrays

parent 87d46ea5
......@@ -115,7 +115,7 @@ def get_attribute(node):
value = eval(text)
else:
value = 0
if isinstance(value, list):
if isinstance(value, list) or isinstance(value, ndarray):
if len(value) > 1:
values.append([value, str(node.tag)+"-"+str(node_attrib), node_attrib])
......@@ -256,3 +256,4 @@ if __name__ == "__main__":
else:
sys.exit(SUCCESS)
......@@ -428,6 +428,8 @@ double Pedestrian::GetV0Norm() const
else if(sub->GetType() == "idle_escalator"){
speed_up = _V0IdleEscalatorUpStairs;
}
// printf("z=%f, f=%f, v0=%f, speed_up=%f, ret=%f\n", ped_elevation, f, _ellipse.GetV0(), speed_up, (1-f)*_ellipse.GetV0() + f*speed_up);
// getc(stdin);
return (1-f)*_ellipse.GetV0() + f*speed_up;
}
}
......
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