🚧 Extract aliasing dicts from Internals.

BecksLab · Sep 18, 2023 · ceda5ef · ceda5ef
1 parent 6502cc2
commit ceda5ef
Show file tree

Hide file tree

Showing 8 changed files with 446 additions and 330 deletions.
diff --git a/src/EcologicalNetworksDynamics.jl b/src/EcologicalNetworksDynamics.jl
@@ -1,5 +1,9 @@
 module EcologicalNetworksDynamics
 
+# Improve APIs comfort.
+include("./aliasing_dicts.jl")
+using .AliasingDicts
+
 # The entire implementation has been brutally made private
 # so that we can focus on constructing
 # an implementation-independent API on top of it, from scratch.

diff --git a/src/Internals/Internals.jl b/src/Internals/Internals.jl
@@ -38,6 +38,8 @@ using Statistics
 using Decimals
 using SciMLBase
 
+using ..AliasingDicts
+
 const Solution = SciMLBase.AbstractODESolution
 
 include(joinpath(".", "macros.jl"))

diff --git a/src/Internals/aliasing_dict.jl b/src/Internals/aliasing_dict.jl
diff --git a/src/Internals/inputs/MultiplexNetwork_signature.jl b/src/Internals/inputs/MultiplexNetwork_signature.jl
@@ -2,12 +2,12 @@
 # to make the sophisticated signature of the MultiplexNetwork() function work.
 
 # For use within this file.
-pstandards() = standards(MultiplexParametersDict)
-istandards() = standards(InteractionDict)
-pstandard(p) = standardize(p, MultiplexParametersDict)
-istandard(i) = standardize(i, InteractionDict)
-p_references() = references(MultiplexParametersDict)
-i_references() = references(InteractionDict)
+pstandards() = AliasingDicts.standards(MultiplexParametersDict)
+istandards() = AliasingDicts.standards(InteractionDict)
+pstandard(p) = AliasingDicts.standardize(p, MultiplexParametersDict)
+istandard(i) = AliasingDicts.standardize(i, InteractionDict)
+p_references() = AliasingDicts.references(MultiplexParametersDict)
+i_references() = AliasingDicts.references(InteractionDict)
 
 ############################################################################################
 # Protect against aliasing ambiguity. ######################################################
@@ -171,7 +171,7 @@ function parse_MultiplexNetwork_arguments(foodweb, args)
         for ArgType in [ParmIntNestedArg, IntParmNestedArg]
             ro = reorder(ArgType)
             FirstDict, NestedDict = ro(MultiplexParametersDict, InteractionDict)
-            if arg in references(FirstDict)
+            if arg in AliasingDicts.references(FirstDict)
                 found_transversal = true
                 try
                     # Scroll sub-arguments within the nested specification.
@@ -335,14 +335,14 @@ function parse_MultiplexNetwork_arguments(foodweb, args)
     # Anything not provided by user is set to default.
     # During this step, drop arguments name informations (eg. (arg, V) -> V).
     for parm in pstandards(), int in istandards()
-        if isin(parm, [:C, :L, :symmetry], MultiplexParametersDict)
+        if AliasingDicts.isin(parm, [:C, :L, :symmetry], MultiplexParametersDict)
             # These annex parameters don't need defaults.
             continue
         end
         if !already(parm, int)
             # Missing: read from defaults.
             def = defaults[parm][int]
-            if is(parm, :A, MultiplexParametersDict)
+            if AliasingDicts.is(parm, :A, MultiplexParametersDict)
                 # Special case: this default is a function of the foodweb.
                 def = def(foodweb)
             end