Update to JuMP v1 (#17)

nexteraanalytics · May 4, 2022 · f6d3a95 · f6d3a95 · ianfiske · May 4, 2022
1 parent 463d79d
commit f6d3a95
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,8 @@
 language: julia
 
 julia:
-  - 1.1
-  - 1
+  - 1.6
+  - 1.7
 
 os:
   - linux

diff --git a/Project.toml b/Project.toml
@@ -1,17 +1,17 @@
 name = "LinearFractional"
 uuid = "31851ddc-f9b7-5097-a470-69ef907d7682"
-version = "0.7.4"
+version = "0.7.5"
 
 [deps]
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 
 [compat]
-JuMP = "^0.21"
+JuMP = "^1"
 MacroTools = "^0.5"
-MathOptInterface = "^0.9"
-julia = "^1"
+MathOptInterface = "^1"
+julia = "^1.6"
 
 [extras]
 Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"

diff --git a/src/LinearFractional.jl b/src/LinearFractional.jl
@@ -48,7 +48,6 @@ import JuMP: @constraint,
     linear_terms,
     index,
     Containers,
-    variable_type,
     ScalarVariable,
     add_variable,
     constant,
@@ -98,10 +97,10 @@ mutable struct LinearFractionalModel <: AbstractModel
 end
 
 function LinearFractionalModel(optimizer;
-               bridge_constraints::Bool=true, kwargs...)
+               add_bridges::Bool=true, kwargs...)
     model = LinearFractionalModel(; kwargs...)
     JuMP.set_optimizer(model.model, optimizer,
-                  bridge_constraints=bridge_constraints)
+                  add_bridges=add_bridges)
     return model
 end
 
@@ -161,7 +160,6 @@ Base.copy(v::LinearFractionalVariableRef, new_model::LinearFractionalModel) = Li
 Base.:(==)(v::LinearFractionalVariableRef, w::LinearFractionalVariableRef) = v.model === w.model && (v.vref == w.vref)
 Base.broadcastable(v::LinearFractionalVariableRef) = Ref(v)
 JuMP.isequal_canonical(v::LinearFractionalVariableRef, w::LinearFractionalVariableRef) = v == w
-JuMP.variable_type(::LinearFractionalModel) = LinearFractionalVariableRef
 function JuMP.add_variable(m::LinearFractionalModel, v::JuMP.AbstractVariable, name::String="")
 
     inner_vref = JuMP.add_variable(m.model, v, name)
@@ -255,7 +253,6 @@ function transform_constraint(model::LinearFractionalModel, constraint_ref::Cons
     JuMP.set_normalized_coefficient(constraint_ref, model.t, -α)
 end
 
-JuMP.constraint_type(::LinearFractionalModel) = ConstraintRef
 function JuMP.add_constraint(model::LinearFractionalModel, c::JuMP.AbstractConstraint,
                              name::String="")
     cref = JuMP.add_constraint(model.model, c, name)
-Original file line number
+Diff line change
@@ -1,8 +1,8 @@
     language: julia
     julia:
-      - 1.1
-      - 1
+      - 1.6
+      - 1.7
     os:
       - linux
@@ Expand Down @@