Merge pull request #339 from Neuroblox/bump-compat

Bump some compat bounds

Project.toml

@@ -72,7 +72,7 @@ ForwardDiff = "0.10"
 Glob = "1"
 Graphs = "1"
 HypothesisTests = "0.11"
-Interpolations = "0.14"
+Interpolations = "0.14, 0.15"
 JLD2 = "0.4"
 MAT = "0.10"
 MLJ = "0.20"
@@ -82,11 +82,11 @@ MuladdMacro = "0.2"
 NaNStatistics = "0.6"
 Optim = "1"
 Optimization = "3"
-OptimizationOptimJL = "0.1"
-OptimizationOptimisers = "0.1"
+OptimizationOptimJL = "0.2"
+OptimizationOptimisers = "0.2"
 OrderedCollections = "1.4"
 OrdinaryDiffEq = "6"
-RecursiveArrayTools = "2"
+RecursiveArrayTools = "2, 3"
 Reexport = "1.0"
 SafeTestsets = "0.1"
 SignalAnalysis = "0.6"

src/blox/blox_utilities.jl

@@ -58,7 +58,7 @@ function get_namespaced_sys(blox)
     sys = get_sys(blox)
     ODESystem(
         equations(sys), 
-        independent_variable(sys), 
+        only(independent_variables(sys)), 
         states(sys), 
         parameters(sys); 
         name = namespaced_nameof(blox)
@@ -289,4 +289,4 @@ function addnontunableparams(paramlist, sys)
     end
     append!(completeparamlist, paramlist[k+1:end])
     return completeparamlist
-end
+end

test/components.jl

@@ -177,9 +177,9 @@ end
     sol = simulate(structural_simplify(macroscopic_model.odesystem), [0.5 + 0.0im, 1.6 + 0.0im], (0.0, sim_dur), [], Tsit5(); saveat=0.01,reltol=1e-4,abstol=1e-4)
 
     C=30
-    W = (1 .- conj.(sol[!,"Z(t)"]))./(1 .+ conj.(sol[!,"Z(t)"]))
+    W = (1 .- conj.(sol[!,"Z"]))./(1 .+ conj.(sol[!,"Z"]))
     R = (1/(C*pi))*(W+conj.(W))/2
-    ψ = log.(sol[!,"Z(t)"]./R)/im
+    ψ = log.(sol[!,"Z"]./R)/im
 
     @test norm.(R[length(R)]) < 0.1
 end