Merge pull request #1541 from SciML/myb/instream

Better instream expansion diagnostics and bug fix

Author: YingboMa

src/systems/connectors.jl

@@ -348,10 +348,9 @@ end
 function expand_connections(sys::AbstractSystem; debug=false, tol=1e-10)
     sys, csets = generate_connection_set(sys)
     ceqs, instream_csets = generate_connection_equations_and_stream_connections(csets)
-    additional_eqs = Equation[]
     _sys = expand_instream(instream_csets, sys; debug=debug, tol=tol)
     sys = flatten(sys, true)
-    @set! sys.eqs = [equations(_sys); ceqs; additional_eqs]
+    @set! sys.eqs = [equations(_sys); ceqs]
 end
 
 function unnamespace(root, namespace)
@@ -405,7 +404,7 @@ function expand_instream(csets::AbstractVector{<:ConnectionSet}, sys::AbstractSy
             end
         end
         if debug
-            @show ex idx_in_set ConnectionSet(cset)
+            @info "Expanding at [$idx_in_set]" ex ConnectionSet(cset)
             @show n_inners, n_outers
         end
         if n_inners == 1 && n_outers == 0
@@ -493,15 +492,22 @@ function expand_instream(csets::AbstractVector{<:ConnectionSet}, sys::AbstractSy
         end
     end
 
-    if debug
+    subed_eqs = substitute(instream_eqs, sub)
+    if debug && !(isempty(csets) && isempty(additional_eqs) && isempty(instream_eqs))
+        println("======================================")
         @info "Additional equations" csets
-        @show additional_eqs
+        display(additional_eqs)
+        println("======================================")
         println("Substitutions")
         display(sub)
+        println("======================================")
+        println("Substituted equations")
+        foreach(i->println(instream_eqs[i] => subed_eqs[i]), eachindex(subed_eqs))
+        println("======================================")
     end
 
     @set! sys.systems = []
-    @set! sys.eqs = [get_eqs(sys); eqs; substitute(instream_eqs, sub); additional_eqs]
+    @set! sys.eqs = [get_eqs(sys); eqs; subed_eqs; additional_eqs]
     sys
 end
 
@@ -517,8 +523,10 @@ function get_cset_sv(namespace, ex, csets)
     idx_in_set = -1
     sv = ns_sv
     for (i, c) in enumerate(csets)
+        crep = first(c.set)
+        current = namespace == crep.sys.namespace
         for (j, v) in enumerate(c.set)
-            if isequal(namespaced_var(v), full_name_sv)
+            if isequal(namespaced_var(v), full_name_sv) && (current || !v.isouter)
                 cidx = i
                 idx_in_set = j
                 sv = v.v
@@ -527,9 +535,9 @@ function get_cset_sv(namespace, ex, csets)
     end
     cidx < 0 && error("$ns_sv is not a variable inside stream connectors")
     cset = csets[cidx].set
-    if namespace != first(cset).sys.namespace
-        cset = map(c->@set(c.isouter = false), cset)
-    end
+    #if namespace != first(cset).sys.namespace
+    #    cset = map(c->@set(c.isouter = false), cset)
+    #end
     cset, idx_in_set, sv
 end
 

test/runtests.jl

@@ -15,10 +15,7 @@ using SafeTestsets, Test
 @safetestset "SteadyStateSystem Test" begin include("steadystatesystems.jl") end
 @safetestset "SDESystem Test" begin include("sdesystem.jl") end
 @safetestset "NonlinearSystem Test" begin include("nonlinearsystem.jl") end
-@safetestset "OptimizationSystem Test" begin include("optimizationsystem.jl") end
 @safetestset "JumpSystem Test" begin include("jumpsystem.jl") end
-@safetestset "ControlSystem Test" begin include("controlsystem.jl") end
-@safetestset "Modelingtoolkitize Test" begin include("modelingtoolkitize.jl") end
 @safetestset "Constraints Test" begin include("constraints.jl") end
 @safetestset "Reduction Test" begin include("reduction.jl") end
 @safetestset "Components Test" begin include("components.jl") end
@@ -41,6 +38,9 @@ println("Last test requires gcc available in the path!")
 @safetestset "error_handling" begin include("error_handling.jl") end
 @safetestset "root_equations" begin include("root_equations.jl") end
 @safetestset "state_selection" begin include("state_selection.jl") end
+@safetestset "Modelingtoolkitize Test" begin include("modelingtoolkitize.jl") end
+@safetestset "ControlSystem Test" begin include("controlsystem.jl") end
+@safetestset "OptimizationSystem Test" begin include("optimizationsystem.jl") end
 
 # Reference tests go Last
 @safetestset "Latexify recipes Test" begin include("latexify.jl") end