ibex 2.2.0

Closes #514.

Signed-off-by: Andrew Janke <andrew@apjanke.net>

Formula/ibex.rb

@@ -1,8 +1,18 @@
 class Ibex < Formula
   desc "C++ library for constraint processing over real numbers."
   homepage "http://www.ibex-lib.org/"
-  url "http://www.ibex-lib.org/sites/default/files/ibex-2.1.16.tar.gz"
-  sha256 "d92ff32f14d27ad7b390ae693beb311b58cf6babccac85bbdaa5f5d0b8648845"
+  head "https://github.com/ibex-team/ibex-lib.git"
+
+  stable do
+    url "https://github.com/ibex-team/ibex-lib/archive/ibex-2.2.0.tar.gz"
+    sha256 "fa6f281d5f28db11fa8715569937b4d19bd24ab744d0c7f21674cc1552d674ee"
+
+    # Patch the optional param-estim plugin build script
+    patch do
+      url "https://github.com/ibex-team/ibex-lib/pull/192.diff"
+      sha256 "91cc070ad5464a5c19205228470161ff87a09df5b3aeaae2b65361319e509fbf"
+    end
+  end
 
   bottle do
     cellar :any
@@ -12,7 +22,11 @@ class Ibex < Formula
     sha256 "41327b6a0da9b8b2ed888c3c2c33d5f6ff061ea13eceb4b9e8b6e660049d624d" => :mountain_lion
   end
 
-  option "with-java", "Build Java bindings for Choco solver."
+  option "with-java", "Enable Java bindings for CHOCO solver."
+  option "with-ampl", "Use AMPL file loader plugin"
+
+  option "without-ensta-robotics", "Don't build the Contractors for robotics (SLAM) plugin"
+  option "without-param-estim", "Don't build the Parameter Estimation (enhanced Q-intersection algorithm) plugin"
 
   depends_on :java => ["1.8+", :optional]
   depends_on "bison" => :build
@@ -20,29 +34,54 @@ class Ibex < Formula
   depends_on "pkg-config" => :build
 
   def install
-    args = ["--prefix=#{prefix}"]
-
-    if build.with? "java"
-      args << "--with-jni"
-    else
-      args << "--enable-shared"
+    if build.with?("java") && build.with?("ampl")
+      odie "Cannot set options --with-java and --with-ampl simultaneously for now."
     end
 
+    args = %W[
+      --prefix=#{prefix}
+      --enable-shared
+      --with-affine
+      --with-optim
+    ]
+
+    args << "--with-jni" if build.with? "java"
+    args << "--with-ampl" if build.with? "ampl"
+    args << "--with-ensta-robotics" if build.with? "ensta-robotics"
+    args << "--with-param-estim" if build.with? "param-estim"
+
     system "./waf", "configure", *args
     system "./waf", "install"
 
     cd "examples" do
-      cxxflags = "-frounding-math -ffloat-store -I#{include} -I#{include}/ibex"
-      libflags = "-L#{lib} -libex -lprim -lClp -lCoinUtils -lm"
-      system "make", "defaultsolver", "LIBS=#{libflags}", "CXXFLAGS=#{cxxflags}"
+      ENV["PKG_CONFIG_PATH"] = "#{share}/pkgconfig"
+      # Build Ibex examples
+      system "make", *%w[ctc01 ctc02 symb01 solver01 solver02]
+      # Build SLAM examples
+      cd "slam" do
+        system "make", *%w[slam1 slam2 slam3]
+      end
     end
 
     pkgshare.install %w[examples benchs]
+    (pkgshare/"examples/symb01.txt").write <<-EOS.undent
+      function f(x)
+        return ((2*x,-x);(-x,3*x));
+      end
+    EOS
   end
 
   test do
     cp_r "#{pkgshare}/examples/.", testpath
+
+    # Base Ibex examples
+    %w[ctc01 ctc02 symb01].each { |a| system "./#{a}" }
+    # Ibex solver examples
     cp "#{pkgshare}/benchs/cyclohexan3D.bch", testpath
-    system "./defaultsolver", "cyclohexan3D.bch", "1e-05", "10"
+    %w[solver01 solver02].each { |a| system "./#{a}", "cyclohexan3D.bch", "1e-05", "10" }
+    # Slam example (base Ibex)
+    cd "slam" do
+      %w[slam1 slam2 slam3].each { |a| system "./#{a}" }
+    end
   end
 end