Add an MOI wrapper (#83)

* Add an MOI wrapper

* Deal with ScalarAffine constraints

* Deal with MOI objectives

* Add ScalarQuadraticFunction

* Add comments

* Test on linear and gradratic MOI tests

* Update wrapper

* Update show

* Add MINLPTests as a build stage

* Add JuMP master to MINLPTests

* Add Ipopt to MINLPTests project

* Put all MINLPTests in testset

* Bump MINLPTests version

* Update run_minlptests.jl

* Doh; exclude the right test

.travis.yml

@@ -1,15 +1,11 @@
 language: julia
 os:
   - linux
-  - osx
 julia:
   - 0.6
   - 0.7
   - 1.0
-  - nightly
-matrix:
-  allow_failures:
-    - julia: nightly
+  - 1.1
 branches:
   only:
     - master
@@ -27,3 +23,11 @@ before_cache:
   - cp -R $HOME/.julia/*/Ipopt/deps/usr $HOME
 after_success:
   - julia -e 'if VERSION >= v"0.7-"; using Pkg; else; cd(Pkg.dir("AmplNLWriter")); end; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
+jobs:
+  include:
+    - stage: "MINLPTests"
+      julia: 1.0
+      os: linux
+      script:
+        - julia --project=test/MINLPTests -e 'using Pkg; Pkg.instantiate(); Pkg.add(PackageSpec(path=pwd()))'
+        - julia --project=test/MINLPTests --color=yes test/MINLPTests/run_minlptests.jl

REQUIRE

@@ -1,3 +1,4 @@
 julia 0.6
 Compat 1.0
 MathProgBase 0.5 0.8
+MathOptInterface 0.8.1 0.9

src/AmplNLWriter.jl

@@ -255,16 +255,19 @@ function SolverInterface.loadproblem!(outer::AmplNLNonlinearModel, nvar::Integer
 
     # Process objective
     m.obj = obj_expr(m.d)
-    if length(m.obj.args) < 2
-        m.obj = 0
-    else
-        # Convert non-linear expression to non-linear, linear and constant
-        m.obj, constant, m.objlinearity = process_expression!(
-            m.obj, m.lin_obj, m.varlinearities_obj)
+    if typeof(m.obj) <: Expr
+        if length(m.obj.args) < 2
+            # TODO(odow): what does this case mean?
+            m.obj = 0
+        else
+            # Convert non-linear expression to non-linear, linear and constant
+            m.obj, constant, m.objlinearity = process_expression!(
+                m.obj, m.lin_obj, m.varlinearities_obj)
 
-        # Add constant back into non-linear expression
-        if constant != 0
-            m.obj = add_constant(m.obj, constant)
+            # Add constant back into non-linear expression
+            if constant != 0
+                m.obj = add_constant(m.obj, constant)
+            end
         end
     end
     m
@@ -791,4 +794,6 @@ function clean_solverdata()
     end
 end
 
+include("MOI_wrapper.jl")
+
 end