Internalize collate and compile Collage

AlgebraicJulia · Oct 20, 2023 · a25f9c6 · a25f9c6
1 parent fa8130d
commit a25f9c6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/src/Decapodes.jl b/src/Decapodes.jl
@@ -24,7 +24,7 @@ export normalize_unicode, DerivOp, append_dot, unicode!, vec_to_dec!,
   CartesianPoint, SpherePoint, r, theta, phi, TangentBasis, θhat, ϕhat,
   average_rewrite, recursive_delete_parents, contract_operators,
   default_dec_matrix_generate, default_dec_generate, 
-  collate,
+  Collage,
   @decapode
 
 normalize_unicode(s::String) = Unicode.normalize(s, compose=true, stable=true, chartransform=Unicode.julia_chartransform)

diff --git a/src/collages.jl b/src/collages.jl
@@ -1,5 +1,14 @@
 
-"""    function collate(acset, column_names::Vector{Symbol})
+struct Collage
+  src::SummationDecapode{Any,Any,Symbol}
+  tgt::SummationDecapode{Any,Any,Symbol}
+  uwd::Catlab.Programs.RelationalPrograms.UntypedUnnamedRelationDiagram{Symbol, Symbol}
+  symbols::Dict{Symbol, Symbol}
+end
+
+collate(c::Collage) = collate(c.src, c.tgt, c.uwd, c.symbols)
+
+"""    function collate(equations, boundaries, uwd, symbols)
 
 Create a collage of two Decapodes that simulates with boundary conditions.
 ```

diff --git a/src/simulation.jl b/src/simulation.jl
@@ -436,6 +436,9 @@ function gensim(user_d::AbstractNamedDecapode, input_vars; dimension::Int=2)
     end
 end
 
+gensim(c::Collage; dimension::Int=2) = 
+    gensim(collate(c); dimension=dimension)
+
 """    function gensim(d::AbstractNamedDecapode; dimension::Int=2)
 
 Generate a simulation function from the given Decapode. The returned function can then be combined with a mesh and a function describing function mappings to return a simulator to be passed to `solve`.

diff --git a/test/collages.jl b/test/collages.jl
@@ -27,17 +27,18 @@ DiffusionMorphism = @relation () begin
   rb3(Ċ, Zero)
 end
 
-DiffusionCollage = collate(
+DiffusionSymbols = Dict(
+  :C => :K,
+  :Ċ => :K̇,
+  :Cb1 => :Kb1,
+  :Cb2 => :Kb2,
+  :Zero => :Null)
+
+DiffusionCollage = Decapodes.collate(
   DiffusionDynamics,
   DiffusionBoundaries,
   DiffusionMorphism,
-  Dict(
-    :C => :K,
-    :Ċ => :K̇,
-    :Cb1 => :Kb1,
-    :Cb2 => :Kb2,
-    :Zero => :Null))
-#to_graphviz(DiffusionCollage)
+  DiffusionSymbols)
 
 @test DiffusionCollage == @acset SummationDecapode{Any, Any, Symbol} begin
   Var = 8
@@ -65,3 +66,9 @@ end
 #  ∂ₜ(C) == rb3(∘(d,⋆,d,⋆)(rb2(C)))
 #end
 # Such a technique would preserve the technical definition of "collage".
+
+# Test gensim on a collage.
+c = Collage(DiffusionDynamics, DiffusionBoundaries,
+  DiffusionMorphism, DiffusionSymbols)
+
+@test gensim(c) == gensim(DiffusionCollage)