From a88931d06e464ddef6b0c32b48e430649001c3e4 Mon Sep 17 00:00:00 2001 From: Debashis Nandi Date: Tue, 14 Jan 2025 00:47:16 +0530 Subject: [PATCH 1/4] feature: diff constraints initial changes --- .../0012_DifferenceConstraintsShortestPaths.h | 43 +++++++++++++ ...0012_DifferenceConstraintsShortestPaths.cc | 62 +++++++++++++++++++ SourceCodes/0003_Graph/CMakeLists.txt | 1 + ..._DifferenceConstraintsShortestPathsTest.cc | 0 Tests/0003_Graph/CMakeLists.txt | 1 + 5 files changed, 107 insertions(+) create mode 100644 Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h create mode 100644 SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc create mode 100644 Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc diff --git a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h new file mode 100644 index 0000000..bedce6c --- /dev/null +++ b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h @@ -0,0 +1,43 @@ +#pragma once + +#include +#include +using namespace std; + +namespace DifferenceConstraintsShortestPaths +{ + class Node + { + public: + int data; + int distance; + Node(int data); + }; + + class Edge + { + public: + Node* nodeU; + Node* nodeV; + int weight; + Edge(Node* nodeU, Node* nodeV, int weight); + }; + + class Graph + { + private: + map> _adjlist; + map _nodeMap; + vector _edgeList; + Node* MakeOrFindNode(int data); + void InitializeSingleSource(Node* sourceNode); + void Relax(Edge* edge); + void GetShortestPath(Node* node, vector& path); + + + public: + void PushDirectedEdge(int valueU, int valueV, int weight); + bool FindSingleSourceShortestPathBellmanFord(int data); + vector GetShortestPathBellmanFord(int data); + }; +} \ No newline at end of file diff --git a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc new file mode 100644 index 0000000..dba38f7 --- /dev/null +++ b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc @@ -0,0 +1,62 @@ +#include"../Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h" +#include +using namespace std; + +namespace DifferenceConstraintsShortestPaths +{ + Node::Node(int data) + { + this->data = data; + this->distance = INT_MAX; + } + + Edge::Edge(Node* nodeU, Node* nodeV, int weight) + { + this->nodeU = nodeU; + this->nodeV = nodeV; + this->weight = weight; + } + + // Graph Private Member Methods + Node* Graph::MakeOrFindNode(int data) + { + Node* node = nullptr; + if (this->_nodeMap.find(data) == this->_nodeMap.end()) + { + node = new Node(data); + this->_nodeMap[data] = node; + } + else + { + node = this->_nodeMap[data]; + } + return node; + } + + void Graph::InitializeSingleSource(Node* sourceNode) + { + for (auto& iterator : this->_nodeMap) + { + iterator.second->distance = INT_MAX; + } + sourceNode->distance = 0; + } + + void Graph::Relax(Edge* edge) + { + if (edge->nodeU->distance != INT_MAX && (edge->nodeV->distance > (edge->nodeU->distance + edge->weight))) + { + edge->nodeV->distance = edge->nodeU->distance + edge->weight; + } + } + + // Graph Public Member Methods + void Graph::PushDirectedEdge(int dataU, int dataV, int weight) + { + Node* nodeU = this->MakeOrFindNode(dataU); + Node* nodeV = this->MakeOrFindNode(dataV); + + this->_adjlist[nodeU].push_back(nodeV); + this->_edgeList.push_back(new Edge(nodeU, nodeV, weight)); + } +} \ No newline at end of file diff --git a/SourceCodes/0003_Graph/CMakeLists.txt b/SourceCodes/0003_Graph/CMakeLists.txt index eb010e7..d2171df 100644 --- a/SourceCodes/0003_Graph/CMakeLists.txt +++ b/SourceCodes/0003_Graph/CMakeLists.txt @@ -11,6 +11,7 @@ set(0003GRAPH_SOURCES 0009_SingleSourceShortestPathBellmanFord.cc 0010_DirectedAcyclicGraphShortestPath.cc 0011_SingleSourceShortestPathDijkstra.cc + 0012_DifferenceConstraintsShortestPaths.cc ) diff --git a/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc b/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc new file mode 100644 index 0000000..e69de29 diff --git a/Tests/0003_Graph/CMakeLists.txt b/Tests/0003_Graph/CMakeLists.txt index 42d15cb..1d024f1 100644 --- a/Tests/0003_Graph/CMakeLists.txt +++ b/Tests/0003_Graph/CMakeLists.txt @@ -23,6 +23,7 @@ add_executable( 0009_SingleSourceShortestPathBellmanFordTest.cc 0010_DirectedAcyclicGraphShortestPathTest.cc 0011_SingleSourceShortestPathDijkstraTest.cc + 0012_DifferenceConstraintsShortestPathsTest.cc ) target_link_libraries( From 6af7c03d7bc0a57fcef24fea6add0183fdd81d98 Mon Sep 17 00:00:00 2001 From: Debashis Nandi Date: Tue, 14 Jan 2025 01:12:25 +0530 Subject: [PATCH 2/4] fix: node class fix for diff constraint --- .../0012_DifferenceConstraintsShortestPaths.h | 17 ++++---- ...0012_DifferenceConstraintsShortestPaths.cc | 40 +++++++++++++++---- 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h index bedce6c..f34d1e1 100644 --- a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h +++ b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include using namespace std; @@ -9,9 +10,9 @@ namespace DifferenceConstraintsShortestPaths class Node { public: - int data; + string data; int distance; - Node(int data); + Node(string data); }; class Edge @@ -26,18 +27,18 @@ namespace DifferenceConstraintsShortestPaths class Graph { private: + Node* startingNode; map> _adjlist; - map _nodeMap; + map _nodeMap; vector _edgeList; - Node* MakeOrFindNode(int data); + Node* MakeOrFindNode(string data); + void PushDirectedEdge(string valueU, string valueV, int weight); void InitializeSingleSource(Node* sourceNode); void Relax(Edge* edge); - void GetShortestPath(Node* node, vector& path); public: - void PushDirectedEdge(int valueU, int valueV, int weight); - bool FindSingleSourceShortestPathBellmanFord(int data); - vector GetShortestPathBellmanFord(int data); + void PushAllDirectedEdges(vector> vectorA, vector vectorX, vector vectorB); + }; } \ No newline at end of file diff --git a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc index dba38f7..2e48f2b 100644 --- a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc +++ b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc @@ -4,7 +4,7 @@ using namespace std; namespace DifferenceConstraintsShortestPaths { - Node::Node(int data) + Node::Node(string data) { this->data = data; this->distance = INT_MAX; @@ -18,7 +18,7 @@ namespace DifferenceConstraintsShortestPaths } // Graph Private Member Methods - Node* Graph::MakeOrFindNode(int data) + Node* Graph::MakeOrFindNode(string data) { Node* node = nullptr; if (this->_nodeMap.find(data) == this->_nodeMap.end()) @@ -33,6 +33,15 @@ namespace DifferenceConstraintsShortestPaths return node; } + void Graph::PushDirectedEdge(string dataU, string dataV, int weight) + { + Node* nodeU = this->MakeOrFindNode(dataU); + Node* nodeV = this->MakeOrFindNode(dataV); + + this->_adjlist[nodeU].push_back(nodeV); + this->_edgeList.push_back(new Edge(nodeU, nodeV, weight)); + } + void Graph::InitializeSingleSource(Node* sourceNode) { for (auto& iterator : this->_nodeMap) @@ -51,12 +60,27 @@ namespace DifferenceConstraintsShortestPaths } // Graph Public Member Methods - void Graph::PushDirectedEdge(int dataU, int dataV, int weight) + void Graph::PushAllDirectedEdges(vector> vectorA, vector vectorX, vector vectorB) { - Node* nodeU = this->MakeOrFindNode(dataU); - Node* nodeV = this->MakeOrFindNode(dataV); - - this->_adjlist[nodeU].push_back(nodeV); - this->_edgeList.push_back(new Edge(nodeU, nodeV, weight)); + // Creating the Graph + string valueU = ""; + string valueV = ""; + int weight = 0; + for (int i = 0; i < vectorA.size(); i++) + { + for (int j = 0; j < vectorX.size(); j++) + { + if (vectorA[i][j] == 1) + { + valueV= vectorX[j]; + } + if (vectorA[i][j] == -1) + { + valueU = vectorX[j]; + } + } + weight = vectorB[i]; + this->PushDirectedEdge(valueU, valueV, weight); + } } } \ No newline at end of file From d844a8cf798582f4a8ea69a36931fa52529e5f43 Mon Sep 17 00:00:00 2001 From: Debashis Nandi Date: Tue, 14 Jan 2025 22:39:07 +0530 Subject: [PATCH 3/4] feature-test: difference constraints logic, test --- .../0012_DifferenceConstraintsShortestPaths.h | 4 +- ...0012_DifferenceConstraintsShortestPaths.cc | 49 ++++++++++++++++++- Tests/0000_CommonUtilities/UnitTestHelper.h | 2 +- .../0005_HamiltonianPathAndCycleTest.cc | 2 +- ..._DifferenceConstraintsShortestPathsTest.cc | 33 +++++++++++++ 5 files changed, 85 insertions(+), 5 deletions(-) diff --git a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h index f34d1e1..9c40f3a 100644 --- a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h +++ b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h @@ -36,9 +36,9 @@ namespace DifferenceConstraintsShortestPaths void InitializeSingleSource(Node* sourceNode); void Relax(Edge* edge); - public: void PushAllDirectedEdges(vector> vectorA, vector vectorX, vector vectorB); - + bool FindDifferenceConstraintsSolutionBellmanFord(); + vector GetDifferenceConstrtaintsSolution(); }; } \ No newline at end of file diff --git a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc index 2e48f2b..34330f9 100644 --- a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc +++ b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc @@ -62,7 +62,7 @@ namespace DifferenceConstraintsShortestPaths // Graph Public Member Methods void Graph::PushAllDirectedEdges(vector> vectorA, vector vectorX, vector vectorB) { - // Creating the Graph + // Creating the Actual Graph string valueU = ""; string valueV = ""; int weight = 0; @@ -82,5 +82,52 @@ namespace DifferenceConstraintsShortestPaths weight = vectorB[i]; this->PushDirectedEdge(valueU, valueV, weight); } + + // Creating all the edges from the additional vertex + valueU = ""; + valueV = ""; + weight = 0; + for (int i = 0; i < vectorX.size(); i++) + { + valueV = vectorX[i]; + this->PushDirectedEdge(valueU, valueV, weight); + } + } + + bool Graph::FindDifferenceConstraintsSolutionBellmanFord() + { + Node* source = this->_nodeMap[""]; + + this->InitializeSingleSource(source); + + for (int i = 0; i < this->_nodeMap.size(); i++) + { + for (auto& edge : this->_edgeList) + { + this->Relax(edge); + } + } + + for (auto& edge : this->_edgeList) + { + if (edge->nodeV->distance > (edge->nodeU->distance + edge->weight)) + { + return false; + } + } + return true; + } + + vector Graph::GetDifferenceConstrtaintsSolution() + { + vector result; + for (auto& node : this->_nodeMap) + { + if (node.second->data != "") + { + result.push_back(node.second->distance); + } + } + return result; } } \ No newline at end of file diff --git a/Tests/0000_CommonUtilities/UnitTestHelper.h b/Tests/0000_CommonUtilities/UnitTestHelper.h index c903d36..6d8a5ed 100644 --- a/Tests/0000_CommonUtilities/UnitTestHelper.h +++ b/Tests/0000_CommonUtilities/UnitTestHelper.h @@ -109,7 +109,7 @@ class UnitTestHelper } template - bool NormalizeCyclesAnCompare(vector data1, vector data2) + bool NormalizeCyclesAndCompare(vector data1, vector data2) { if (data1.size() != data2.size()) { diff --git a/Tests/0003_Graph/0005_HamiltonianPathAndCycleTest.cc b/Tests/0003_Graph/0005_HamiltonianPathAndCycleTest.cc index 386825d..d46a651 100644 --- a/Tests/0003_Graph/0005_HamiltonianPathAndCycleTest.cc +++ b/Tests/0003_Graph/0005_HamiltonianPathAndCycleTest.cc @@ -28,6 +28,6 @@ namespace HamiltonianPathAndCycle ASSERT_TRUE(isHamiltonianCyclePresent); ASSERT_TRUE(isHamiltonianPathPresent); - ASSERT_TRUE(unitTestHelper.NormalizeCyclesAnCompare(hamiltonianPathActualResult, hamiltonianPathExpectedResult)); + ASSERT_TRUE(unitTestHelper.NormalizeCyclesAndCompare(hamiltonianPathActualResult, hamiltonianPathExpectedResult)); } } \ No newline at end of file diff --git a/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc b/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc index e69de29..2ae1fd0 100644 --- a/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc +++ b/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc @@ -0,0 +1,33 @@ +#include +#include"../Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h" +#include"../0000_CommonUtilities/UnitTestHelper.h" +using namespace std; + +namespace DifferenceConstraintsShortestPaths +{ + UnitTestHelper unitTestHelper; + + TEST(DifferenceConstraints, SimpleGraph) + { + Graph graph; + + vector> vectorA = + { + {1, -1, 0, 0, 0}, + {1, 0, 0, 0, -1}, + {0, 1, 0, 0, -1}, + {-1, 0, 1, 0, 0}, + {-1, 0, 0, 1, 0}, + {0, 0, -1, 1, 0}, + {0, 0, -1, 0, 1}, + {0, 0, 0, -1, 1}, + }; + vector vectorX = { "v1", "v2", "v3", "v4", "v5" }; + vector vectorB = {0, -1, 1, 5, 4, -1, -3, -3}; + string expectedSolution = "-5 -3 0 -1 -4"; + graph.PushAllDirectedEdges(vectorA, vectorX, vectorB); + + ASSERT_TRUE(graph.FindDifferenceConstraintsSolutionBellmanFord()); + ASSERT_EQ(unitTestHelper.SerializeVectorToString(graph.GetDifferenceConstrtaintsSolution()), expectedSolution); + } +} \ No newline at end of file From 7e2e3bf6b20e3091921208f316eed10538eacd25 Mon Sep 17 00:00:00 2001 From: Debashis Nandi Date: Wed, 15 Jan 2025 01:11:41 +0530 Subject: [PATCH 4/4] fix: diff constraints test --- .../0012_DifferenceConstraintsShortestPaths.h | 3 +-- ...0012_DifferenceConstraintsShortestPaths.cc | 6 ++--- Tests/0000_CommonUtilities/UnitTestHelper.h | 24 ++++++++++++++++++- ..._DifferenceConstraintsShortestPathsTest.cc | 11 +++++++-- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h index 9c40f3a..683dfa2 100644 --- a/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h +++ b/Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h @@ -27,7 +27,6 @@ namespace DifferenceConstraintsShortestPaths class Graph { private: - Node* startingNode; map> _adjlist; map _nodeMap; vector _edgeList; @@ -39,6 +38,6 @@ namespace DifferenceConstraintsShortestPaths public: void PushAllDirectedEdges(vector> vectorA, vector vectorX, vector vectorB); bool FindDifferenceConstraintsSolutionBellmanFord(); - vector GetDifferenceConstrtaintsSolution(); + vector> GetDifferenceConstrtaintsSolution(); }; } \ No newline at end of file diff --git a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc index 34330f9..20b7784 100644 --- a/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc +++ b/SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc @@ -118,14 +118,14 @@ namespace DifferenceConstraintsShortestPaths return true; } - vector Graph::GetDifferenceConstrtaintsSolution() + vector> Graph::GetDifferenceConstrtaintsSolution() { - vector result; + vector> result; for (auto& node : this->_nodeMap) { if (node.second->data != "") { - result.push_back(node.second->distance); + result.push_back({ node.second->data, node.second->distance }); } } return result; diff --git a/Tests/0000_CommonUtilities/UnitTestHelper.h b/Tests/0000_CommonUtilities/UnitTestHelper.h index 6d8a5ed..6e3509e 100644 --- a/Tests/0000_CommonUtilities/UnitTestHelper.h +++ b/Tests/0000_CommonUtilities/UnitTestHelper.h @@ -73,7 +73,6 @@ class UnitTestHelper return result; } - // This helper method is used to sort the vector of vectors of a particular typename. // Each inner vector is sorted first. // Then each of them are sorted by their first element, in increasing order. @@ -158,4 +157,27 @@ class UnitTestHelper }); return data; } + + template + string SortVectorOfPairAndSerialize(vector> data) + { + // Sorting the vector in non-decreasing order on typename T1 + sort(data.begin(), data.end(), [](const pair& pair1, const pair& pair2) + { + return pair1.first < pair2.first; + }); + + // Serializing the vector to string + string result = ""; + for (auto& iterator : data) + { + result += iterator.first + "(" + to_string(iterator.second) + ")" + " "; + } + + if (!result.empty()) + { + result.pop_back(); + } + return result; + } }; \ No newline at end of file diff --git a/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc b/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc index 2ae1fd0..04b293e 100644 --- a/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc +++ b/Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc @@ -24,10 +24,17 @@ namespace DifferenceConstraintsShortestPaths }; vector vectorX = { "v1", "v2", "v3", "v4", "v5" }; vector vectorB = {0, -1, 1, 5, 4, -1, -3, -3}; - string expectedSolution = "-5 -3 0 -1 -4"; + vector> expectedSolution = + { + {"v2", -3}, + {"v5", -4}, + {"v1", -5}, + {"v4", -1}, + {"v3", 0}, + }; graph.PushAllDirectedEdges(vectorA, vectorX, vectorB); ASSERT_TRUE(graph.FindDifferenceConstraintsSolutionBellmanFord()); - ASSERT_EQ(unitTestHelper.SerializeVectorToString(graph.GetDifferenceConstrtaintsSolution()), expectedSolution); + ASSERT_EQ(unitTestHelper.SortVectorOfPairAndSerialize(graph.GetDifferenceConstrtaintsSolution()), unitTestHelper.SortVectorOfPairAndSerialize(expectedSolution)); } } \ No newline at end of file