1280 trip addition overhaul #1281
Open
Conversation
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
2 tasks
xsaschako
changed the title
xsaschako
changed the title
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1281 +/- ##
==========================================
- Coverage 97.28% 97.17% -0.11%
==========================================
Files 168 168
Lines 14858 14822 -36
==========================================
- Hits 14454 14404 -50
- Misses 404 418 +14 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
DavidKerkmann
requested changes
Jul 11, 2025
Comment on lines
+50
to
+56
| std::vector<Trip> merged_trips; | ||
| merged_trips.reserve(m_trips.size() + trip.size()); | ||
| std::merge(m_trips.begin(), m_trips.end(), trip.begin(), trip.end(), std::back_inserter(merged_trips), | ||
| [](auto& trip1, auto& trip2) { | ||
| return std::tie(trip1.trip_time, trip1.person_id) < std::tie(trip2.trip_time, trip2.person_id); | ||
| }); | ||
| m_trips = std::move(merged_trips); |
There was a problem hiding this comment.
Is there no in-place merger? Could avoid a lot of storage duplication from having to have two times the same trip vector.
Comment on lines
-49
to
-50
| LocationId origin; ///< Location where the Person starts the Trip. | ||
| int origin_model_id; ///< Model id of origin Location. |
There was a problem hiding this comment.
Not sure if we should delete this. I think this could be used later on if trip logic is changed.
|
|
||
| /** | ||
| * @brief Construct a new Trip. | ||
| * @param[in] id ID of the Person that makes the Trip. | ||
| * @param[in] time_new Time at which a Person changes the Location this currently cant be set for s specific day just a timepoint in a day. | ||
| * @param[in] trip_time Time at which a Person changes the Location this currently cant be set for s specific day just a timepoint in a day. |
There was a problem hiding this comment.
trip_time parameter is actually called time now.
| @@ -125,8 +125,12 @@ class ABMMobilityEdge | |||
| for (int i = int(persons_to_change.size()) - 1; i >= 0; --i) { | |||
| auto& person = model_from.get_persons()[persons_to_change[i]]; | |||
| auto target_type = person.get_location_type(); | |||
| if (target_type == abm::LocationType::Count) { | |||
There was a problem hiding this comment.
Why should this happen? Locations with LocationType::Count should be prohibited.
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.
Changes and Information
Please briefly list the changes (main added features, changed items, or corrected bugs) made:
If need be, add additional information and what the reviewer should look out for in particular:
Merge Request - Guideline Checklist
Please check our git workflow. Use the draft feature if the Pull Request is not yet ready to review.
Checks by code author
Checks by code reviewer(s)