Bugfix in autoMapStreetLanes function
#291
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #291 +/- ##
==========================================
- Coverage 89.50% 88.66% -0.84%
==========================================
Files 38 38
Lines 5146 5206 +60
Branches 461 477 +16
==========================================
+ Hits 4606 4616 +10
- Misses 540 590 +50
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}
| allowedTurns.erase(Direction::LEFT); | ||
| allowedTurns.erase(Direction::STRAIGHT); | ||
| allowedTurns.emplace(Direction::LEFTANDSTRAIGHT); | ||
| break; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| allowedTurns.emplace(Direction::LEFTANDSTRAIGHT); | ||
| break; | ||
| } | ||
| } |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| break; | ||
| } | ||
| } | ||
| } |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| allowedTurns.emplace(Direction::LEFT); | ||
| } | ||
| if (allowedTurns.size() > 2) { | ||
| // Remove duplicates |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| if (std::abs(deltaAngle) < std::numbers::pi) { | ||
| // Lanes are counted as 0 is the far right lane | ||
| if (std::abs(deltaAngle) < std::numbers::pi / 4) { | ||
| if (std::abs(deltaAngle) < std::numbers::pi / 8) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.1 rule Note
| std::format("Street {} can turn RIGHT", pInStreet->id())); | ||
| if (std::abs(deltaAngle) < std::numbers::pi / 8) { | ||
| Logger::debug(std::format("Street {} -> {} can turn STRAIGHT", | ||
| pInStreet->source(), |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.1 rule Note
| } else if (deltaAngle > 0.) { | ||
| Logger::debug(std::format("Street {} -> {} can turn LEFT", | ||
| pInStreet->source(), | ||
| pInStreet->target())); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| if (allowedTurns.size() > static_cast<size_t>(nLanes)) { | ||
| if (pair.second->isTrafficLight()) { | ||
| auto& tl = dynamic_cast<TrafficLight&>(*pair.second); | ||
| auto const& cycles{tl.cycles()}; |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
src/dsm/sources/RoadNetwork.cpp
Outdated
| Logger::debug( | ||
| std::format("Using traffic light {} cycles for street {} -> {}", | ||
| tl.id(), | ||
| pInStreet->source(), |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| allowedTurns.clear(); | ||
| for (auto const& [direction, cycle] : cycle) { | ||
| allowedTurns.emplace(direction); | ||
| } |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| for (auto const& [direction, cycle] : cycle) { | ||
| allowedTurns.emplace(direction); | ||
| } | ||
| } |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| allowedTurns.clear(); | ||
| allowedTurns.emplace(Direction::RIGHTANDSTRAIGHT); | ||
| allowedTurns.emplace(Direction::LEFT); | ||
| } |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| } else if (deltaAngle < 0.) { | ||
| Logger::debug(std::format("Street {} -> {} can turn RIGHT", | ||
| pInStreet->source(), | ||
| pInStreet->target())); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| if (cycles.contains(pInStreet->id())) { | ||
| if (cycles.size() == static_cast<size_t>(nLanes)) { | ||
| // Replace with the traffic light cycles | ||
| Logger::debug( |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| } else if (cycles.at(pInStreet->id()) | ||
| .contains(Direction::LEFTANDSTRAIGHT)) { | ||
| allowedTurns.erase(Direction::LEFT); | ||
| allowedTurns.erase(Direction::STRAIGHT); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| allowedTurns.emplace(Direction::LEFTANDSTRAIGHT); | ||
| } else if (cycles.at(pInStreet->id()) | ||
| .contains(Direction::RIGHTANDSTRAIGHT)) { | ||
| allowedTurns.erase(Direction::RIGHT); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 17.7 rule Note
| } else if (cycles.at(pInStreet->id()) | ||
| .contains(Direction::RIGHTANDSTRAIGHT)) { | ||
| allowedTurns.erase(Direction::RIGHT); | ||
| allowedTurns.erase(Direction::STRAIGHT); |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| } | ||
| } | ||
| assert(!possibleMoves.empty()); | ||
| if (streetId.has_value()) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| newStreetIds.emplace(streetId, newStreetId); | ||
| } | ||
| std::for_each( | ||
| m_edges.cbegin(), m_edges.cend(), [this, &newStreetIds](auto const& pair) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 12.3 rule Note
| m_edges.cbegin(), m_edges.cend(), [this, &newStreetIds](auto const& pair) { | ||
| auto const& pStreet{pair.second}; | ||
| auto const& forbiddenTurns{pStreet->forbiddenTurns()}; | ||
| if (forbiddenTurns.empty()) { |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 14.4 rule Note
| } | ||
| } | ||
| } | ||
| } |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.7 rule Note
| // std::format("Street {}->{} with {} lanes and {} allowed turns", | ||
| // pInStreet->source(), | ||
| // pInStreet->target(), | ||
| // nLanes, |
Check notice
Code scanning / Cppcheck (reported by Codacy)
MISRA 15.5 rule Note
1 participant
No description provided.