From 85a3bd57128e3926d6ea10a5f98dfeb3734e4c0a Mon Sep 17 00:00:00 2001
From: Chris Elrod <elrodc@gmail.com>
Date: Wed, 13 Dec 2023 18:09:46 -0500
Subject: [PATCH] Cache hash of ConnectionElement

---
 src/systems/connectors.jl | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/systems/connectors.jl b/src/systems/connectors.jl
index 6e96ca369d..f0cc047e33 100644
--- a/src/systems/connectors.jl
+++ b/src/systems/connectors.jl
@@ -147,18 +147,32 @@ struct ConnectionElement
     sys::LazyNamespace
     v::Any
     isouter::Bool
+    h::UInt
 end
-Base.nameof(l::ConnectionElement) = renamespace(nameof(l.sys), getname(l.v))
-function Base.hash(l::ConnectionElement, salt::UInt)
-    hash(nameof(l.sys)) ⊻ hash(l.v) ⊻ hash(l.isouter) ⊻ salt
+function _hash_impl(sys, v, isouter)
+    hashcore = hash(nameof(sys)) ⊻ hash(v)
+    hashouter = isouter ? hash(true) : hash(false)
+    hashcore ⊻ hashouter
+end
+function ConnectionElement(sys::LazyNamespace, v, isouter::Bool)
+    ConnectionElement(sys, v, isouter, _hash_impl(sys, v, isouter))
 end
+Base.nameof(l::ConnectionElement) = renamespace(nameof(l.sys), getname(l.v))
 Base.isequal(l1::ConnectionElement, l2::ConnectionElement) = l1 == l2
 function Base.:(==)(l1::ConnectionElement, l2::ConnectionElement)
     nameof(l1.sys) == nameof(l2.sys) && isequal(l1.v, l2.v) && l1.isouter == l2.isouter
 end
+Base.hash(e::ConnectionElement, salt::UInt) = e.h ⊻ salt
 namespaced_var(l::ConnectionElement) = states(l, l.v)
 states(l::ConnectionElement, v) = states(copy(l.sys), v)
 
+function withtrueouter(e::ConnectionElement)
+    e.isouter && return e
+    # we undo the xor
+    newhash = (e.h ⊻ hash(false)) ⊻ hash(true)
+    ConnectionElement(e.sys, e.v, true, newhash)
+end
+
 struct ConnectionSet
     set::Vector{ConnectionElement} # namespace.sys, var, isouter
 end
@@ -353,9 +367,7 @@ function partial_merge(csets::AbstractVector{<:ConnectionSet}, allouter = false)
     merged = false
     for (j, cset) in enumerate(csets)
         if allouter
-            cset = ConnectionSet(map(cset.set) do e
-                @set! e.isouter = true
-            end)
+            cset = ConnectionSet(map(withtrueouter, cset.set))
         end
         idx = nothing
         for e in cset.set
@@ -390,7 +402,7 @@ end
 
 function generate_connection_equations_and_stream_connections(csets::AbstractVector{
         <:ConnectionSet,
-    })
+})
     eqs = Equation[]
     stream_connections = ConnectionSet[]