diff --git a/forces.h b/forces.h index f5e0556..f6287eb 100644 --- a/forces.h +++ b/forces.h @@ -5,7 +5,7 @@ // Params // TODO: change this // $\tau$ -const double TAU = 1.0; // time to reach desired speed in s +const double TAU = 1.0; // time to reach desired speed in s // TODO: change this // $V^0_{\alpha \beta}$ @@ -29,27 +29,24 @@ const double C = 0.2; // TODO: change this // $\phi$ -const double PHI_DEG = 120.0; +// Field of view +const double PHI_DEG = 200.0; // TODO: change this const double DISTANCE = 2.0; - // Helper functions -Vector2d get_desired_direction(Pedestrian& p); +Vector2d get_desired_direction(Pedestrian &p); -Vector2d get_actual_direction(Pedestrian& p); +Vector2d get_actual_direction(Pedestrian &p); double w(Vector2d e, Vector2d f); - // Force functions -void compute_acceleration_term(Pedestrian* p); - -void compute_repulsive_effects_from_pedestrians(Pedestrian* P, Pedestrian *p, int N); - -void compute_repulsive_effects_from_borders(Sidewalk& S, Pedestrian* p); +void compute_acceleration_term(Pedestrian *p); +void compute_repulsive_effects_from_pedestrians(Pedestrian *P, Pedestrian *p, int N); +void compute_repulsive_effects_from_borders(Sidewalk &S, Pedestrian *p);