rubydragon/metagraphoptimization.jl
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Rework node operations storage, remove make_edge from insert_edge calls

Browse Source
This commit is contained in:
Anton Reinhard
2023-08-23 19:28:45 +02:00
parent a81aafbf20
commit c365233ea4
16 changed files with 421 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/node_reduction.jl
View File

@ -1,7 +1,6 @@
import MetagraphOptimization.insert_node!
import MetagraphOptimization.insert_edge!
import MetagraphOptimization.make_node
import MetagraphOptimization.make_edge
@testset "Unit Tests Node Reduction" begin
graph = MetagraphOptimization.DAG()
@ -30,27 +29,27 @@ import MetagraphOptimization.make_edge
BD = insert_node!(graph, make_node(DataTask(5)), false)
CD = insert_node!(graph, make_node(DataTask(5)), false)
insert_edge!(graph, make_edge(s0, d_exit), false)
insert_edge!(graph, make_edge(ED, s0), false)
insert_edge!(graph, make_edge(FD, s0), false)
insert_edge!(graph, make_edge(EC, ED), false)
insert_edge!(graph, make_edge(FC, FD), false)
insert_edge!(graph, s0, d_exit, false)
insert_edge!(graph, ED, s0, false)
insert_edge!(graph, FD, s0, false)
insert_edge!(graph, EC, ED, false)
insert_edge!(graph, FC, FD, false)
insert_edge!(graph, make_edge(A1D, EC), false)
insert_edge!(graph, make_edge(B1D_1, EC), false)
insert_edge!(graph, A1D, EC, false)
insert_edge!(graph, B1D_1, EC, false)
insert_edge!(graph, make_edge(B1D_2, FC), false)
insert_edge!(graph, make_edge(C1D, FC), false)
insert_edge!(graph, B1D_2, FC, false)
insert_edge!(graph, C1D, FC, false)
insert_edge!(graph, make_edge(A1C, A1D), false)
insert_edge!(graph, make_edge(B1C_1, B1D_1), false)
insert_edge!(graph, make_edge(B1C_2, B1D_2), false)
insert_edge!(graph, make_edge(C1C, C1D), false)
insert_edge!(graph, A1C, A1D, false)
insert_edge!(graph, B1C_1, B1D_1, false)
insert_edge!(graph, B1C_2, B1D_2, false)
insert_edge!(graph, C1C, C1D, false)
insert_edge!(graph, make_edge(AD, A1C), false)
insert_edge!(graph, make_edge(BD, B1C_1), false)
insert_edge!(graph, make_edge(BD, B1C_2), false)
insert_edge!(graph, make_edge(CD, C1C), false)
insert_edge!(graph, AD, A1C, false)
insert_edge!(graph, BD, B1C_1, false)
insert_edge!(graph, BD, B1C_2, false)
insert_edge!(graph, CD, C1C, false)
@test is_exit_node(d_exit)
@test is_entry_node(AD)

51
test/unit_tests_graph.jl
View File

@ -1,7 +1,6 @@
import MetagraphOptimization.insert_node!
import MetagraphOptimization.insert_edge!
import MetagraphOptimization.make_node
import MetagraphOptimization.make_edge
import MetagraphOptimization.siblings
import MetagraphOptimization.partners
@ -69,38 +68,38 @@ import MetagraphOptimization.partners
@test length(graph.dirtyNodes) == 26
# now for all the edgese
insert_edge!(graph, make_edge(d_PB, PB), false)
insert_edge!(graph, make_edge(d_PA, PA), false)
insert_edge!(graph, make_edge(d_PBp, PBp), false)
insert_edge!(graph, make_edge(d_PAp, PAp), false)
insert_edge!(graph, d_PB, PB, false)
insert_edge!(graph, d_PA, PA, false)
insert_edge!(graph, d_PBp, PBp, false)
insert_edge!(graph, d_PAp, PAp, false)
insert_edge!(graph, make_edge(PB, d_PB_uB), false)
insert_edge!(graph, make_edge(PA, d_PA_uA), false)
insert_edge!(graph, make_edge(PBp, d_PBp_uBp), false)
insert_edge!(graph, make_edge(PAp, d_PAp_uAp), false)
insert_edge!(graph, PB, d_PB_uB, false)
insert_edge!(graph, PA, d_PA_uA, false)
insert_edge!(graph, PBp, d_PBp_uBp, false)
insert_edge!(graph, PAp, d_PAp_uAp, false)
insert_edge!(graph, make_edge(d_PB_uB, uB), false)
insert_edge!(graph, make_edge(d_PA_uA, uA), false)
insert_edge!(graph, make_edge(d_PBp_uBp, uBp), false)
insert_edge!(graph, make_edge(d_PAp_uAp, uAp), false)
insert_edge!(graph, d_PB_uB, uB, false)
insert_edge!(graph, d_PA_uA, uA, false)
insert_edge!(graph, d_PBp_uBp, uBp, false)
insert_edge!(graph, d_PAp_uAp, uAp, false)
insert_edge!(graph, make_edge(uB, d_uB_v0), false)
insert_edge!(graph, make_edge(uA, d_uA_v0), false)
insert_edge!(graph, make_edge(uBp, d_uBp_v1), false)
insert_edge!(graph, make_edge(uAp, d_uAp_v1), false)
insert_edge!(graph, uB, d_uB_v0, false)
insert_edge!(graph, uA, d_uA_v0, false)
insert_edge!(graph, uBp, d_uBp_v1, false)
insert_edge!(graph, uAp, d_uAp_v1, false)
insert_edge!(graph, make_edge(d_uB_v0, v0), false)
insert_edge!(graph, make_edge(d_uA_v0, v0), false)
insert_edge!(graph, make_edge(d_uBp_v1, v1), false)
insert_edge!(graph, make_edge(d_uAp_v1, v1), false)
insert_edge!(graph, d_uB_v0, v0, false)
insert_edge!(graph, d_uA_v0, v0, false)
insert_edge!(graph, d_uBp_v1, v1, false)
insert_edge!(graph, d_uAp_v1, v1, false)
insert_edge!(graph, make_edge(v0, d_v0_s0), false)
insert_edge!(graph, make_edge(v1, d_v1_s0), false)
insert_edge!(graph, v0, d_v0_s0, false)
insert_edge!(graph, v1, d_v1_s0, false)
insert_edge!(graph, make_edge(d_v0_s0, s0), false)
insert_edge!(graph, make_edge(d_v1_s0, s0), false)
insert_edge!(graph, d_v0_s0, s0, false)
insert_edge!(graph, d_v1_s0, s0, false)
insert_edge!(graph, make_edge(s0, d_exit), false)
insert_edge!(graph, s0, d_exit, false)
@test length(graph.nodes) == 26
@test length(graph.appliedOperations) == 0