Skip to content

Relax OUQBase OrderedCollections floor for Polynomials downgrade resolve #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChrisRackauckas merged 8 commits into from
Aug 27, 2026
Merged

Relax OUQBase OrderedCollections floor for Polynomials downgrade resolve #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4b8810
Relax OUQBase OrderedCollections floor for Polynomials downgrade resolve
ChrisRackauckas Aug 27, 2026
b6d9ca9
Bump DiscreteMeasures IntervalArithmetic floor to 1.0.11
ChrisRackauckas Aug 27, 2026
2a3d61e
Require SciMLLogging 2.1 in OUQBase tests for @SciMLMessage
ChrisRackauckas Aug 27, 2026
caf4ece
ci: re-trigger downgrade after Actions queue stall
ChrisRackauckas Aug 27, 2026
2055d1d
Align CanonicalMoments IntervalArithmetic floor with DiscreteMeasures
ChrisRackauckas Aug 27, 2026
da5c997
Bump CanonicalMoments Symbolics floor to 7.37
ChrisRackauckas Aug 27, 2026
3184870
Bump OUQBase OptimizationBBO floor to 0.4.11 for @SciMLMessage
ChrisRackauckas Aug 27, 2026
4f10900
Use IntervalArithmetic 1.x interval()/emptyinterval() in DiscreteMeas…
ChrisRackauckas Aug 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/CanonicalMoments/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -43,7 +43,7 @@ SciMLPublic = "1"
SpecialFunctions = "2"
StaticArrays = "1"
Statistics = "1.10"
Symbolics = "7.30"
Symbolics = "7.37"
Test = "1.10"

[sources]
Expand Down
2 changes: 1 addition & 1 deletion lib/DiscreteMeasures/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/DiscreteMeasures/ext/IntervalArithmeticExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions lib/DiscreteMeasures/test/Core/discrete_measures_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 6 additions & 4 deletions lib/OUQBase/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"]
Loading