Merge pull request #27 from JuliaOpt/bl/j1updates

Updates variabletype -> variable_type

.travis.yml

@@ -10,10 +10,7 @@ julia:
 notifications:
   email: false
 before_script:
-  - julia -e 'Pkg.add("JuMP")'
-  - julia -e 'Pkg.checkout("JuMP")'
-before_script:
-  - julia -e 'if VERSION >= v"0.7.0-DEV.5183" using Pkg end; Pkg.clone("JuMP")'
+  - julia -e 'if VERSION >= v"0.7-"; using Pkg; Pkg.add(PackageSpec(name="JuMP", rev="master")); else Pkg.add("JuMP"); Pkg.checkout("JuMP"); end'
 after_success:
   # push coverage results to Coveralls
   - julia -e 'cd(Pkg.dir("PolyJuMP")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

src/default_methods.jl

@@ -1,5 +1,5 @@
 # Free polynomial
-JuMP.variabletype(m::JuMP.Model, p::Poly) = polytype(m, p, p.polynomial_basis)
+JuMP.variable_type(m::JuMP.Model, p::Poly) = polytype(m, p, p.polynomial_basis)
 function polytype(m::JuMP.Model, ::Poly, pb::AbstractPolynomialBasis)
     MultivariatePolynomials.polynomialtype(pb, JuMP.VariableRef)
 end