From 0a039f7e7bea34fcc552dd8d2c06de17bb7c5f5d Mon Sep 17 00:00:00 2001 From: guilhermebodin Date: Mon, 14 Mar 2022 18:51:44 -0300 Subject: [PATCH] add format check and change cis --- .github/workflows/ci.yml | 4 +- .github/workflows/documentation.yml | 4 +- benchmark/benchmark.jl | 6 +-- src/duals.jl | 16 ++++++-- src/update_parameters.jl | 24 +++++++----- src/utils.jl | 6 +-- test/MOI_wrapper.jl | 7 ++-- test/basic_tests.jl | 12 +----- test/production_problem_test.jl | 12 +----- test/quad_tests.jl | 60 +++++++---------------------- 10 files changed, 54 insertions(+), 97 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a233bd6f..f0a489ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,10 @@ jobs: - version: '1' os: ubuntu-latest arch: x64 - - version: '1.0' + - version: '1.6' os: ubuntu-latest arch: x64 - - version: '1.0' + - version: '1.6' os: ubuntu-latest arch: x86 steps: diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 5a642982..658af04c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -12,8 +12,8 @@ jobs: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@latest with: - # Build documentation on Julia 1.0 - version: '1.0' + # Build documentation on Julia 1.6 + version: '1.6' - name: Install dependencies run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - name: Build and deploy diff --git a/benchmark/benchmark.jl b/benchmark/benchmark.jl index 491b8724..a092e79c 100644 --- a/benchmark/benchmark.jl +++ b/benchmark/benchmark.jl @@ -16,11 +16,7 @@ MOI.Benchmarks.@add_benchmark function add_constraint_svf(new_model) model = new_model() x = MOI.add_variables(model, 10_000) for i in 1:10_000 - MOI.add_constraint( - model, - x[i], - MOI.GreaterThan(1.0), - ) + MOI.add_constraint(model, x[i], MOI.GreaterThan(1.0)) end return end diff --git a/src/duals.jl b/src/duals.jl index 312062c5..80047908 100644 --- a/src/duals.jl +++ b/src/duals.jl @@ -39,8 +39,12 @@ end function update_duals_with_affine_constraint_cache!( param_dual_cum_sum::Vector{Float64}, optimizer::OT, - affine_constraint_cache_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{F, S, V} -) where {OT, F, S, V} + affine_constraint_cache_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{ + F, + S, + V, + }, +) where {OT,F,S,V} for (ci, param_array) in affine_constraint_cache_inner calculate_parameters_in_ci!( param_dual_cum_sum, @@ -76,8 +80,12 @@ end function update_duals_with_quadratic_constraint_cache!( param_dual_cum_sum::Vector{Float64}, model::Optimizer, - quadratic_constraint_cache_pc_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{F, S, V} -) where {F, S, V} + quadratic_constraint_cache_pc_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{ + F, + S, + V, + }, +) where {F,S,V} for (poi_ci, param_array) in quadratic_constraint_cache_pc_inner moi_ci = model.quadratic_added_cache[poi_ci] calculate_parameters_in_ci!( diff --git a/src/update_parameters.jl b/src/update_parameters.jl index 7dc15659..9ef54194 100644 --- a/src/update_parameters.jl +++ b/src/update_parameters.jl @@ -31,7 +31,11 @@ function update_parameter_in_affine_constraints!( optimizer::OT, parameters::Dict{MOI.VariableIndex,T}, updated_parameters::Dict{MOI.VariableIndex,T}, - affine_constraint_cache_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{F, S, V}, + affine_constraint_cache_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{ + F, + S, + V, + }, ) where {OT,T,F,S,V} for (ci, param_array) in affine_constraint_cache_inner update_parameter_in_affine_constraints!( @@ -56,10 +60,8 @@ function update_parameter_in_affine_constraints!( for term in param_array if haskey(updated_parameters, term.variable) # TODO This haskey can be slow param_constant += - term.coefficient * ( - updated_parameters[term.variable] - - parameters[term.variable] - ) + term.coefficient * + (updated_parameters[term.variable] - parameters[term.variable]) end end if param_constant != 0 @@ -268,7 +270,11 @@ function update_parameter_in_vector_affine_constraints!( optimizer::OT, parameters::Dict{MOI.VariableIndex,T}, updated_parameters::Dict{MOI.VariableIndex,T}, - vector_constraint_cache_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{F,S,V}, + vector_constraint_cache_inner::MOI.Utilities.DoubleDicts.DoubleDictInner{ + F, + S, + V, + }, ) where {OT,T,F,S,V} for (ci, param_array) in vector_constraint_cache_inner update_parameter_in_vector_affine_constraints!( @@ -334,11 +340,9 @@ function update_parameters!(model::Optimizer) coef = j.coefficient param_new = model.updated_parameters[j.variable_1] if haskey(constraint_aux_dict, (ci, j.variable_2)) - constraint_aux_dict[(ci, j.variable_2)] += - param_new * coef + constraint_aux_dict[(ci, j.variable_2)] += param_new * coef else - constraint_aux_dict[(ci, j.variable_2)] = - param_new * coef + constraint_aux_dict[(ci, j.variable_2)] = param_new * coef end end end diff --git a/src/utils.jl b/src/utils.jl index 81ddadcc..c8ad5b89 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -103,8 +103,7 @@ function separate_possible_terms_and_calculate_parameter_constant( push!(vars, term) elseif is_parameter_in_model(model, term.variable) push!(params, term) - param_constant += - term.coefficient * model.parameters[term.variable] + param_constant += term.coefficient * model.parameters[term.variable] else error("Constraint uses a variable that is not in the model") end @@ -131,8 +130,7 @@ function separate_possible_terms_and_calculate_parameter_constant( end elseif is_parameter_in_model(model, term.variable) push!(params, term) - param_constant += - term.coefficient * model.parameters[term.variable] + param_constant += term.coefficient * model.parameters[term.variable] else error("Constraint uses a variable that is not in the model") end diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index 0be3e3eb..bef9128b 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -16,8 +16,7 @@ const CONFIG = MOIT.Config() MOIT.runtests( OPTIMIZER_GLPK, CONFIG; - exclude = - [ + exclude = [ "test_attribute_SolverVersion", "test_linear_Interval_inactive", "test_linear_add_constraints", @@ -28,8 +27,8 @@ const CONFIG = MOIT.Config() "test_model_ModelFilter_ListOfConstraintIndices", "test_model_ModelFilter_ListOfConstraintTypesPresent", "test_constraint_ZeroOne_bounds_3", - "test_linear_integration_2" - ] + "test_linear_integration_2", + ], ) end diff --git a/test/basic_tests.jl b/test/basic_tests.jl index ead4ea00..dbbc09ae 100644 --- a/test/basic_tests.jl +++ b/test/basic_tests.jl @@ -9,11 +9,7 @@ cz = MOI.ConstraintIndex{MOI.VariableIndex,POI.Parameter}(4) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end @test_throws ErrorException("Cannot constrain a parameter") MOI.add_constraint( @@ -107,11 +103,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end y, cy = MOI.add_constrained_variable(optimizer, POI.Parameter(0)) diff --git a/test/production_problem_test.jl b/test/production_problem_test.jl index cc502a05..4d16ab9e 100644 --- a/test/production_problem_test.jl +++ b/test/production_problem_test.jl @@ -18,11 +18,7 @@ @test MOI.get(optimizer, MOI.VariablePrimal(), w) == 0 for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end cons1 = MOI.ScalarAffineFunction( @@ -165,11 +161,7 @@ end @test MOI.get(optimizer, MOI.VariablePrimal(), w) == 0 for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end cons1 = MOI.ScalarAffineFunction( diff --git a/test/quad_tests.jl b/test/quad_tests.jl index c4ee42d9..b64d253f 100644 --- a/test/quad_tests.jl +++ b/test/quad_tests.jl @@ -69,16 +69,8 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(1.0), - ) - MOI.add_constraint( - optimizer, - x_i, - MOI.LessThan(5.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(1.0)) + MOI.add_constraint(optimizer, x_i, MOI.LessThan(5.0)) end quad_terms = MOI.ScalarQuadraticTerm{Float64}[] @@ -297,11 +289,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end y, cy = MOI.add_constrained_variable(optimizer, POI.Parameter(0)) @@ -376,11 +364,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end y, cy = MOI.add_constrained_variable(optimizer, POI.Parameter(0)) @@ -456,11 +440,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end MOI.add_constraint(optimizer, x[1], MOI.LessThan(20.0)) @@ -523,11 +503,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end MOI.add_constraint(optimizer, x[1], MOI.LessThan(20.0)) @@ -590,11 +566,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end MOI.add_constraint(optimizer, x[1], MOI.LessThan(20.0)) @@ -739,11 +711,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end y, cy = MOI.add_constrained_variable(optimizer, POI.Parameter(1)) @@ -768,7 +736,11 @@ end MOI.optimize!(optimizer) @test isapprox(MOI.get(optimizer, MOI.ObjectiveValue()), 1.0, atol = ATOL) - @test isapprox(MOI.get(optimizer, MOI.VariablePrimal(), x[1]), 0.0, atol = ATOL) + @test isapprox( + MOI.get(optimizer, MOI.VariablePrimal(), x[1]), + 0.0, + atol = ATOL, + ) @test_throws ErrorException( "Cannot calculate the dual of a multiplicative parameter", @@ -809,11 +781,7 @@ end x = MOI.add_variables(optimizer, 2) for x_i in x - MOI.add_constraint( - optimizer, - x_i, - MOI.GreaterThan(0.0), - ) + MOI.add_constraint(optimizer, x_i, MOI.GreaterThan(0.0)) end y, cy = MOI.add_constrained_variable(optimizer, POI.Parameter(1))