Skip to content

Commit e09a7e3

Browse files
committed
Ultimo tentativo
1 parent 9a00c04 commit e09a7e3

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/dsm/headers/RoadDynamics.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace dsm {
4545
double m_errorProbability;
4646
double m_minSpeedRateo;
4747
double m_maxFlowPercentage;
48-
std::vector<Period> m_travelTimes;
48+
std::vector<double> m_travelTimes;
4949
std::unordered_map<Id, Id> m_agentNextStreetId;
5050
bool m_forcePriorities;
5151
std::optional<delay_t> m_dataUpdatePeriod;
@@ -132,7 +132,7 @@ namespace dsm {
132132
/// @brief Get the mean travel time of the agents in \f$s\f$
133133
/// @param clearData If true, the travel times are cleared after the computation
134134
/// @return Measurement<double> The mean travel time of the agents and the standard
135-
Measurement<Period> meanTravelTime(bool clearData = false);
135+
Measurement<double> meanTravelTime(bool clearData = false);
136136
/// @brief Get the turn counts of the agents
137137
/// @return const std::array<unsigned long long, 3>& The turn counts
138138
/// @details The array contains the counts of left (0), straight (1), right (2) and U (3) turns
@@ -617,8 +617,8 @@ namespace dsm {
617617

618618
template <typename delay_t>
619619
requires(is_numeric_v<delay_t>)
620-
Measurement<Period> RoadDynamics<delay_t>::meanTravelTime(bool clearData) {
621-
std::vector<Period> travelTimes;
620+
Measurement<double> RoadDynamics<delay_t>::meanTravelTime(bool clearData) {
621+
std::vector<double> travelTimes;
622622
if (!m_travelTimes.empty()) {
623623
if (clearData) {
624624
std::swap(travelTimes, m_travelTimes);
@@ -629,7 +629,7 @@ namespace dsm {
629629
}
630630
}
631631
}
632-
return Measurement<Period>(travelTimes);
632+
return Measurement<double>(travelTimes);
633633
}
634634

635635
template <typename delay_t>

src/dsm/utility/Typedef.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ namespace dsm {
99
using Size = uint32_t;
1010
using Delay = uint16_t;
1111
using Time = uint64_t;
12-
using Period = uint32_t;
1312

1413
enum Direction : uint8_t {
1514
RIGHT = 0, // delta < 0

0 commit comments

Comments
 (0)