From 5a954db6d9edfb2e4eae1b8f469bfff95678472f Mon Sep 17 00:00:00 2001 From: Joshua Pulsipher <33848311+pulsipher@users.noreply.github.com> Date: Fri, 3 Dec 2021 17:47:22 +0100 Subject: [PATCH] v0.5.1 Compat fixes (#186) * v0.5.0 prep * prep 0.5.1 * Further 0.5.1 prep * more fixes * More fixes --- Project.toml | 4 ++-- docs/Project.toml | 3 +-- test/array_parameters.jl | 4 ++-- test/extensions.jl | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Project.toml b/Project.toml index f0f2fb2b7..3ef143aae 100644 --- a/Project.toml +++ b/Project.toml @@ -23,8 +23,8 @@ FastGaussQuadrature = "0.3.2 - 0.4" JuMP = "0.22" LeftChildRightSiblingTrees = "0.1" MutableArithmetics = "0.3" -Reexport = "0.2 - 1" -SpecialFunctions = "0.8 - 2" +Reexport = "0.2, 1" +SpecialFunctions = "0.8 - 0.10, 1, 2" julia = "^1.6" [extras] diff --git a/docs/Project.toml b/docs/Project.toml index b9e603122..2a06dfc21 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -15,8 +15,7 @@ Clp = "0.9" Distributions = "0.25" Documenter = "0.27" InfiniteOpt = "0.5" -Ipopt = "0.8" +Ipopt = "0.9" Literate = "2.9" Plots = "1" -SpecialFunctions = "1.8, 2" julia = "1.6" diff --git a/test/array_parameters.jl b/test/array_parameters.jl index dcd4bf111..ff107745c 100644 --- a/test/array_parameters.jl +++ b/test/array_parameters.jl @@ -58,7 +58,7 @@ end sdomain1 = IntervalDomain(0, 1) sdomain2 = UniDistributionDomain(Uniform()) domain1 = CollectionDomain([sdomain1, sdomain1]) - domain2 = MultiDistributionDomain(MvNormal(ones(2))) + domain2 = MultiDistributionDomain(MvNormal(Diagonal(map(abs2, ones(2))))) domain3 = MultiDistributionDomain(MatrixBeta(2, 2, 2)) domain4 = CollectionDomain([sdomain1, sdomain2]) inds1 = IC.indices(ones(2)) @@ -163,7 +163,7 @@ end # Setup data m = InfiniteModel(); dist1 = Uniform() - dist2 = MvNormal(ones(2)) + dist2 = MvNormal(Diagonal(map(abs2, ones(2)))) dist3 = MatrixBeta(2, 2, 2) sdomain1 = IntervalDomain(0, 1) sdomain2 = UniDistributionDomain(dist1) diff --git a/test/extensions.jl b/test/extensions.jl index b190e5c4b..dc5a83c39 100644 --- a/test/extensions.jl +++ b/test/extensions.jl @@ -256,7 +256,7 @@ end MOI.set(mockoptimizer, MOI.ResultCount(), 2) MOI.set(mockoptimizer, MOI.PrimalStatus(1), MOI.FEASIBLE_POINT) MOI.set(mockoptimizer, MOI.DualStatus(1), MOI.FEASIBLE_POINT) - MOI.set(mockoptimizer, MOI.SolveTime(), 0.42) + MOI.set(mockoptimizer, MOI.SolveTimeSec(), 0.42) MOI.set(mockoptimizer, MOI.ObjectiveValue(), -1.0) MOI.set(mockoptimizer, MOI.ObjectiveBound(), 2.0) MOI.set(mockoptimizer, MOI.VariablePrimal(),