From 76648069188fa0fe3655f4deb9f945a4532e1f6c Mon Sep 17 00:00:00 2001
From: Romain BERNARD <romain.bernard@uca.fr>
Date: Tue, 27 Feb 2024 18:50:33 +0100
Subject: [PATCH] add Line size functions for code clarity
---
src/instance/graph/Graph.cpp | 2 +-
src/instance/graph/Line.h | 3 +++
test/debug.cpp | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/instance/graph/Graph.cpp b/src/instance/graph/Graph.cpp
index acc8f2a..9556251 100644
--- a/src/instance/graph/Graph.cpp
+++ b/src/instance/graph/Graph.cpp
@@ -18,7 +18,7 @@
std::vector<Line> Graph::addLine(Line& line) {
//Add line stops to nodes
- for(int i = 0; i < line.getNodes().size(); ++i)
+ for(int i = 0; i < line.size(); ++i)
{
nodesVector.at(line.getNode(i)).addBusLine(line, i);
}
diff --git a/src/instance/graph/Line.h b/src/instance/graph/Line.h
index f2bd910..c17a56f 100644
--- a/src/instance/graph/Line.h
+++ b/src/instance/graph/Line.h
@@ -48,6 +48,9 @@ public:
*/
[[nodiscard]] int getInstant(int stationIdx, int scheduleIdx) const { return _timetables.at(stationIdx).at(scheduleIdx); }
+ [[nodiscard]] size_t size() const {return _nodes.size();}
+ [[nodiscard]] size_t scheduleSize() const {return _timetables.empty() ? 0 : _timetables.at(0).size();}
+
[[nodiscard]] bool check() const;
[[nodiscard]] bool checkSchedules() const;
diff --git a/test/debug.cpp b/test/debug.cpp
index f420119..a8a617b 100644
--- a/test/debug.cpp
+++ b/test/debug.cpp
@@ -18,7 +18,7 @@ int main() {
Graph graphFromSingleFile("../resources/test/instances/" + instanceFolder + datFile);
graphFromSingleFile.exportGraphToFiles("../resources/test/outputs/" + instanceFolder);
for(auto& ptLine : graphFromSingleFile.getPTLines()) {
- for(int i = 0; i < ptLine.getNodes().size(); ++i) {
+ for(int i = 0; i < ptLine.size(); ++i) {
for (auto& startingTime: ptLine.getTimetable(i)) {
TransitShortestPathPrecompute::executeAlgorithm(graphFromSingleFile, ptLine.getNode(i),startingTime);
}
--
GitLab