AdjacencyList representation: fix compare

alib2data/src/graph/directed/AdjacencyListDirectedGraph.cpp

@@ -164,11 +164,37 @@ int AdjacencyListDirectedGraph::compare(IDirectedGraph *other) const
 {
 	AdjacencyListDirectedGraph *o = static_cast<AdjacencyListDirectedGraph*>(other);
-	auto first = std::tie(edges, adj);
-	auto second = std::tie(o->edges, o->adj);
-	std::compare<decltype(first)> comp;
-	return comp(first, second);
+	std::compare<decltype(edges)> comp;
+	int res = comp(edges, o->edges);
+	if (res != 0) {
+		return res;
+	}
+
+	if (adj.size() < o->adj.size()) {
+		return -1;
+	}
+
+	if (adj.size() > o->adj.size()) {
+		return 1;
+	}
+
+	for (auto i : adj) {
+		auto lst1 = i.second;
+		auto lst2 = o->adj.at(i.first);
+
+		std::set<Node> adj1;
+		std::set<Node> adj2;
+		std::copy(lst1.begin(), lst1.end(), std::inserter(adj1, adj1.begin()));
+		std::copy(lst2.begin(), lst2.end(), std::inserter(adj2, adj2.begin()));
+
+		std::compare<std::set<Node>> comp;
+		int res = comp(adj1, adj2);
+		if (res != 0) {
+			return res;
+		}
+	}
+	return 0;
 }
 } // namespace graph

alib2data/src/graph/undirected/AdjacencyListUndirectedGraph.cpp

@@ -164,11 +164,37 @@ int AdjacencyListUndirectedGraph::compare(IUndirectedGraph *other) const
 {
 	AdjacencyListUndirectedGraph *o = static_cast<AdjacencyListUndirectedGraph*>(other);
-	auto first = std::tie(edges, adj);
-	auto second = std::tie(o->edges, o->adj);
-	std::compare<decltype(first)> comp;
-	return comp(first, second);
+	std::compare<decltype(edges)> comp;
+	int res = comp(edges, o->edges);
+	if (res != 0) {
+		return res;
+	}
+
+	if (adj.size() < o->adj.size()) {
+		return -1;
+	}
+
+	if (adj.size() > o->adj.size()) {
+		return 1;
+	}
+
+	for (auto i : adj) {
+		auto lst1 = i.second;
+		auto lst2 = o->adj.at(i.first);
+
+		std::set<Node> adj1;
+		std::set<Node> adj2;
+		std::copy(lst1.begin(), lst1.end(), std::inserter(adj1, adj1.begin()));
+		std::copy(lst2.begin(), lst2.end(), std::inserter(adj2, adj2.begin()));
+
+		std::compare<std::set<Node>> comp;
+		int res = comp(adj1, adj2);
+		if (res != 0) {
+			return res;
+		}
+	}
+	return 0;
 }
 } // namespace graph