Merge pull request #19 from rdeits/rbd

WIP: support extracting LCP models directly from RBD robots
rdeits · Aug 22, 2017 · 1c50506 · 1c50506
2 parents 4e27315 + 81d102e
commit 1c50506
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 262 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,3 @@
 julia 0.6
-JuMP
-IntervalArithmetic
-MacroTools
+JuMP 0.17 0.19
+IntervalArithmetic 0.11
diff --git a/complementarity.ipynb b/complementarity.ipynb
diff --git a/src/ConditionalJuMP.jl b/src/ConditionalJuMP.jl
@@ -4,7 +4,6 @@ module ConditionalJuMP
 
 using JuMP
 using JuMP: AbstractJuMPScalar
-using MacroTools: @capture
 using IntervalArithmetic: Interval
 import Base: <=, ==, >=, !, &
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -465,6 +465,5 @@ end
 
     @testset "complementarity" begin
         include("../examples/complementarity.jl")
-        include("../examples/multicontact_complementarity.jl")
     end
 end