FULL SPEED; cut mif.is_connected by 90%

atopile · Nov 7, 2024 · ab0a597 · ab0a597
1 parent 71bdb49
commit ab0a597
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/faebryk/core/cpp/include/graph/graph.hpp b/src/faebryk/core/cpp/include/graph/graph.hpp
@@ -109,7 +109,7 @@ class GraphInterface {
 
     template <typename T> static std::shared_ptr<T> factory();
     std::unordered_set<GI_ref_weak> get_gif_edges();
-    std::unordered_map<GI_ref_weak, Link_ref> get_edges();
+    std::unordered_map<GI_ref_weak, Link_ref> &get_edges();
     std::optional<Link_ref> is_connected(GI_ref_weak to);
     Graph_ref get_graph();
     std::unordered_set<Node_ref> get_connected_nodes(std::vector<nb::type_object> types);
@@ -144,6 +144,7 @@ class Link {
 class Graph {
     Set<GI_ref> v;
     std::vector<std::tuple<GI_ref_weak, GI_ref_weak, Link_ref>> e;
+
     Map<GI_ref_weak, Map<GI_ref_weak, Link_ref>> e_cache = {};
     Map<GI_ref_weak, Set<GI_ref_weak>> e_cache_simple = {};
     bool invalidated = false;
@@ -156,7 +157,7 @@ class Graph {
     static Graph_ref merge_graphs(Graph_ref g1, Graph_ref g2);
 
     std::unordered_set<GI_ref_weak> get_gif_edges(GI_ref_weak from);
-    std::unordered_map<GI_ref_weak, Link_ref> get_edges(GI_ref_weak from);
+    std::unordered_map<GI_ref_weak, Link_ref> &get_edges(GI_ref_weak from);
 
     Graph();
     ~Graph();

diff --git a/src/faebryk/core/cpp/src/graph/graph.cpp b/src/faebryk/core/cpp/src/graph/graph.cpp
@@ -97,7 +97,7 @@ std::unordered_set<GI_ref_weak> Graph::get_gif_edges(GI_ref_weak from) {
     return this->e_cache_simple[from];
 }
 
-std::unordered_map<GI_ref_weak, Link_ref> Graph::get_edges(GI_ref_weak from) {
+std::unordered_map<GI_ref_weak, Link_ref> &Graph::get_edges(GI_ref_weak from) {
     return this->e_cache[from];
 }
 

diff --git a/src/faebryk/core/cpp/src/graph/graphinterface.cpp b/src/faebryk/core/cpp/src/graph/graphinterface.cpp
@@ -5,6 +5,7 @@
 #include "graph/graphinterfaces.hpp"
 #include "graph/links.hpp"
 #include "pyutil.hpp"
+#include <chrono>
 
 std::shared_ptr<Graph> GraphInterface::get_graph() {
     return this->G;
@@ -71,7 +72,7 @@ void GraphInterface::register_graph(std::shared_ptr<GraphInterface> gi) {
 }
 
 std::optional<Link_ref> GraphInterface::is_connected(GI_ref_weak to) {
-    auto edges = this->get_edges();
+    auto &edges = this->get_edges();
     auto edge = edges.find(to);
     if (edge == edges.end()) {
         return {};
@@ -83,7 +84,7 @@ Set<GI_ref_weak> GraphInterface::get_gif_edges() {
     return this->G->get_gif_edges(this);
 }
 
-std::unordered_map<GI_ref_weak, Link_ref> GraphInterface::get_edges() {
+std::unordered_map<GI_ref_weak, Link_ref> &GraphInterface::get_edges() {
     return this->G->get_edges(this);
 }