diff --git a/lib/CanonicalMoments/Project.toml b/lib/CanonicalMoments/Project.toml index b957770..65ab460 100644 --- a/lib/CanonicalMoments/Project.toml +++ b/lib/CanonicalMoments/Project.toml @@ -30,7 +30,7 @@ ChainRulesCore = "1" DiscreteMeasures = "0.1" ForwardDiff = "1" InteractiveUtils = "1.10" -IntervalArithmetic = "1" +IntervalArithmetic = "1.0.11" LinearAlgebra = "1.10" Pkg = "1.10" PolynomialRoots = "1.0" @@ -43,7 +43,7 @@ SciMLPublic = "1" SpecialFunctions = "2" StaticArrays = "1" Statistics = "1.10" -Symbolics = "7.30" +Symbolics = "7.37" Test = "1.10" [sources] diff --git a/lib/DiscreteMeasures/Project.toml b/lib/DiscreteMeasures/Project.toml index f5727b1..00fe044 100644 --- a/lib/DiscreteMeasures/Project.toml +++ b/lib/DiscreteMeasures/Project.toml @@ -11,7 +11,7 @@ IntervalArithmeticExt = "IntervalArithmetic" [compat] julia = "1.10" -IntervalArithmetic = "1" +IntervalArithmetic = "1.0.11" Pkg = "1.10" SafeTestsets = "0.1" Test = "1.10" diff --git a/lib/DiscreteMeasures/ext/IntervalArithmeticExt.jl b/lib/DiscreteMeasures/ext/IntervalArithmeticExt.jl index 37a04fc..62ae7ca 100644 --- a/lib/DiscreteMeasures/ext/IntervalArithmeticExt.jl +++ b/lib/DiscreteMeasures/ext/IntervalArithmeticExt.jl @@ -4,7 +4,7 @@ using DiscreteMeasures, IntervalArithmetic println("Load Ext") function DiscreteMeasures.clamp_domain(x::Interval, lb, ub) - bounds = Interval(lb, ub) + bounds = interval(lb, ub) return intersect(x, bounds) end diff --git a/lib/DiscreteMeasures/test/Core/discrete_measures_tests.jl b/lib/DiscreteMeasures/test/Core/discrete_measures_tests.jl index 1f5d4b6..14a48ab 100644 --- a/lib/DiscreteMeasures/test/Core/discrete_measures_tests.jl +++ b/lib/DiscreteMeasures/test/Core/discrete_measures_tests.jl @@ -91,11 +91,11 @@ end end @testset "Interval Ext" begin - @test clamp_domain(Interval(-2, -1), 0, 2) == ∅ - @test clamp_domain(Interval(-2, 1), 0, 2) == Interval(0, 1) - @test clamp_domain(Interval(0.1, 0.5), 0, 2) == Interval(0.1, 0.5) - @test clamp_domain(Interval(0.5, 5), 0, 2) == Interval(0.5, 2) - @test clamp_domain(Interval(3, 4), 0, 2) == ∅ + @test clamp_domain(interval(-2, -1), 0, 2) == emptyinterval() + @test clamp_domain(interval(-2, 1), 0, 2) == interval(0, 1) + @test clamp_domain(interval(0.1, 0.5), 0, 2) == interval(0.1, 0.5) + @test clamp_domain(interval(0.5, 5), 0, 2) == interval(0.5, 2) + @test clamp_domain(interval(3, 4), 0, 2) == emptyinterval() end end diff --git a/lib/OUQBase/Project.toml b/lib/OUQBase/Project.toml index f1b30be..8536e91 100644 --- a/lib/OUQBase/Project.toml +++ b/lib/OUQBase/Project.toml @@ -30,15 +30,16 @@ JuMP = "1.23.6" ModelingToolkit = "11.31" NaNMath = "1.1.3" Optimization = "5" -OptimizationBBO = "0.4" -OrderedCollections = "2.0" +OptimizationBBO = "0.4.11" +OrderedCollections = "1.7.0, 2.0" Pkg = "1.10" Polynomials = "4.0.13" Reexport = "1.2.2" SciMLBase = "3.31" +SciMLLogging = "2.1" SafeTestsets = "0.1" SymbolicUtils = "4.38" -Symbolics = "7.30" +Symbolics = "7.37" TermInterface = "2" Test = "1.10" @@ -50,7 +51,8 @@ DiscreteMeasures = { path = "../DiscreteMeasures" } OptimizationBBO = "3e6eede4-6085-4f62-9a71-46d9bc1eb92b" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" +SciMLLogging = "a6db7da4-7206-11f0-1eab-35f2a5dbe1d1" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["OptimizationBBO", "Pkg", "SafeTestsets", "Test"] +test = ["OptimizationBBO", "Pkg", "SafeTestsets", "SciMLLogging", "Test"]