Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: refactor DynamicGraph print method #1060

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 39 additions & 14 deletions include/clad/Differentiator/DynamicGraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,21 +110,46 @@ template <typename T> class DynamicGraph {

/// Print the nodes and edges in the graph.
void print() {
// First print the nodes with their insertion order.
for (const T& node : m_nodes) {
std::pair<bool, int> nodeInfo = m_nodeMap[node];
std::cout << (std::string)node << ": #" << nodeInfo.second;
if (m_sources.find(nodeInfo.second) != m_sources.end())
std::cout << " (source)";
if (nodeInfo.first)
std::cout << ", (done)\n";
else
std::cout << ", (unprocessed)\n";
std::unordered_set<size_t> visited;

// Recursive function to print nodes with indentation based on depth.
std::function<void(size_t, int)> printNode = [&](size_t nodeId, int depth) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
std::function<void(size_t, int)> printNode = [&](size_t nodeId, int depth) {
auto printNode = [&](size_t nodeId, int depth) {

I believe we can the recursion with the cheaper iteration approach.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// Check if the node has been visited already to avoid cycles.
if (visited.find(nodeId) != visited.end())
return;
visited.insert(nodeId);

// Print the node with the appropriate indentation.
const T& node = m_nodes[nodeId];
std::pair<bool, int> nodeInfo = m_nodeMap[node];
std::string indent(depth * 4, ' ');
std::cout << indent << "`" << (std::string)node << ": #" << nodeInfo.second;

// Indicate if the node is a source and/or done.
if (m_sources.find(nodeInfo.second) != m_sources.end())
std::cout << " (source)";
if (nodeInfo.first)
std::cout << ", (done)\n";
else
std::cout << ", (unprocessed)\n";

// Recursively print all children (nodes connected by edges).
for (size_t destId : m_adjList[nodeId]) {
printNode(destId, depth + 1);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: variable 'printNode' declared with deduced type 'auto' cannot appear in its own initializer [clang-diagnostic-error]

            printNode(destId, depth + 1);
            ^

}
};

// Start printing from the source nodes.
for (size_t sourceId : m_sources) {
printNode(sourceId, 0);
}

// If there are unvisited nodes, they are disconnected from sources, print them separately.
for (size_t i = 0; i < m_nodes.size(); ++i) {
if (visited.find(i) == visited.end()) {
printNode(i, 0);
}
}
// Then print the edges.
for (int i = 0; i < m_nodes.size(); i++)
for (size_t dest : m_adjList[i])
std::cout << i << " -> " << dest << "\n";
}

/// Get the next node to be processed from the queue of nodes to be
Expand Down
Loading