Fixed some bugs in plugin merge

Author: Gesee-y

benchmarks/run_benchmarks.jl

@@ -1,6 +1,4 @@
-include("..\\src\\Cruise.jl")
-
-using .Cruise
+using Cruise
 using BenchmarkTools
 
 include("BenchTypes.jl")

src/plugin/core.jl

@@ -46,15 +46,14 @@ mutable struct CRPluginNode{T,S}
     obj::T
     mainthread::Bool
     deps::PluginDict
-    children::Vector{CRPluginNode}
     status::CRSubject{CRPluginStatus}
     capability::S
     lasterr::Exception
 
     ## Constructors
 
-    CRPluginNode(obj::T; mainthread=false) where T = new{T,Any}(-1, obj, mainthread, PluginDict(), CRPluginNode[], CRSubject(PLUGIN_OFF))
-    CRPluginNode(obj::T, cap::S; mainthread=false) where {T, S<:Any} = new{T,S}(-1, obj, mainthread, PluginDict(), CRPluginNode[], CRSubject(PLUGIN_OFF), cap)
+    CRPluginNode(obj::T; mainthread=false) where T = new{T,Any}(-1, obj, mainthread, PluginDict(), CRSubject(PLUGIN_OFF))
+    CRPluginNode(obj::T, cap::S; mainthread=false) where {T, S<:Any} = new{T,S}(-1, obj, mainthread, PluginDict(), CRSubject(PLUGIN_OFF), cap)
 end
 
 """

src/plugin/operations.jl

@@ -135,7 +135,6 @@ function add_dependency!(sg::CRPlugin, from::Int, to::Int; sort=true)
         p = sg.idtonode[from]
         c = sg.idtonode[to]
         c.deps[typeof(p.obj)] = WeakRef(p)
-        push!(p.children, c)
         if sort 
             sg.sort_cache = topological_sort(get_graph(sg))
             sg.parallel_cache = compute_parallel_levels(sg)
@@ -153,11 +152,7 @@ function remove_dependency!(sg::CRPlugin, from::Int, to::Int; sort=true)
     p = sg.idtonode[from]
     c = sg.idtonode[to]
     delete!(c.deps,typeof(p.obj))
-    idx = findfirst(isequal(c), p.children)
-    if idx != -1
-        p.children[end], p.children[idx] = p.children[idx], p.children[end]
-        pop!(p.children)
-    end
+    
     if sort 
         sg.sort_cache = topological_sort(get_graph(sg))
         sg.parallel_cache = compute_parallel_levels(sg)
@@ -205,7 +200,10 @@ function merge_graphs!(sg1::CRPlugin, sg2::CRPlugin; sort=true)
         end
     end
 
-    sort && (sg1.sort_cache = topological_sort(get_graph(sg1)))
+    if sort 
+        sg1.sort_cache = topological_sort(get_graph(sg1))
+        sg1.parallel_cache = compute_parallel_levels(sg1)
+    end
 
     return sg1
 end

test/runtests.jl

@@ -1,4 +1,6 @@
-using Cruise
+include("..\\src\\Cruise.jl")
+
+using .Cruise
 using Test
 
 include("test_temp_storage.jl")

test/test_plugins.jl

@@ -102,7 +102,6 @@ end
 
     remove_dependency!(sg, a, b)
     @test !haskey(sg.idtonode[b].deps, Symbol(DummySys))
-    @test !(sg.idtonode[b] in sg.idtonode[a].children)
 end
 
 @testset "merge_graphs! merges without duplicating identical system types" begin