Merge remote-tracking branch 'origin/ahmed' into lbaumberger

forces.cpp

@@ -18,14 +18,9 @@ double g(double v_max_alpha, double w_alpha_norm) {
 }
 
 // # 8 flops
-//
-// $\vec{F}_\alpha(\vec{v}_\alpha, v^0_\alpha \vec{e}_\alpha) \vec{e}_\alpha(t) = \frac{1}{\tau_\alpha}(v^0_\alpha \vec{e}_\alpha - \vec{v}_\alpha)$
-//
 void compute_acceleration_term(Pedestrian *p) {
   // # 2 flops
-  // $v_{\alpha}^{0}\vec{e}_{\alpha}$
   Vector2d desired_velocity = p->e * p->desired_v0;
-  // $\vec{v}_{\alpha}(t)$
   Vector2d actual_velocity = p->curr_vel;
   // # 6 flops = 4 ADDs, 2 DIVs
   p->f_i += (desired_velocity - actual_velocity) / tau_alpha;