fix: diff constraints test

Author: Debashis08

Headers/0003_Graph/0012_DifferenceConstraintsShortestPaths.h

@@ -27,7 +27,6 @@ namespace DifferenceConstraintsShortestPaths
 	class Graph
 	{
 	private:
-		Node* startingNode;
 		map<Node*, vector<Node*>> _adjlist;
 		map<string, Node*> _nodeMap;
 		vector<Edge*> _edgeList;
@@ -39,6 +38,6 @@ namespace DifferenceConstraintsShortestPaths
 	public:
 		void PushAllDirectedEdges(vector<vector<int>> vectorA, vector<string> vectorX, vector<int> vectorB);
 		bool FindDifferenceConstraintsSolutionBellmanFord();
-		vector<int> GetDifferenceConstrtaintsSolution();
+		vector<pair<string, int>> GetDifferenceConstrtaintsSolution();
 	};
 }

SourceCodes/0003_Graph/0012_DifferenceConstraintsShortestPaths.cc

@@ -118,14 +118,14 @@ namespace DifferenceConstraintsShortestPaths
 		return true;
 	}
 
-	vector<int> Graph::GetDifferenceConstrtaintsSolution()
+	vector<pair<string, int>> Graph::GetDifferenceConstrtaintsSolution()
 	{
-		vector<int> result;
+		vector<pair<string, int>> 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;

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<typename T1, typename T2>
+	string SortVectorOfPairAndSerialize(vector<pair<T1, T2>> data)
+	{
+		// Sorting the vector in non-decreasing order on typename T1
+		sort(data.begin(), data.end(), [](const pair<T1, T2>& pair1, const pair<T1, T2>& 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;
+	}
 };

Tests/0003_Graph/0012_DifferenceConstraintsShortestPathsTest.cc

@@ -24,10 +24,17 @@ namespace DifferenceConstraintsShortestPaths
 		};
 		vector<string> vectorX = { "v1", "v2", "v3", "v4", "v5" };
 		vector<int> vectorB = {0, -1, 1, 5, 4, -1, -3, -3};
-		string expectedSolution = "-5 -3 0 -1 -4";
+		vector<pair<string, int>> 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));
 	}
 }