Improved algorithm for traffic lights by Grufoony · Pull Request #195 · physycom/DynamicalSystemFramework

Grufoony · 2024-10-09T09:12:50Z

No description provided.

New algorithm from my thesis

modTime to keep track of how the algorithm changes the values of redTime and greenTime

Improved algorithm for traffic lights

src/dsm/headers/Node.hpp

codecov · 2024-10-09T09:14:51Z

Codecov Report

Attention: Patch coverage is 78.63248% with 25 lines in your changes missing coverage. Please review.

Project coverage is 94.32%. Comparing base (ef69f61) to head (fb0700b).
Report is 2 commits behind head on main.

Files with missing lines	Patch %	Lines
src/dsm/headers/Dynamics.hpp	57.62%	25 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #195      +/-   ##
==========================================
- Coverage   94.77%   94.32%   -0.45%     
==========================================
  Files          17       17              
  Lines        3004     3472     +468     
  Branches      294      315      +21     
==========================================
+ Hits         2847     3275     +428     
- Misses        157      197      +40

Flag	Coverage Δ
unittests	`94.32% <78.63%> (-0.45%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Grufoony · 2024-10-26T09:06:01Z

I have moved changes to Node.hpp to another PR (see #199).
Next week with @filippodll we'll try to write a test for the optimization algorithm in order to make codecov happy and finally merge this PR.
By now, I consider the algorithm implementation as completed. Only tests are missing.

test/Test_dynamics.cpp

  }
+  SUBCASE("Traffic Lights optimization algorithm") {
+    GIVEN("A dynamics object with a traffic light intersection") {
+      TrafficLight tl{1};


test/Test_dynamics.cpp

+    GIVEN("A dynamics object with a traffic light intersection") {
+      TrafficLight tl{1};
+      tl.setDelay(4);
+      double length{90.}, max_speed{15.};


test/Test_dynamics.cpp

+      TrafficLight tl{1};
+      tl.setDelay(4);
+      double length{90.}, max_speed{15.};
+      Street s_01{1, 10, length, max_speed, std::make_pair(0, 1)};


test/Test_dynamics.cpp

+      Street s_41{21, 10, length, max_speed, std::make_pair(4, 1)};
+      tl.addStreetPriority(1);
+      tl.addStreetPriority(7);
+      Graph graph2;


test/Test_dynamics.cpp

+      tl.addStreetPriority(1);
+      tl.addStreetPriority(7);
+      Graph graph2;
+      graph2.addNode(std::make_unique<TrafficLight>(tl));


test/Test_dynamics.cpp

+      graph2.addNode(std::make_unique<TrafficLight>(tl));
+      graph2.addStreets(s_01, s_10, s_12, s_21, s_13, s_31, s_14, s_41);
+      graph2.buildAdj();
+      Dynamics dynamics{graph2};


test/Test_dynamics.cpp

+      graph2.addStreets(s_01, s_10, s_12, s_21, s_13, s_31, s_14, s_41);
+      graph2.buildAdj();
+      Dynamics dynamics{graph2};
+      Itinerary it_0{0, 0}, it_1{1, 2}, it_2{2, 3}, it_3{3, 4};


test/Test_dynamics.cpp

+        dynamics.optimizeTrafficLights(2, 0.1, 1.);
+        THEN("Green and red time are different") {
+          const auto timing =
+              dynamic_cast<TrafficLight&>(*dynamics.graph().nodeSet().at(1))


test/Test_dynamics.cpp

+      tl.setPhase(3);
+      double length{90.}, max_speed{15.};
+      Street s_01{1, 10, length, max_speed, std::make_pair(0, 1)};
+      Street s_10{5, 10, length, max_speed, std::make_pair(1, 0)};


test/Test_dynamics.cpp

+      double length{90.}, max_speed{15.};
+      Street s_01{1, 10, length, max_speed, std::make_pair(0, 1)};
+      Street s_10{5, 10, length, max_speed, std::make_pair(1, 0)};
+      Street s_12{7, 10, length, max_speed, std::make_pair(1, 2)};


test/Test_dynamics.cpp

+      Street s_10{5, 10, length, max_speed, std::make_pair(1, 0)};
+      Street s_12{7, 10, length, max_speed, std::make_pair(1, 2)};
+      Street s_21{11, 10, length, max_speed, std::make_pair(2, 1)};
+      Street s_13{8, 10, length, max_speed, std::make_pair(1, 3)};


test/Test_dynamics.cpp

+      Street s_21{11, 10, length, max_speed, std::make_pair(2, 1)};
+      Street s_13{8, 10, length, max_speed, std::make_pair(1, 3)};
+      Street s_31{16, 10, length, max_speed, std::make_pair(3, 1)};
+      Street s_14{9, 10, length, max_speed, std::make_pair(1, 4)};


test/Test_dynamics.cpp

+      Street s_41{21, 10, length, max_speed, std::make_pair(4, 1)};
+      tl.addStreetPriority(1);
+      tl.addStreetPriority(11);
+      Graph graph2;


test/Test_dynamics.cpp

+      graph2.addNode(std::make_unique<TrafficLight>(tl));
+      graph2.addStreets(s_01, s_10, s_12, s_21, s_13, s_31, s_14, s_41);
+      graph2.buildAdj();
+      Dynamics dynamics{graph2};


test/Test_dynamics.cpp

+        dynamics.optimizeTrafficLights(2, 0.1, 0.);
+        THEN("Green and red time are equal") {
+          const auto timing =
+              dynamic_cast<TrafficLight&>(*dynamics.graph().nodeSet().at(1))


Grufoony · 2024-11-04T11:53:06Z

For me and @filippodll is ok, i don't know what's wrong with codecov

vero-dav-vero and others added 14 commits October 3, 2024 14:13

Update Dynamics.hpp with new algorithm

5041c19

New algorithm from my thesis

Update Node.hpp with modTime

0811de4

modTime to keep track of how the algorithm changes the values of redTime and greenTime

Merge Dynamics.hpp with main branch

4aa4b74

Merge Node.hpp with main branch

4af2c1c

Fix stalingrado example build

6cc1e8d

Exclude more paths in examples

11e51a4

Remove weird line

9cb7926

Add m_dataUpdatePeriod var (previously hard-coded)

8a62631

Add densityTolerance parameter to optimizeTrafficLights()

75b025c

Add slow_charge_tl_vero.cpp

45dd3de

Remove simulation file

2225833

Fix Makefile

e110bbc

Optimize new code

9a638fa

Merge pull request #192 from vero-dav-vero/main

7fcd19f

Improved algorithm for traffic lights

github-advanced-security bot found potential problems Oct 9, 2024

View reviewed changes

src/dsm/headers/Node.hpp Fixed Show fixed Hide fixed

src/dsm/headers/Node.hpp Fixed Show fixed Hide fixed

src/dsm/headers/Node.hpp Fixed Show fixed Hide fixed

Grufoony added 6 commits October 9, 2024 11:20

Merge branch 'main' into feature_newTLAlgorithm

82d65ee

Change percentage param name to nCycles in optimizeTrafficLights

9e8459a

Merge branch 'main' into feature_newTLAlgorithm

0422831

Division security

818b9e4

Fix computations with unsigned values

6cc5ced

Revert Node.hpp to main version

4df7d5e

Grufoony changed the title ~~Improved algorithm for traffic lights (2)~~ Improved algorithm for traffic lights Oct 26, 2024

Add test for changing traffic light timings

78f086f

github-advanced-security bot found potential problems Nov 4, 2024

View reviewed changes

Add another test condition for traffic lights optimization

fb0700b

github-advanced-security bot found potential problems Nov 4, 2024

View reviewed changes

Grufoony merged commit 10512bf into main Nov 5, 2024

Grufoony deleted the feature_newTLAlgorithm branch November 5, 2024 08:46

Conversation

Grufoony commented Oct 9, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Oct 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Grufoony commented Oct 26, 2024

Uh oh!

Check notice

Check notice

Check notice

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Grufoony commented Nov 4, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov bot commented Oct 9, 2024 •

edited

Loading