Improved verbose output of subcircuit

diff --git a/libs/subcircuit/subcircuit.cc b/libs/subcircuit/subcircuit.cc
index a4f86d4e95e71d829748f6399d4fef3e7593c7a3..6ee2a0fcc22ad1324572d3675c4bd67aa7d84a26 100644 (file)
--- a/libs/subcircuit/subcircuit.cc
+++ b/libs/subcircuit/subcircuit.cc
@@ -1504,6 +1504,16 @@ protected:
 
                if (verbose)
                {
+                       my_printf("\n");
+                       my_printf("Needle nodes:\n");
+                       for (int i = 0; i < int(needle.graph.nodes.size()); i++)
+                               my_printf("%5d: %s (%s)\n", i, needle.graph.nodes[i].nodeId.c_str(), needle.graph.nodes[i].typeId.c_str());
+
+                       my_printf("\n");
+                       my_printf("Haystack nodes:\n");
+                       for (int i = 0; i < int(haystack.graph.nodes.size()); i++)
+                               my_printf("%5d: %s (%s)\n", i, haystack.graph.nodes[i].nodeId.c_str(), haystack.graph.nodes[i].typeId.c_str());
+
                        my_printf("\n");
                        my_printf("Needle Adjecency Matrix:\n");
                        printAdjMatrix(needle.adjMatrix);
@@ -1517,7 +1527,7 @@ protected:
                        diCache.printEdgeTypes();
 
                        my_printf("\n");
-                       my_printf("Enumeration Matrix:\n");
+                       my_printf("Enumeration Matrix (haystack nodes at column indices):\n");
                        printEnumerationMatrix(enumerationMatrix, haystack.graph.nodes.size());
                }