From b2b5f9f8635a0365c87d41f292628afe87296f8a Mon Sep 17 00:00:00 2001 From: lbaumberger Date: Sun, 26 Apr 2026 20:01:14 +0200 Subject: [PATCH] minor fixes --- Overview_Formulas_Variables.md | 3 ++- forces.cpp | 10 ++++++++-- main | Bin 31912 -> 22520 bytes main.cpp | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Overview_Formulas_Variables.md b/Overview_Formulas_Variables.md index 017077f..2c07f76 100644 --- a/Overview_Formulas_Variables.md +++ b/Overview_Formulas_Variables.md @@ -130,7 +130,8 @@ F_{\alpha B} = w(e_\alpha,\; -f_{\alpha B}) \cdot f_{\alpha B} \qquad \text{(team convention; not explicit in paper)} $$ -> **Note:** Paper Eq. 8 only defines $w$ weighting for ped–ped $F_{\alpha\beta}$; applying it to border $F_{\alpha B}$ is our extension. +> **Note:** Paper Eq. 8 only defines $w$ weighting for ped–ped $F_{\alpha\beta}$; applying it to border $F_{\alpha B}$ is our extension. (Reason see page 6, top: "However, the formulas above for attractive and repulsive effects only hold for situations that are perceived in the desired direction e_alpha(t) of motion.") + ### 2.8 Total force — Eq. 9 (p. 6), no attractors (Eq. 6) / fluctuations diff --git a/forces.cpp b/forces.cpp index 5911909..0e4b548 100644 --- a/forces.cpp +++ b/forces.cpp @@ -72,7 +72,7 @@ void compute_repulsive_effects_from_pedestrians(Pedestrian *pedestrians, Pedestr } // # Assume that the four borders are also 4 obstacles -// # 36 n_obstacles flops = 144 flops +// # 48 n_obstacles flops = 192 flops void compute_repulsive_effects_from_borders(Board &board, Pedestrian *p) { Obstacle *obstacles = board.obstacles; @@ -89,6 +89,12 @@ void compute_repulsive_effects_from_borders(Board &board, Pedestrian *p) { Vector2d f_obst = (r_aB / r_aB.norm()) * (U0_AB / R) * std::exp(-r_aB.norm() / R); // # 2 ADDs - p->f_i += f_obst; + // p->f_i += f_obst; //commented since this version dont takes the field of view / angle to the border into account + + // I have read the paper again and on page 6 they say + // However, the formulas above for attractive and repulsive effects only hold for situations that are perceived in the desired direction e_alpha(t) of motion. + // I assumed that with formulas above its also meant for equation 8 (even though not explicitly mentioned their) + // # 14 flops: 9 MULTs, 4 ADDS, 1 SQRT + p->f_i += f_obst * w(p->e, f_obst * -1); } } diff --git a/main b/main index 6df50769a8b160144d31a3d4aa10357823305fe1..8c5c77cee4195270ab1080b290022c125bcac67e 100755 GIT binary patch literal 22520 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 Tn(pJ3KeU`n%!w!vfhzwW#gvQs literal 31912 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 WNdNR{x*Ck%@Vv&c-jBgADE(g?lkXJ( diff --git a/main.cpp b/main.cpp index 295c668..05dc0f3 100644 --- a/main.cpp +++ b/main.cpp @@ -56,7 +56,7 @@ int main(int argc, const char *argv[]) { // # Start here or right after function signature uint64_t start = start_tsc(); - // # (8 + 55N - 55 + 144 + 4 + 8 + 4 + 10)*n_p*n_iter + // # (8 + 55N - 55 + 192 + 4 + 8 + 4 + 10)*n_p*n_iter for (int t = 0; t < n_iter; t++) { // Pass1: conmpute all forces from the current state for (int i = 0; i < n_p; i++) { @@ -71,7 +71,7 @@ int main(int argc, const char *argv[]) { // # 55N - 55 flops compute_repulsive_effects_from_pedestrians(pedestrians, &p, n_p); - // # 144 flops + // # 192 flops compute_repulsive_effects_from_borders(board, &p); } // Pass2: integrate the forces and update the current state @@ -92,7 +92,7 @@ int main(int argc, const char *argv[]) { p.e = (p.destination - p.curr_pos) / (p.destination - p.curr_pos).norm(); } } - long long W = (long long)(8 + 55 * n_p - 55 + 144 + 4 + 8 + 4 + 10) * n_p * n_iter; + long long W = (long long)(8 + 55 * n_p - 55 + 192 + 4 + 8 + 4 + 10) * n_p * n_iter; std::cout << "W(n): "; std::cout << W; std::cout << " flops\n";