diff --git a/Manifest.toml b/Manifest.toml index c3f119250..b5d4db371 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.10.5" manifest_format = "2.0" -project_hash = "cb280eab35cc3e7e9591c656bf26e09cfd6deb26" +project_hash = "77c0bd9bc2d2b8efcc64c81eafef58824c0d85ae" [[deps.ADTypes]] git-tree-sha1 = "99a6f5d0ce1c7c6afdb759daa30226f71c54f6b0" @@ -1505,16 +1505,22 @@ version = "1.10.0" [[deps.SparseConnectivityTracer]] deps = ["ADTypes", "DocStringExtensions", "FillArrays", "LinearAlgebra", "Random", "Requires", "SparseArrays"] -git-tree-sha1 = "1c2c4fe587a804116d409d8964efda83dfa156ab" +git-tree-sha1 = "b1394f6661cc11728a9b8827c001eeb515656f71" uuid = "9f842d2f-2579-4b1d-911e-f412cf18a3f5" -version = "0.6.2" +version = "0.6.3" [deps.SparseConnectivityTracer.extensions] + SparseConnectivityTracerDataInterpolationsExt = "DataInterpolations" + SparseConnectivityTracerLogExpFunctionsExt = "LogExpFunctions" SparseConnectivityTracerNNlibExt = "NNlib" + SparseConnectivityTracerNaNMathExt = "NaNMath" SparseConnectivityTracerSpecialFunctionsExt = "SpecialFunctions" [deps.SparseConnectivityTracer.weakdeps] + DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" + LogExpFunctions = "2ab3a3ac-af41-5b50-aa03-7779005ae688" NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd" + NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b" [[deps.SparseDiffTools]] diff --git a/core/Project.toml b/core/Project.toml index 314242033..521d86e91 100644 --- a/core/Project.toml +++ b/core/Project.toml @@ -94,7 +94,7 @@ PreallocationTools = "0.4" SQLite = "1.5.1" SciMLBase = "2.36" SparseArrays = "<0.0.1, 1" -SparseConnectivityTracer = "0.6.1" +SparseConnectivityTracer = "0.6.3" StructArrays = "0.6.13" TOML = "<0.0.1, 1" Tables = "1" diff --git a/core/src/util.jl b/core/src/util.jl index 3f3c2a127..c74a36b64 100644 --- a/core/src/util.jl +++ b/core/src/util.jl @@ -890,7 +890,6 @@ function get_jac_prototype(du0, u0, p, t0) end # Custom overloads -(A::AbstractInterpolation)(t::GradientTracer) = t reduction_factor(x::GradientTracer, threshold::Real) = x relaxed_root(x::GradientTracer, threshold::Real) = x get_level_from_storage(basin::Basin, state_idx::Int, storage::GradientTracer) = storage diff --git a/core/test/aqua_test.jl b/core/test/aqua_test.jl index 4c57cabcb..13a0c0f51 100644 --- a/core/test/aqua_test.jl +++ b/core/test/aqua_test.jl @@ -1,12 +1,4 @@ @testitem "Aqua" begin import Aqua - using DataInterpolations: AbstractInterpolation - Aqua.test_all( - Ribasim; - ambiguities = false, - persistent_tasks = false, - # TODO: Remove AbstractInterpolation exception when DataInterpolations - # is supported in SparseConnectivityTracer - piracies = (treat_as_own = [AbstractInterpolation],), - ) + Aqua.test_all(Ribasim; ambiguities = false, persistent_tasks = false) end