Skip to content
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

Jump to bottom

Clean ups, dead code removal #1405

Merged
merged 6 commits into from Aug 5, 2018
Merged

Clean ups, dead code removal #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ecef8a1
Clean up some exported things that weren't defined
IainNZ Aug 5, 2018
8703b71
Clean up JuMPTypes mess.
IainNZ Aug 5, 2018
b5fb9aa
Hoist object_dictionary up to getters, document required
IainNZ Aug 5, 2018
9b8bdcc
Removed unused customnames field
IainNZ Aug 5, 2018
34a19f2
Remove two commented out includes
IainNZ Aug 5, 2018
08def45
ForwardDiff: use import, using was not necessary
IainNZ Aug 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
55 changes: 5 additions & 50 deletions src/JuMP.jl
View file
Open in desktop
Expand Up @@ -22,37 +22,20 @@ const MOIU = MOI.Utilities

import Calculus
import DataStructures.OrderedDict
using ForwardDiff
import ForwardDiff
include("Derivatives/Derivatives.jl")
using .Derivatives

export
# Objects
Model, VariableRef, Norm, AffExpr, QuadExpr,
Model, VariableRef, AffExpr, QuadExpr,
with_optimizer,
# LinearConstraint, QuadConstraint, SDConstraint,
NonlinearConstraint,
ConstraintRef,
# Cones
SecondOrderCone, RotatedSecondOrderCone, PSDCone,
# Functions
# Model related
setobjectivesense,
writeLP, writeMPS,
#addSOS1, addSOS2,
optimize,
internalmodel,
# VariableRef
setname,
#getname,
setlowerbound, setupperbound,
#getlowerbound, getupperbound,
#getvalue, setvalue,
#getdual,
#setcategory, getcategory,
setstartvalue,
linearindex,
# Expressions and constraints
linearterms,

# Macros and support functions
Expand Down Expand Up @@ -139,25 +122,22 @@ end
@enum ModelMode Automatic Manual Direct

abstract type AbstractModel end
# All `AbstractModels` must define `num_variables`.
# All `AbstractModel`s must define methods for these functions:
# num_variables, object_dictionary

"""
Model

A mathematical model of an optimization problem.
"""
mutable struct Model <: AbstractModel

# Special variablewise properties that we keep track of:
# lower bound, upper bound, fixed, integrality, binary
variabletolowerbound::Dict{MOIVAR, MOILB}
variabletoupperbound::Dict{MOIVAR, MOIUB}
variabletofix::Dict{MOIVAR, MOIFIX}
variabletointegrality::Dict{MOIVAR, MOIINT}
variabletozeroone::Dict{MOIVAR, MOIBIN}

customnames::Vector

# In Manual and Automatic modes, LazyBridgeOptimizer{CachingOptimizer}.
# In Direct mode, will hold an AbstractOptimizer.
moibackend::MOI.AbstractOptimizer
Expand Down Expand Up @@ -190,7 +170,6 @@ function Model(moibackend::MOI.ModelLike)
Dict{MOIVAR, MOIFIX}(),
Dict{MOIVAR, MOIINT}(),
Dict{MOIVAR, MOIBIN}(),
VariableRef[],
moibackend,
nothing,
nothing,
Expand Down Expand Up @@ -353,6 +332,7 @@ end

# TODO(IainNZ): Document these too.
# TODO(#1381): Implement Base.copy for Model.
object_dictionary(model::Model) = model.objdict
terminationstatus(m::Model) = MOI.get(m, MOI.TerminationStatus())
primalstatus(m::Model) = MOI.get(m, MOI.PrimalStatus())
dualstatus(m::Model) = MOI.get(m, MOI.DualStatus())
Expand All @@ -364,7 +344,6 @@ setoptimizehook(m::Model, f) = (m.optimizehook = f)
# Abstract base type for all constraint types
abstract type AbstractConstraint end
# Abstract base type for all scalar types
# In JuMP, used only for VariableRef. Useful primarily for extensions
abstract type AbstractJuMPScalar end


Expand Down Expand Up @@ -558,9 +537,6 @@ function registercon(m::AbstractModel, conname::Symbol, value)
end
registercon(m::AbstractModel, conname, value) = error("Invalid constraint name $conname")

# This function needs to be implemented by all `AbstractModel`s
object_dictionary(m::Model) = m.objdict

function registerobject(m::AbstractModel, name::Symbol, value, errorstring::String)
objdict = object_dictionary(m)
if haskey(objdict, name)
Expand Down Expand Up @@ -642,32 +618,11 @@ struct NonlinearParameter <: AbstractJuMPScalar
index::Int
end


##########################################################################
# Behavior that's uniform across all JuMP "scalar" objects

# TODO why do we need this?
const JuMPTypes = Union{AbstractJuMPScalar,
NonlinearExpression}
# Norm,
# QuadExpr,
# SOCExpr}
const JuMPScalars = Union{Number,JuMPTypes}

# would really want to do this on ::Type{T}, but doesn't work on v0.4
Base.eltype(::T) where {T<:JuMPTypes} = T
Base.size(::JuMPTypes) = ()
Base.size(x::JuMPTypes,d::Int) = 1
Base.ndims(::JuMPTypes) = 0


##########################################################################
include("containers.jl")
include("operators.jl")
# include("writers.jl")
include("macros.jl")
include("optimizerinterface.jl")
# include("callbacks.jl")
include("nlp.jl")
include("print.jl")

Expand Down
2 changes: 2 additions & 0 deletions src/operators.jl
View file
Open in desktop
Expand Up @@ -8,6 +8,8 @@
# See http://github.com/JuliaOpt/JuMP.jl
#############################################################################

const JuMPTypes = Union{AbstractJuMPScalar, NonlinearExpression}

# Overloads
#
# Different objects that must all interact:
Expand Down