CLI v1

app/main.cpp

@@ -1,12 +1,103 @@
+#include <iostream>
 #include <QtCore>
+#include <QCommandLineParser>
+
+#include "../common/common.h"
+#include "../core/include/pathfinder.h"
+#include "../models/include/transportSystem.h"
+#include "../lib/CLI11/include/CLI/CLI.hpp"
 
 QTextStream cout(stdout, QIODevice::WriteOnly);
+QTextStream cin(stdin, QIODevice::ReadOnly);
+
+void handleRouteCommand(const sdtmaps::TransportSystem &transportSystem, std::vector<std::string> &args) {
+    std::string startArg;
+    std::string endArg;
+    std::string dateArg;
+    std::string timeArg;
+    CLI::App app{"route"};
+    app.add_option("--start", startArg, "ID or full name of the start station")->required();
+    app.add_option("--end", endArg, "ID or full name of the end station")->required();
+    app.add_option("--date", dateArg, "departure date in yyyy-mm-dd format; defaults to the first date in the schedule");
+    app.add_option("--time", timeArg, "departure time in h:mm format; defaults to 0:00");
+    try {
+        app.parse(std::vector(args.begin(), args.end() - 1));
+    } catch (const CLI::ParseError &e) {
+        std::cerr << e.what() << std::endl;
+        return;
+    }
+    startArg = CLI::detail::remove_quotes(startArg);
+    endArg = CLI::detail::remove_quotes(endArg);
+    dateArg = CLI::detail::remove_quotes(dateArg);
+    timeArg = CLI::detail::remove_quotes(timeArg);
+
+    const sdtmaps::Stop *start = transportSystem.getStopById(startArg.c_str());
+    if (!start) {
+        start = transportSystem.getStopByName(startArg.c_str());
+    }
+    if (!start) {
+        qDebug() << "Start station '" << startArg.c_str() << "' not found\n";
+        return;
+    }
+    const sdtmaps::Stop *end = transportSystem.getStopById(endArg.c_str());
+    if (!end) {
+        end = transportSystem.getStopByName(endArg.c_str());
+    }
+    if (!end) {
+        qDebug() << "End station '" << endArg.c_str() << "' not found\n";
+        return;
+    }
+    QDate initDate = dateArg.empty() ? transportSystem.getStartDate() : QDate::fromString(dateArg.c_str(), "yyyy-mm-dd");
+    QTime initTime = timeArg.empty() ? QTime(0, 0) : QTime::fromString(dateArg.c_str(), "h:mm");
+    std::optional<sdtmaps::Journey> result = pathfind(transportSystem, start->id, end->id, QDateTime(initDate, initTime));
+    if (!result.has_value()) {
+        qDebug() << "No journey found\n";
+        return;
+    }
+    sdtmaps::Journey &journey = result.value();
+    cout << journey << Qt::flush;
+}
+
+int main(int argc, char** argv) {
+    QCoreApplication app(argc, argv);
+    QCoreApplication::setApplicationName("MNS");
+    QCoreApplication::setApplicationVersion("1.0");
+    QCommandLineParser parser;
+    parser.addVersionOption();
+    parser.addPositionalArgument("dataset",
+        "The name of the dataset to load transport data from. Datasets are stored in the " PROJECT_DATA_ROOT_RELATIVE_PATH " directory. Example: 'gtfs_hamburg'.");
+    parser.process(app);
+
+    const QStringList positionalArgs = parser.positionalArguments();
+    if (positionalArgs.size() != 1) {
+        std::cerr << "Expected 1 positional argument(s): dataset, but got " << positionalArgs.size() << std::endl;
+        return EXIT_FAILURE;
+    }
+    const QString &dataset = positionalArgs[0];
+
+    sdtmaps::TransportSystem transportSystem;
+
+    try {
+        transportSystem = sdtmaps::TransportSystem(QDir(QString(PROJECT_DATA_ROOT "/") + dataset));
+    } catch (const std::exception &e) {
+        std::cerr << e.what() << std::endl;
+        return EXIT_FAILURE;
+    }
 
-int main(int argc, char** argv)
-{
-    // avoid compiler warnings
-    Q_UNUSED(argc)
-    Q_UNUSED(argv)
-    QString s("Hello World!");
-    cout << s << Qt::endl;
+    std::string input;
+    cout << "[" + QCoreApplication::applicationName() + "]$ " << Qt::flush;
+    while (std::getline(std::cin, input)) {
+        std::vector<std::string> args = CLI::detail::split_up(input);
+        if (args.empty()) {
+            continue;
+        }
+        std::string commandName = args[0];
+        std::ranges::reverse(args);
+        if (commandName == "route") {
+            handleRouteCommand(transportSystem, args);
+        } else {
+            qDebug() << "Unknown command: " << commandName.c_str();
+        }
+        cout << "[" + QCoreApplication::applicationName() + "]$ " << Qt::flush;
+    }
 }

common/common.h

@@ -0,0 +1,8 @@
+#ifndef COMMON_H
+#define COMMON_H
+
+#define PROJECT_DATA_ROOT_RELATIVE_PATH "/data"
+
+#define PROJECT_DATA_ROOT PROJECT_ROOT_PATH PROJECT_DATA_ROOT_RELATIVE_PATH
+
+#endif //COMMON_H

core/src/pathfinder.cpp

@@ -6,8 +6,8 @@ namespace sdtmaps {
 
 std::optional<Journey> pathfind(const TransportSystem &transportSystem, const QString& sourceId, const QString& targetId, const DateTime &initDateTime
     , size_t maxChanges) {
-    const Stop *source = transportSystem.getStop(sourceId);
-    const Stop *target = transportSystem.getStop(targetId);
+    const Stop *source = transportSystem.getStopById(sourceId);
+    const Stop *target = transportSystem.getStopById(targetId);
     // If any of the stops was not found
     if (!source || !target) {
         return std::nullopt;

models/include/transportSystem.h

@@ -21,9 +21,12 @@ struct TransportSystem {
     // Check if all pointers point inside corresponding containers
     [[nodiscard]] bool isValid() const;
     // Find stop by id (to be optimized w/search structures)
-    [[nodiscard]] const Stop *getStop(const QString &stopId) const;
+    [[nodiscard]] const Stop *getStopById(const QString &stopId) const;
+    // Find stop by name (to be optimized w/search structures)
+    [[nodiscard]] const Stop *getStopByName(const QString &stopName) const;
     // Find stops by substring (to be optimized w/search structures)
     [[nodiscard]] std::vector<Stop *> getStopsBySubstring(const QString &substring) const;
+    [[nodiscard]] QDate getStartDate() const;
 };
 
 }

models/include/util.h

@@ -28,6 +28,8 @@ class DateTime {
     DateTime &operator+=(int other);
     DateTime &operator-=(int other);
 
+    [[nodiscard]] QDateTime toQDateTime() const;
+
     friend QTextStream& operator<<(QTextStream& os, const DateTime &dt);
 
 private:

models/src/transportSystem.cpp

@@ -175,7 +175,7 @@ bool TransportSystem::isValid() const {
     return routesAreValid && routeStopsAreValid && stopsAreValid && transfersAreValid && stopRoutesAreValid;
 }
 
-const Stop *TransportSystem::getStop(const QString &stopId) const {
+const Stop *TransportSystem::getStopById(const QString &stopId) const {
     for (auto &stop : stops) {
         if (stop.id == stopId) {
             return &stop;
@@ -184,4 +184,22 @@ const Stop *TransportSystem::getStop(const QString &stopId) const {
     return nullptr;
 }
 
+const Stop *TransportSystem::getStopByName(const QString &stopName) const {
+    for (auto &stop : stops) {
+        if (stop.name == stopName) {
+            return &stop;
+        }
+    }
+    return nullptr;
+}
+
+QDate TransportSystem::getStartDate() const {
+    if (stopTimes.empty()) {
+        return {};
+    }
+    return stopTimes[0].arrivalTime.toQDateTime().date();
+}
+
+
+
 }

models/src/util.cpp

@@ -48,9 +48,12 @@ DateTime &DateTime::operator-=(int other) {
     return *this;
 }
 
+QDateTime DateTime::toQDateTime() const {
+    return QDateTime::fromSecsSinceEpoch(timestamp);
+}
+
 QTextStream& operator<<(QTextStream& os, const DateTime &dt) {
-    QDateTime QTdt = QDateTime::fromSecsSinceEpoch(dt.timestamp);
-    return os << QTdt.toString();
+    return os << dt.toQDateTime().toString();
 }
 
 DateTime Ride::startTime() const {