Refactor to accept new Library structure

src/manage/CommandParser.cc

@@ -2,8 +2,8 @@
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include "Colors.h"
-#include "Utils.h"
+#include "common/Colors.h"
+#include "common/Utils.h"
 
 namespace platform {
     void CommandParser::messageError(const std::string& message)

src/manage/ManageResults.cc

@@ -1,13 +1,13 @@
-#include "ManageResults.h"
-#include "CommandParser.h"
 #include <filesystem>
 #include <tuple>
-#include "Colors.h"
-#include "CLocale.h"
-#include "Paths.h"
-#include "ReportConsole.h"
-#include "ReportExcel.h"
-#include "ReportExcelCompared.h"
+#include "common/Colors.h"
+#include "common/CLocale.h"
+#include "common/Paths.h"
+#include "reports/ReportConsole.h"
+#include "reports/ReportExcel.h"
+#include "reports/ReportExcelCompared.h"
+#include "CommandParser.h"
+#include "ManageResults.h"
 
 namespace platform {
 

src/manage/ManageResults.h

@@ -1,7 +1,7 @@
 #ifndef MANAGE_RESULTS_H
 #define MANAGE_RESULTS_H
+#include <xlsxwriter.h>
 #include "Results.h"
-#include "xlsxwriter.h"
 
 namespace platform {
     class ManageResults {

src/manage/Results.cc

@@ -1,5 +1,5 @@
-#include "Results.h"
 #include <algorithm>
+#include "Results.h"
 
 namespace platform {
     Results::Results(const std::string& path, const std::string& model, const std::string& score, bool complete, bool partial) :

src/manage/Results.h

@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 #include <nlohmann/json.hpp>
-#include "Result.h"
+#include "main/Result.h"
 namespace platform {
     using json = nlohmann::json;
     class Results {

src/manage/b_manage.cc

@@ -33,7 +33,7 @@ void manageArguments(argparse::ArgumentParser& program, int argc, char** argv)
 
 int main(int argc, char** argv)
 {
-    auto program = argparse::ArgumentParser("b_manage", { project_version.begin(), project_version.end() });
+    auto program = argparse::ArgumentParser("b_manage", { platform_project_version.begin(), platform_project_version.end() });
     manageArguments(program, argc, argv);
     int number = program.get<int>("number");
     std::string model = program.get<std::string>("model");