reduced flop count
This commit is contained in:
+9
-5
@@ -1,5 +1,4 @@
|
||||
#pragma once
|
||||
#include "random"
|
||||
#include "vector2d.hpp"
|
||||
|
||||
// For visual simulation
|
||||
@@ -14,7 +13,7 @@ struct Pedestrian {
|
||||
// $\vec{r}_\alpha(t)$
|
||||
Vector2d curr_pos;
|
||||
// $\vec{e}_{\alpha}(t)$
|
||||
Vector2d e; // desired direction vector
|
||||
Vector2d e; // desired direction vector
|
||||
// $v_{\alpha}^{max} = 1.3 v^{0}_{\alpha}$
|
||||
double v_max;
|
||||
// $v_\alpha^0$
|
||||
@@ -24,9 +23,14 @@ struct Pedestrian {
|
||||
// social force
|
||||
Vector2d f_i;
|
||||
|
||||
Pedestrian() : color(WHITE), curr_vel(0.0, 0.0), w(0.0, 0.0), curr_pos(0.0, 0.0), e(0.0, 0.0), v_max(0.0), desired_v0(0.0), destination(0.0, 0.0), f_i(0.0, 0.0) {}
|
||||
Pedestrian()
|
||||
: color(WHITE), curr_vel(0.0, 0.0), w(0.0, 0.0), curr_pos(0.0, 0.0),
|
||||
e(0.0, 0.0), v_max(0.0), desired_v0(0.0), destination(0.0, 0.0),
|
||||
f_i(0.0, 0.0) {}
|
||||
|
||||
Pedestrian(Color clr, Vector2d c_v, Vector2d c_p, Vector2d e, double v_max, double desired_v0, Vector2d d, Vector2d f)
|
||||
Pedestrian(Color clr, Vector2d c_v, Vector2d c_p, Vector2d e, double v_max,
|
||||
double desired_v0, Vector2d d, Vector2d f)
|
||||
: color(clr), curr_vel(c_v), w(c_v), // initialize w = v at t=0
|
||||
curr_pos(c_p), e(e), v_max(v_max), desired_v0(desired_v0), destination(d), f_i(f) {}
|
||||
curr_pos(c_p), e(e), v_max(v_max), desired_v0(desired_v0),
|
||||
destination(d), f_i(f) {}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user