Higher level incident call

src/DiagrammaticEquations.jl

@@ -51,6 +51,7 @@ DerivOp = Symbol("∂ₜ")
 append_dot(s::Symbol) = Symbol(string(s)*'\U0307')
 
 include("acset.jl")
+include("query.jl")
 include("language.jl")
 include("composition.jl")
 include("collages.jl")

src/acset.jl

@@ -235,10 +235,7 @@ See also: [`infer_terminals`](@ref).
 """
 function infer_states(d::SummationDecapode)
   parentless = filter(parts(d, :Var)) do v
-    length(incident(d, v, :tgt)) == 0 &&
-    length(incident(d, v, :res)) == 0 &&
-    length(incident(d, v, :sum)) == 0 &&
-    d[v, :type] != :Literal
+    !is_var_target(d, v) && d[v, :type] != :Literal
   end
   parents_of_tvars =
     union(d[incident(d,:∂ₜ, :op1), :src],
@@ -259,10 +256,7 @@ See also: [`infer_states`](@ref).
 """
 function infer_terminals(d::SummationDecapode)
   filter(parts(d, :Var)) do v
-    length(incident(d, v, :src)) == 0 &&
-    length(incident(d, v, :proj1)) == 0 &&
-    length(incident(d, v, :proj2)) == 0 &&
-    length(incident(d, v, :summand)) == 0
+    !is_var_source(d, v)
   end
 end
 

src/deca/Deca.jl

@@ -10,6 +10,7 @@ export normalize_unicode, varname, infer_types!, resolve_overloads!, typename, s
 
 include("deca_acset.jl")
 include("deca_visualization.jl")
+include("deca_query.jl")
 
 """    function recursive_delete_parents!(d::SummationDecapode, to_delete::Vector{Int64})
 

src/deca/deca_query.jl

@@ -0,0 +1,25 @@
+using DiagrammaticEquations
+using ACSets
+
+export is_var_target, is_var_source, get_variable_parents, get_next_op1s, get_next_op2s
+
+function is_var_target(d::SummationDecapode, var::Int) 
+  return !isempty(collected_incident(d, var, [:tgt, :res, :sum]))
+end
+
+function is_var_source(d::SummationDecapode, var::Int) 
+  return !isempty(collected_incident(d, var, [:src, :proj1, :proj2, :summand]))
+end
+
+function get_variable_parents(d::SummationDecapode, var::Int)
+  return collected_incident(d, var, [:tgt, :res, :res, [:summation, :sum]], [:src, :proj1, :proj2, :summand])
+end
+
+function get_next_op1s(d::SummationDecapode, var::Int)
+  collected_incident(d, var, [:src])
+end
+
+function get_next_op2s(d::SummationDecapode, var::Int)
+  collected_incident(d, var, [:proj1, :proj2])
+end
+

src/query.jl

@@ -0,0 +1,41 @@
+using DiagrammaticEquations
+using ACSets
+
+export collected_incident
+
+function collected_incident(d::ACSet, searches::AbstractVector, args...)
+
+  isempty(searches) && error("Cannot have an empty search")
+
+  query_result = mapreduce(vcat, searches) do search
+    collected_incident(d, search, args...)
+  end
+
+  return unique!(query_result)
+end
+
+function collected_incident(d::ACSet, search, lookup_array)
+  numof_channels = length(lookup_array)
+  empty_outputchannels = fill(nothing, numof_channels)
+  return collected_incident(d, search, lookup_array, empty_outputchannels)
+end
+
+
+function collected_incident(d::ACSet, search, lookup_array, output_array)
+  length(lookup_array) == length(output_array) || error("Input and output channels are different lengths")
+  isempty(lookup_array) && error("Cannot have an empty lookup")
+
+  query_result = mapreduce(vcat, zip(lookup_array, output_array)) do (lookup, output)
+    runincident_output_result(d, search, lookup, output)
+  end
+
+  return unique!(query_result)
+end
+
+function runincident_output_result(d::ACSet, search, lookup::Union{Symbol, AbstractVector{Symbol}}, output_channel::Union{Symbol, Nothing})
+  index_result = incident(d, search, lookup)
+  isnothing(output_channel) ? index_result : d[index_result, output_channel]
+end
+
+
+

test/composition.jl

@@ -25,7 +25,7 @@ trivial_comp_from_vector = oapply(trivial_relation, [otrivial])
 trivial_comp_from_single = oapply(trivial_relation, otrivial)
 
 # Test the oapply is correct.
-@test apex(trivial_comp_from_vector)    == Trivial
+@test apex(trivial_comp_from_vector) == Trivial
 @test apex(trivial_comp_from_single) == Trivial
 # Test none of the decapodes were mutated
 @test isequal(otrivial, deep_copies)

test/deca_query.jl

@@ -0,0 +1,111 @@
+using Test
+using DiagrammaticEquations
+using DiagrammaticEquations.Deca
+using ACSets
+
+function array_contains_same(test, expected)
+    sort(test) == sort(expected)
+end
+
+get_index_from_name(d::SummationDecapode, varname::Symbol) = only(incident(d, varname, :name))
+
+@testset "Check sources and targets" begin
+  singleton_deca = @decapode begin
+    V::infer
+  end
+
+  @test !is_var_source(singleton_deca, 1)
+  @test !is_var_target(singleton_deca, 1)
+
+
+  path_op1_deca = @decapode begin
+    (X,Z)::infer
+    X == d(d(Z)) 
+  end
+
+  idxX = get_index_from_name(path_op1_deca, :X)
+  idxZ = get_index_from_name(path_op1_deca, :Z)
+
+  @test is_var_source(path_op1_deca, idxZ)
+  @test !is_var_target(path_op1_deca, idxZ)
+
+  @test !is_var_source(path_op1_deca, idxX)
+  @test is_var_target(path_op1_deca, idxX)
+
+
+  path_op2_deca = @decapode begin
+    X == ∧(Y,Z) 
+  end
+
+  idxX = get_index_from_name(path_op2_deca, :X)
+  idxY = get_index_from_name(path_op2_deca, :Y)
+  idxZ = get_index_from_name(path_op2_deca, :Z)
+
+  idxsYZ = [idxY, idxZ]
+
+  for idx in idxsYZ
+    @test is_var_source(path_op2_deca, idx)
+    @test !is_var_target(path_op2_deca, idx)
+  end
+  @test !is_var_source(path_op2_deca, idxX)
+  @test is_var_target(path_op2_deca, idxX)
+
+
+  path_sum_deca = @decapode begin
+    X == Y + Z
+  end
+
+  idxX = get_index_from_name(path_sum_deca, :X)
+  idxY = get_index_from_name(path_sum_deca, :Y)
+  idxZ = get_index_from_name(path_sum_deca, :Z)
+
+  idxsYZ = [idxY, idxZ]
+
+  for idx in idxsYZ
+    @test is_var_source(path_sum_deca, idx)
+    @test !is_var_target(path_sum_deca, idx)
+  end
+  @test !is_var_source(path_sum_deca, idxX)
+  @test is_var_target(path_sum_deca, idxX)
+
+  mixedop_deca = @decapode begin
+    Inter == d(X) + ∧(Y, Z)
+    Res == d(Inter)
+  end
+
+  idxX = get_index_from_name(mixedop_deca, :X)
+  idxY = get_index_from_name(mixedop_deca, :Y)
+  idxZ = get_index_from_name(mixedop_deca, :Z)
+  idxInter = get_index_from_name(mixedop_deca, :Inter)
+  idxRes = get_index_from_name(mixedop_deca, :Res)
+
+  @test is_var_source(mixedop_deca, idxX)
+  @test is_var_source(mixedop_deca, idxY)
+  @test is_var_source(mixedop_deca, idxZ)
+
+  @test is_var_target(mixedop_deca, idxRes)
+
+  @test is_var_target(mixedop_deca, idxInter) && is_var_source(mixedop_deca, idxInter)
+end
+
+# TODO: Finish writing these tests
+@testset "Get states and terminals" begin
+  singleton_deca = @decapode begin
+    V::Form1
+  end
+  @test infer_state_names(singleton_deca) == infer_terminal_names(singleton_deca)
+
+  path_op1_deca = @decapode begin
+    (X,Z)::infer
+    X == d(d(Z)) 
+  end
+  @test array_contains_same(infer_state_names(path_op1_deca), [:Z])
+  @test array_contains_same(infer_terminal_names(path_op1_deca), [:X])
+
+  path_op2_deca = @decapode begin
+    (X,Y,Z)::infer
+    X == ∧(Y,Z) 
+  end
+  @test array_contains_same(infer_state_names(path_op2_deca), [:Y, :Z])
+  @test array_contains_same(infer_terminal_names(path_op2_deca), [:X])
+end