Skip to content

Implement virtual speed getters in Dynamics #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbaldu merged 1 commit into from
Dec 18, 2024
Merged

Implement virtual speed getters in Dynamics #233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 42 additions & 3 deletions src/dsm/headers/Dynamics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@
// TODO: implement the following functions
// We can implement the base version of these functions by cycling over agents... I won't do it for now.
// Grufoony - 19/02/2024
virtual double streetMeanSpeed(Id) const = 0;
virtual Measurement<double> streetMeanSpeed() const = 0;
virtual Measurement<double> streetMeanSpeed(double, bool) const = 0;
virtual double streetMeanSpeed(Id streetId) const;
virtual Measurement<double> streetMeanSpeed() const;
virtual Measurement<double> streetMeanSpeed(double, bool) const;
/// @brief Get the mean density of the streets in \f$m^{-1}\f$
/// @return Measurement<double> The mean density of the streets and the standard deviation
Measurement<double> streetMeanDensity(bool normalized = false) const;
Expand Down Expand Up @@ -610,6 +610,45 @@
return Measurement<double>(speeds);
}

template <typename agent_t>
double Dynamics<agent_t>::streetMeanSpeed(Id streetId) const {
auto const& pStreet{m_graph.streetSet().at(streetId)};
auto const nAgents{pStreet->nAgents()};
if (nAgents == 0) {
return 0.;

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.5 rule Note

MISRA 15.5 rule
}
double speed{0.};

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 12.3 rule Note

MISRA 12.3 rule

Check warning

Code scanning / Cppcheck (reported by Codacy)

Local variable 'speed' shadows outer function Warning

Local variable 'speed' shadows outer function
for (auto const& agentId : pStreet->waitingAgents()) {
speed += m_agents.at(agentId)->speed();
}
return speed / nAgents;
}

template <typename agent_t>
Measurement<double> Dynamics<agent_t>::streetMeanSpeed() const {
std::vector<double> speeds;
speeds.reserve(m_graph.streetSet().size());
for (const auto& [streetId, street] : m_graph.streetSet()) {
speeds.push_back(streetMeanSpeed(streetId));
}
return Measurement<double>(speeds);
}

template <typename agent_t>
Measurement<double> Dynamics<agent_t>::streetMeanSpeed(double threshold,
bool above) const {
std::vector<double> speeds;
speeds.reserve(m_graph.streetSet().size());
for (const auto& [streetId, street] : m_graph.streetSet()) {
if (above && (street->density(true) > threshold)) {
speeds.push_back(streetMeanSpeed(streetId));
} else if (!above && (street->density(true) < threshold)) {
speeds.push_back(streetMeanSpeed(streetId));
}

Check notice

Code scanning / Cppcheck (reported by Codacy)

MISRA 15.7 rule Note

MISRA 15.7 rule
}
return Measurement<double>(speeds);
}

template <typename agent_t>
Measurement<double> Dynamics<agent_t>::streetMeanDensity(bool normalized) const {
if (m_graph.streetSet().size() == 0) {
Expand Down
Loading