eliminated importall JuMP

Author: huckl3b3rry87

src/NLOptControl.jl

@@ -2,12 +2,12 @@ isdefined(Base, :__precompile__) && __precompile__()
 
 module NLOptControl
 
+using JuMP
+#import JuMP: @NLexpression, @NLobjective, @NLparameter, @NLconstraint, @constraint, @variable, setvalue, Model, setupperbound, setlowerbound
 using Ipopt # temp fix for 0.6
 using FastGaussQuadrature
-importall JuMP
 using DataFrames
 using Ranges
-
 include("Base.jl")
 using .Base
 

src/setup.jl

@@ -121,7 +121,8 @@ function defineSolver!(n::NLOpt;kwargs...)
   else
     error("the :name key needs to be set to either :KNITRO or :Ipopt in defineSolver!()\n ")
   end
-  n.mdl=JuMP.Model(solver=NLPsolver)
+  #n.mdl=JuMP.Model(solver=NLPsolver)
+  n.mdl=Model(solver=NLPsolver)
 
   # optimal control problem
   OCPdef!(n);
@@ -185,7 +186,7 @@ function OCPdef!(n::NLOpt)
 
   # boundary constraints
   n.r.xf_con=[]; # currently modifying the final state constraint (with tolerance) is not needed, can easily ad this functionlity though
-  @show if any(.!isnan.(n.X0_tol))           # create handles for constraining the entire initial state
+  if any(.!isnan.(n.X0_tol))           # create handles for constraining the entire initial state
     n.r.x0_con=Array{Any}(n.numStates,2); # this is so they can be easily reference when doing MPC
   else
     n.r.x0_con=[];

src/utils.jl

@@ -104,6 +104,7 @@ Date Create: 1/2/2017, Last Modified: 6/16/2017 \n
 --------------------------------------------------------------------------------------\n
 """
 function integrate!(n::NLOpt,V::Array{JuMP.Variable,1}; C=1.0,D=zeros(n.numStatePoints,),kwargs...)
+
   kw = Dict(kwargs);
   if !haskey(kw,:integrand); integrand = :default;
   else; integrand = get(kw,:integrand,0);