Filippo-style simulations#474
Open
Grufoony wants to merge 1 commit into
Open
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #474 +/- ##
==========================================
- Coverage 84.00% 83.15% -0.86%
==========================================
Files 54 54
Lines 7585 7663 +78
Branches 881 903 +22
==========================================
Hits 6372 6372
- Misses 1201 1279 +78
Partials 12 12
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -0,0 +1,22 @@ | |||
| from dsf_cpp import mobility | |||
| @@ -0,0 +1,22 @@ | |||
| from dsf_cpp import mobility | |||
|
|
|||
| sim = mobility.TrafficSimulator() | |||
| 5, 30, 60, 600, std::nullopt, 120, 120, 2, true, "auto_charge_events.csv"); | ||
| } catch (const std::exception& e) { | ||
| std::cerr << "Error: " << e.what() << std::endl; | ||
| return 1; |
| @@ -0,0 +1,22 @@ | |||
| from dsf_cpp import mobility | |||
| @@ -0,0 +1,22 @@ | |||
| from dsf_cpp import mobility | |||
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a new “auto-charge” simulation mode to dsf::mobility::TrafficSimulator, exposing it to Python via pybind11 and providing C++/Python usage examples. This fits into the mobility simulation workflow as an additional run strategy alongside the existing default and slow-charge modes.
Changes:
- Introduces
TrafficSimulator::runAutoCharge(...)and private implementationm_runAutoCharge(...). - Adds Python binding
TrafficSimulator.runAutoCharge(...)with corresponding docstring/arguments. - Adds C++ and Python example scripts demonstrating the new mode.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 10 comments.
Show a summary per file
| File | Description |
|---|---|
| src/dsf/mobility/TrafficSimulator.hpp | Declares m_runAutoCharge and adds public runAutoCharge wrapper. |
| src/dsf/mobility/TrafficSimulator.cpp | Implements the new auto-charge loop, stability detection, and optional CSV event logging. |
| src/dsf/bindings.cpp | Exposes runAutoCharge to Python and documents parameters. |
| examples/auto_charge.cpp | New C++ example demonstrating auto-charge usage. |
| examples/auto_charge_py_example.py | New Python example demonstrating auto-charge usage via bindings. |
Comments suppressed due to low confidence (1)
src/dsf/mobility/TrafficSimulator.cpp:553
- Immediate injection on charge is also hard-coded to AgentInsertionMethod::ODS, ignoring the configured agent insertion method and potentially throwing when ODs aren’t configured. Use the same insertion method as the regular insertion path (or validate requirements up front).
spdlog::info(
"[auto-charge] New BASE_AGENT_COUNT: {} at step {}.", base, i);
if (injectOnCharge && chargeIncrement > 0) {
m_dynamics->addAgents(chargeIncrement, AgentInsertionMethod::ODS);
}
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| "Cannot run the simulation without imported road network dynamics."); | ||
| } | ||
| m_dynamics->prepareNetwork(); | ||
| m_preparePersistence(); |
Comment on lines
+457
to
+458
| m_preparePersistence(); | ||
|
|
Comment on lines
+495
to
+499
| if (i % dtAgent == 0) { | ||
| if (base > 0) { | ||
| m_dynamics->addAgents(base, AgentInsertionMethod::ODS); | ||
| } | ||
| } |
| std::deque<double> densityWindow; | ||
| auto windowSize = std::size_t(1); | ||
| if (saveIntervalSeconds > 0 && stabilityHoldSeconds > 0) { | ||
| windowSize = std::max<std::size_t>(1, stabilityHoldSeconds / saveIntervalSeconds); |
Comment on lines
+478
to
+482
| bool fileExists = std::filesystem::exists(stabilityLogFile); | ||
| stabilityWriter.emplace(stabilityLogFile, ';'); | ||
| if (!fileExists) { | ||
| stabilityWriter->writeHeader("time_step", "base_agent_count", "mean_density"); | ||
| } |
Comment on lines
+501
to
+510
| bool const shouldSave = (saveIntervalSeconds > 0 && i % saveIntervalSeconds == 0); | ||
| auto stepData = m_dynamics->evolve(shouldSave ? StepDataRequest{m_saveAverageStats, | ||
| m_saveStreetData, | ||
| m_saveTravelData, | ||
| m_saveAgentData} | ||
| : StepDataRequest{}); | ||
|
|
||
| if (shouldSave) { | ||
| if (stepData.averageStats.has_value()) { | ||
| double meanDensity = stepData.averageStats->meanDensity; |
Comment on lines
+1247
to
+1255
| std::size_t baseAgentCount, | ||
| std::size_t dtAgent, | ||
| std::size_t saveIntervalSeconds, | ||
| pybind11::object maxSteps, | ||
| pybind11::object stopMeanDensityVpk, | ||
| std::size_t stabilityHoldSeconds, | ||
| std::size_t stabilityCooldownSeconds, | ||
| std::size_t chargeIncrement, | ||
| bool injectOnCharge, |
| std::string stabilityLogFile) { | ||
| std::optional<std::size_t> optMaxSteps = std::nullopt; | ||
| if (!maxSteps.is_none()) { | ||
| optMaxSteps = static_cast<std::size_t>(pybind11::cast<std::uint64_t>(maxSteps)); |
Comment on lines
+437
to
+446
| void TrafficSimulator::m_runAutoCharge(std::size_t baseAgentCount, | ||
| std::size_t dtAgent, | ||
| std::size_t saveIntervalSeconds, | ||
| std::optional<std::size_t> maxSteps, | ||
| std::optional<double> stopMeanDensityVpk, | ||
| std::size_t stabilityHoldSeconds, | ||
| std::size_t stabilityCooldownSeconds, | ||
| std::size_t chargeIncrement, | ||
| bool injectOnCharge, | ||
| std::string const& stabilityLogFile) { |
| @@ -0,0 +1,21 @@ | |||
| #include <dsf.hpp> | |||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.