improve wording when internal model is discarded

jump-dev · Feb 2, 2017 · 3da8197 · 3da8197
1 parent 32a3f90
commit 3da8197
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/JuMP.jl b/src/JuMP.jl
@@ -355,7 +355,7 @@ function Variable(m::Model,lower::Number,upper::Number,cat::Symbol,name::Abstrac
         if method_exists(MathProgBase.addvar!, (typeof(m.internalModel),Vector{Int},Vector{Float64},Float64,Float64,Float64))
             MathProgBase.addvar!(m.internalModel,float(lower),float(upper),0.0)
         else
-            Base.warn_once("Solver does not appear to support adding variables to an existing model. Hot-start is disabled.")
+            Base.warn_once("Solver does not appear to support adding variables to an existing model. JuMP's internal model will be discarded.")
             m.internalModelLoaded = false
         end
     end
@@ -775,7 +775,7 @@ function Variable(m::Model,lower::Number,upper::Number,cat::Symbol,objcoef::Numb
         if method_exists(MathProgBase.addvar!, (typeof(m.internalModel),Vector{Int},Vector{Float64},Float64,Float64,Float64))
             MathProgBase.addvar!(m.internalModel,Int[c.idx for c in constraints],coefficients,float(lower),float(upper),float(objcoef))
         else
-            Base.warn_once("Solver does not appear to support adding variables to an existing model. Hot-start is disabled.")
+            Base.warn_once("Solver does not appear to support adding variables to an existing model. JuMP's internal model will be discarded.")
             m.internalModelLoaded = false
         end
     end

diff --git a/src/affexpr.jl b/src/affexpr.jl
@@ -175,7 +175,7 @@ function addconstraint(m::Model, c::LinearConstraint)
             indices, coeffs = merge_duplicates(Cint, c.terms, m.indexedVector, m)
             MathProgBase.addconstr!(m.internalModel,indices,coeffs,c.lb,c.ub)
         else
-            Base.warn_once("Solver does not appear to support adding constraints to an existing model. Hot-start is disabled.")
+            Base.warn_once("Solver does not appear to support adding constraints to an existing model. JuMP's internal model will be discarded.")
             m.internalModelLoaded = false
         end
     end

diff --git a/src/quadexpr.jl b/src/quadexpr.jl
@@ -74,7 +74,7 @@ function setobjective(m::Model, sense::Symbol, q::QuadExpr)
             verify_ownership(m, m.obj.qvars2)
             MathProgBase.setquadobjterms!(m.internalModel, Cint[v.col for v in m.obj.qvars1], Cint[v.col for v in m.obj.qvars2], m.obj.qcoeffs)
         else
-            isa(m.internalModel, MathProgBase.AbstractLinearQuadraticModel) && Base.warn_once("Solver does not support adding a quadratic objective to an existing model. Hot-start is disabled.")
+            isa(m.internalModel, MathProgBase.AbstractLinearQuadraticModel) && Base.warn_once("Solver does not support adding a quadratic objective to an existing model. JuMP's internal model will be discarded.")
             m.internalModelLoaded = false
         end
     end
@@ -143,7 +143,7 @@ function addconstraint(m::Model, c::QuadConstraint)
                                         s,
                                         -c.terms.aff.constant)
         else
-            Base.warn_once("Solver does not appear to support adding quadratic constraints to an existing model. Hot-start is disabled.")
+            Base.warn_once("Solver does not appear to support adding quadratic constraints to an existing model. JuMP's internal model will be discarded.")
             m.internalModelLoaded = false
         end
     end

diff --git a/src/sos.jl b/src/sos.jl
@@ -51,8 +51,7 @@ function addSOS1(m::Model, coll::Vector{AffExpr})
         if applicable(MathProgBase.addsos1!, m.internalModel, idx, weight)
             MathProgBase.addsos1!(m.internalModel, idx, weight)
         else
-            Base.warn_once("Solver does not appear to support adding constraints to an existing model. Hot-start is disabled.")
-            m.internalModelLoaded = false
+            error("Solver does not support SOS constraints")
         end
     end
     return ConstraintRef{Model,SOSConstraint}(m,length(m.sosconstr))
@@ -68,8 +67,7 @@ function addSOS2(m::Model, coll::Vector{AffExpr})
         if applicable(MathProgBase.addsos2!, m.internalModel, idx, weight)
             MathProgBase.addsos2!(m.internalModel, idx, weight)
         else
-            Base.warn_once("Solver does not appear to support adding constraints to an existing model. Hot-start is disabled.")
-            m.internalModelLoaded = false
+            error("Solver does not support SOS constraints")
         end
     end
     return ConstraintRef{Model,SOSConstraint}(m,length(m.sosconstr))