FIx up the remaining tests

Author: Samuel-amap

src/dependencies/dependency_graph.jl

@@ -6,8 +6,8 @@ mutable struct HardDependencyNode{T} <: AbstractDependencyNode
     dependency::NamedTuple
     missing_dependency::Vector{Int}
     scale::String
-    #inputs
-    #outputs
+    inputs
+    outputs
     parent::Union{Nothing,<:AbstractDependencyNode}
     children::Vector{HardDependencyNode}
 end
@@ -26,8 +26,8 @@ mutable struct SoftDependencyNode{T} <: AbstractDependencyNode
     value::T
     process::Symbol
     scale::String
-    #inputs
-    #outputs
+    inputs
+    outputs
     hard_dependency::Vector{HardDependencyNode}
     parent::Union{Nothing,Vector{SoftDependencyNode}}
     parent_vars::Union{Nothing,NamedTuple}

src/dependencies/hard_dependencies.jl

@@ -100,8 +100,8 @@ function initialise_all_as_hard_dependency_node(models, scale)
             NamedTuple(),
             Int[],
             scale,
-            #inputs_(i),
-            #outputs_(i),
+            inputs_(i),
+            outputs_(i),
             nothing,
             HardDependencyNode[]
         ) for (p, i) in pairs(models)
@@ -312,8 +312,8 @@ function hard_dependencies(mapping::Dict{String,T}; verbose::Bool=true, orchestr
                     dep_node_model.dependency,
                     dep_node_model.missing_dependency,
                     dep_node_model.scale,
-                    #dep_node_model.inputs,
-                    #dep_node_model.outputs,
+                    dep_node_model.inputs,
+                    dep_node_model.outputs,
                     parent_node,
                     dep_node_model.children
                 )
@@ -386,8 +386,8 @@ function hard_dependencies(mapping::Dict{String,T}; verbose::Bool=true, orchestr
                 soft_dep_vars.value,
                 process_, # process name
                 organ, # scale
-                #inputs_process[organ][process_], # These are the inputs, potentially multiscale
-                #outputs_process[organ][process_], # Same for outputs
+                inputs_process[organ][process_], # These are the inputs, potentially multiscale
+                outputs_process[organ][process_], # Same for outputs
                 AbstractTrees.children(soft_dep_vars), # hard dependencies
                 nothing,
                 nothing,

src/dependencies/soft_dependencies.jl

@@ -64,8 +64,8 @@ function soft_dependencies(d::DependencyGraph{Dict{Symbol,HardDependencyNode}},
             soft_dep_vars.value,
             process_, # process name
             "",
-            #inputs_(soft_dep_vars.value),
-            #outputs_(soft_dep_vars.value),
+            inputs_(soft_dep_vars.value),
+            outputs_(soft_dep_vars.value),
             AbstractTrees.children(soft_dep_vars), # hard dependencies
             nothing,
             nothing,

src/mtg/mapping/compute_mapping.jl

@@ -11,7 +11,7 @@ However, models that are identified as hard-dependencies are not given individua
 nodes under other models.
 - `verbose::Bool`: whether to print the stacktrace of the search for the default value in the mapping.
 """
-function mapped_variables(mapping, dependency_graph; verbose=false, orchestrator=Orchestrator())
+function mapped_variables(mapping, dependency_graph=first(hard_dependencies(mapping; verbose=false, orchestrator=Orchestrator())); verbose=false, orchestrator=Orchestrator())
     # Initialise a dict that defines the multiscale variables for each organ type:
     mapped_vars = mapped_variables_no_outputs_from_other_scale(mapping, dependency_graph)
 

test/runtests.jl

@@ -72,6 +72,10 @@ include("helper-functions.jl")
         include("test-performance.jl")
     end
 
+    @testset "Multi timestep" begin
+        #include("test-multitimestep.jl")
+    end
+
     if VERSION >= v"1.10"
         # Some formating changed in Julia 1.10, e.g. @NamedTuple instead of NamedTuple.
         @testset "Doctests" begin