diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76c0d99aa410be9b7e666795e3944d81bd5f9697..0ca5b977d0fadc09b3794075af46b16ba6383216 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,13 @@ add_executable(pdptw src/main.cpp
src/input/pdptw_data.cpp
src/input/time_window.cpp
src/input/json_parser.cpp
- src/lns/route.cpp
- src/lns/solution.cpp
+ src/lns/solution/route.cpp
+ src/lns/solution/solution.cpp
+ src/lns/modification/insert_pair.cpp
+ src/lns/modification/insert_route_with_pair.cpp
+ src/lns/modification/insert_route.cpp
+ src/lns/modification/remove_pair.cpp
+ src/lns/modification/remove_route.cpp
)
target_link_libraries(pdptw PRIVATE CLI11::CLI11 nlohmann_json::nlohmann_json spdlog::spdlog)
\ No newline at end of file
diff --git a/src/input/pdptw_data.cpp b/src/input/pdptw_data.cpp
index cee525175743b3357c963999059999b07eebbaea..ee78a2b8ef0ffafdc25b475ed3068f3c01fc9ef5 100644
--- a/src/input/pdptw_data.cpp
+++ b/src/input/pdptw_data.cpp
@@ -4,6 +4,7 @@
#include <fstream>
#include <vector>
#include <nlohmann/json.hpp>
+#include <spdlog/spdlog.h>
unsigned int PDPTWData::getSize()
@@ -16,20 +17,32 @@ int PDPTWData::getCapacity()
return capacity;
}
-std::vector<Location> const &PDPTWData::getLocations() const {
+std::vector<Location> const &PDPTWData::getLocations() const
+{
return locations;
}
-Location const PDPTWData::getDepot() const{
+Location const &PDPTWData::getDepot() const
+{
return depot;
}
+Location const &PDPTWData::getLocation(int id) const
+{
+ return locations[id];
+}
-PDPTWData::PDPTWData(unsigned int size, int capacity, Location depot, std::vector<Location> location, Matrix distance_matrix)
- : size(size), capacity(capacity), depot(depot), locations(std::move(location)), distance_matrix(std::move(distance_matrix)) {}
+Matrix const &PDPTWData::getMatrix() const
+{
+ return distanceMatrix;
+}
+PDPTWData::PDPTWData(unsigned int size, int capacity, Location depot, std::vector<Location> location, Matrix distanceMatrix)
+ : size(size), capacity(capacity), depot(depot), locations(std::move(location)), distanceMatrix(std::move(distanceMatrix)) {}
-void PDPTWData::print() const {
+
+void PDPTWData::print() const
+{
std::cout << "Instance size: " << size << "\n";
std::cout << "Capacity: " << capacity << "\n";
std::cout << "Depot:\n";
@@ -41,10 +54,100 @@ void PDPTWData::print() const {
}
std::cout << "Distance Matrix:\n";
- for (const auto& row : distance_matrix) {
+ for (const auto& row : distanceMatrix) {
for (const auto& dist : row) {
std::cout << dist << " ";
}
std::cout << "\n";
}
-}
\ No newline at end of file
+}
+
+void PDPTWData::checkData() const
+{
+ bool errorFlag = checkMatrix();
+
+ errorFlag = checkLocation() || errorFlag;
+
+ //errorFlag = checkTimeWindow() || errorFlag;
+
+ if (errorFlag)
+ {
+ throw InputJsonException("failed to pass consistency checks");
+ }
+}
+
+
+bool PDPTWData::checkMatrix() const
+{
+ // square matrix
+
+ for (const auto& row : getMatrix())
+ {
+ if (row.size() != size)
+ {
+ return true;
+ }
+ }
+
+ /*
+ for (int i = 0; i < size; i++)
+ {
+ for (int j = 0; j < size; j++)
+ {
+ for (int k = 0; k < size; k++)
+ {
+ if (getMatrix()[i][j] > getMatrix()[i][k] + getMatrix()[k][j])
+ {
+ return true;
+ }
+ }
+ }
+ }
+ */
+
+ return false;
+}
+
+bool PDPTWData::checkLocation() const
+{
+
+ // check if location id equals the position in the location vector
+ for (size_t i = 0; i < size-1; ++i) {
+ if (locations[i].getId() != static_cast<int>(i)+1) {
+ return true;
+ }
+ }
+
+ // check if pair of location are well made (type, id, demand, timeWindow)
+ for(const Location& loc : getLocations())
+ {
+ if (loc.getLocType() == LocType::PICKUP)
+ {
+ if ( (getLocations()[loc.getPair()-1].getLocType() != LocType::DELIVERY)
+ || (loc.getDemand() != - getLocations()[loc.getPair()-1].getDemand())
+ || (loc.getId() != getLocations()[loc.getPair()-1].getPair()) )
+ {
+ return true;
+ }
+ }
+
+ if (loc.getTimeWindow().getStart() > loc.getTimeWindow().getEnd())
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+
+InputJsonException::InputJsonException(std::string_view reason)
+ : reason(fmt::format("Input JSON file is incorrect : {}", reason))
+{
+ spdlog::default_logger()->flush();
+}
+
+char const *InputJsonException::what() const noexcept
+{
+ return reason.data();
+}
diff --git a/src/input/pdptw_data.h b/src/input/pdptw_data.h
index 093fefaeee3f5f76f2bcdac67f2d87dd0001d9c9..fd2d4463bb67387785c72dc67e56e7a48da79b97 100644
--- a/src/input/pdptw_data.h
+++ b/src/input/pdptw_data.h
@@ -28,7 +28,7 @@ class PDPTWData
int capacity;
Location depot;
std::vector<Location> locations;
- Matrix distance_matrix;
+ Matrix distanceMatrix;
public:
@@ -41,18 +41,22 @@ public:
* Constructs an empty PDPTWData.
* @see parsing::parseJson
*/
- PDPTWData(unsigned int size, int capacity, Location depot, std::vector<Location> requests, Matrix distance_matrix);
+ PDPTWData(unsigned int size, int capacity, Location depot, std::vector<Location> requests, Matrix distanceMatrix);
/**
* Checks some data coherence
*/
void checkData() const;
+ bool checkMatrix() const;
+ bool checkLocation() const;
+
std::vector<Location> const &getLocations() const;
- Location const getDepot() const;
+ Location const &getLocation(int id) const;
+ Location const &getDepot() const;
+ Matrix const &getMatrix() const;
unsigned int getSize();
int getCapacity();
-
void print() const;
};
diff --git a/src/lns/modification/insert_pair.cpp b/src/lns/modification/insert_pair.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/insert_pair.h b/src/lns/modification/insert_pair.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/insert_route.cpp b/src/lns/modification/insert_route.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/insert_route.h b/src/lns/modification/insert_route.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/insert_route_with_pair.cpp b/src/lns/modification/insert_route_with_pair.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/insert_route_with_pair.h b/src/lns/modification/insert_route_with_pair.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/remove_pair.cpp b/src/lns/modification/remove_pair.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/remove_pair.h b/src/lns/modification/remove_pair.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/remove_route.cpp b/src/lns/modification/remove_route.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/modification/remove_route.h b/src/lns/modification/remove_route.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/lns/route.h b/src/lns/route.h
deleted file mode 100644
index f8a2b9677716dfca05b9c0c2911980c626bdad44..0000000000000000000000000000000000000000
--- a/src/lns/route.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <vector>
-
-/**
- * Represent a route for the PDPTW
- */
-class Route
-{
-
-private:
- std::vector<int> route;
- int cost;
-
-public:
-
- Route(std::vector<int> route, int cost);
- int getCost() const;
- const std::vector<int>& getRoute() const;
-
-
-};
\ No newline at end of file
diff --git a/src/lns/route.cpp b/src/lns/solution/route.cpp
similarity index 57%
rename from src/lns/route.cpp
rename to src/lns/solution/route.cpp
index dfc173430afa899aa1b7a27f4f8b8ae1077b3feb..b24be977a5d3dbab5115092cfc8d2ea64748e0bf 100644
--- a/src/lns/route.cpp
+++ b/src/lns/solution/route.cpp
@@ -1,4 +1,5 @@
#include "route.h"
+#include <iostream>
Route::Route(std::vector<int> route, int cost) : route(route), cost(cost) {}
@@ -11,4 +12,13 @@ int Route::getCost() const
const std::vector<int>& Route::getRoute() const
{
return route;
-}
\ No newline at end of file
+}
+
+void Route::print() const
+{
+ for (const int& id : getRoute())
+ {
+ std::cout << id << ", ";
+ }
+ std::cout << "\n";
+}
\ No newline at end of file
diff --git a/src/lns/solution/route.h b/src/lns/solution/route.h
new file mode 100644
index 0000000000000000000000000000000000000000..5bcc7eaf055563c571c86eb7231865456f525baa
--- /dev/null
+++ b/src/lns/solution/route.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <vector>
+#include "./../../input/time_window.h"
+
+/**
+ * Represent a route for the PDPTW
+ */
+class Route
+{
+
+private:
+ int cost;
+ std::vector<int> route;
+
+
+ /* Stocké dans les contraintes
+ std::vector<TimeInteger> reach_time; // debut d'arrivee
+ std::vector<double> FTS; // forward time slack
+ std::vector<std::vector<double>> acc_cap; // inscreasing capacity allowed between two positions
+ */
+
+public:
+
+ Route(std::vector<int> route, int cost);
+ int getCost() const;
+ const std::vector<int>& getRoute() const;
+ void print() const;
+
+};
\ No newline at end of file
diff --git a/src/lns/solution.cpp b/src/lns/solution/solution.cpp
similarity index 67%
rename from src/lns/solution.cpp
rename to src/lns/solution/solution.cpp
index e81ce6d91b5ea86cbd1760baf5bec5ab5237e36a..7781d5679f479328ba8c82ca1c35ad8904743ede 100644
--- a/src/lns/solution.cpp
+++ b/src/lns/solution/solution.cpp
@@ -1,4 +1,5 @@
#include "solution.h"
+#include <iostream>
Solution::Solution(RequestBank bank, std::vector<Route> routes, int totalCost)
: bank(bank), routes(routes), totalCost(totalCost) {}
@@ -16,4 +17,13 @@ const std::vector<Route> & Solution::getRoute() const
int Solution::getCost()
{
return totalCost;
+}
+
+void Solution::print() const
+{
+ std::cout << "Cost :" << totalCost << "\n";
+ for (const Route& id : getRoute())
+ {
+ id.print();
+ }
}
\ No newline at end of file
diff --git a/src/lns/solution.h b/src/lns/solution/solution.h
similarity index 94%
rename from src/lns/solution.h
rename to src/lns/solution/solution.h
index 95b6daf875601b3a321a55f74776a7f53e3267f8..e4fa61d80e0b59034c88635625b5f708e124b448 100644
--- a/src/lns/solution.h
+++ b/src/lns/solution/solution.h
@@ -22,4 +22,5 @@ public:
const std::vector<Route> & getRoute() const;
int getCost();
+ void print() const;
};
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 4550e685aa519a0a9f35888941e6deb5b8a37e00..ffe109d360ac1eda97222f2a25a991410a4a7edd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,20 +20,21 @@ int main(int argc, char const *argv[])
{
/* code */
+ //std::string filepath = "/home/a24jacqb/Documents/Code/pdptw-main/data_in/test_inst.json";
+ std::string filepath = "/home/a24jacqb/Documents/Code/pdptw-main/data_in/n100/bar-n100-1.json";
+ //std::string filepath = "/home/a24jacqb/Documents/Code/pdptw-main/data_in/n5000/bar-n5000-1.json";
+
+ std::cout << filepath << "\n";
+
+ PDPTWData data = parsing::parseJson(filepath);
+ data.checkData();
/* test */
TimeWindow tw = TimeWindow(3,4);
Location pos = Location(1, 1, 20, 3, tw, 4, 5, LocType::DEPOT);
- // test parser
- std::string filepath = "/home/a24jacqb/Documents/Code/pdptw-main/data_in/test_inst.json";
-
- std::cout << filepath << "\n";
-
- PDPTWData data = parsing::parseJson(filepath);
- data.print();
return 0;
diff --git a/src/output/solution_checker.cpp b/src/output/solution_checker.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/output/solution_checker.h b/src/output/solution_checker.h
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391