Rework node operations storage, remove make_edge from insert_edge calls

This commit is contained in:
2023-08-23 19:28:45 +02:00
parent a81aafbf20
commit c365233ea4
16 changed files with 421 additions and 363 deletions

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)