New linearizer + loupfinders

.gitignore

@@ -46,8 +46,11 @@ doc/_build
 
 *~
 
+
 # files in examples
 **/examples/*
 !**/examples/*cpp
 !**/examples/makefile
 
+# results ibex files
+*.cov

.travis.yml

@@ -31,6 +31,7 @@ matrix:
         - STATIC_OR_SHARED=
         - STATIC_OR_SHARED_CMAKE=
     - os: osx
+      osx_image: xcode11
       compiler: clang
       env:
         - INTERVAL_LIB=gaol
@@ -39,13 +40,15 @@ matrix:
         - STATIC_OR_SHARED_CMAKE=
         - CXXFLAGS=-std=c++11
     - os: osx
+      osx_image: xcode11
       compiler: clang
       env:
         - INTERVAL_LIB=gaol
         - LP_LIB=none
         - STATIC_OR_SHARED=--enable-shared
         - STATIC_OR_SHARED_CMAKE=-DBUILD_SHARED_LIBS=ON
         - CXXFLAGS=-std=c++11
+
   allow_failures:
     - os: linux
       compiler: gcc
@@ -63,13 +66,14 @@ addons:
       - flex
       - bison
       - libcppunit-dev
-
-# need this to install dependencies on osx
-before_install:
-  - uname -a
-  - if [ "$TRAVIS_OS_NAME" = "osx" ] ; then brew update ; brew install flex bison cppunit; fi
+  homebrew:
+    packages:
+    - flex
+    - bison
+    - cppunit
 
 install:
+  - uname -a
   - ./waf configure --prefix=$HOME ${STATIC_OR_SHARED} --interval-lib=${INTERVAL_LIB} --lp-lib=${LP_LIB} || cat __build__/*.log
   - ./waf build install clean
 

CMakeLists.txt

@@ -3,9 +3,11 @@ cmake_minimum_required (VERSION 3.5.1)
 
 message (WARNING "CMake support is in beta, please report all bugs to https://github.com/ibex-team/ibex-lib/issues/")
 
-project (IBEX VERSION 2.8.8 LANGUAGES CXX)
+project (IBEX VERSION 2.8.9.1 LANGUAGES CXX)
 set (IBEX_DESCRIPTION "A C++ library for interval-based algorithm design")
 set (IBEX_URL "http://www.ibex-lib.org/")
+set (IBEX_NAMESPACE "Ibex") # TODO use it everywhere
+set (IBEX_CMAKE_PATH_FILES_PREFIX ibex-path-hints)
 
 ################################################################################
 # Add cmake.utils to the list of CMAKE_MODULE_PATH
@@ -14,10 +16,11 @@ set (MODULE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake.utils")
 list (APPEND CMAKE_MODULE_PATH "${MODULE_DIR}")
 
 ################################################################################
-# Run common init function and install the module so plugins can use it
+# Run common init function (the module is installed later so plugins can use it)
 ################################################################################
 message (STATUS "Configuring Ibex ${IBEX_VERSION}")
-include (ibex-config-utils)
+set (IBEX_DEV_UTILS_FILENAME ibex-dev-utils)
+include (${IBEX_DEV_UTILS_FILENAME})
 ibex_init_common ()
 
 ################################################################################
@@ -34,28 +37,27 @@ add_subdirectory (src)
 ################################################################################
 # Generate ibex.pc
 ################################################################################
-include (IbexUtils)
+include (ibex-gen-pkgconfig)
 ibex_generate_pkgconfig_file (ibex)
 
 ################################################################################
-# Tests
+# Install some CMake utils files that are use for detecting dependencies in
+# cmake-config.cmake module and can be useful in plugins.
 ################################################################################
-add_make_target_for_ctest (check)
+install (FILES "${MODULE_DIR}/${IBEX_DEV_UTILS_FILENAME}.cmake"
+               "${MODULE_DIR}/FindCppUnit.cmake"
+          DESTINATION ${CMAKE_INSTALL_CONFIGCMAKE}/cmake.utils
+          COMPONENT devtools)
 
 ################################################################################
-# TODO benchs
+# Tests
 ################################################################################
-#add_subdirectory (benchs)
+ibex_add_make_target_for_ctest (check)
 
 ################################################################################
-# We add this file last in the hope that the install script will run it last.
-# Specifically, we want this to be run after the line
-# install (EXPORT ibex...
-# from src/CMakeLists.txt because this line can, in some cases, remove files
-# matching ${CMAKE_INSTALL_CONFIGCMAKE}/ibex-config-*.cmake even if they were
-# just installed.
+# TODO benchs
 ################################################################################
-add_subdirectory (cmake.install)
+#add_subdirectory (benchs)
 
 ################################################################################
 # archives and packages

benchs/optim/benchs-minlp/cvxnonsep_normcon20.bch

@@ -0,0 +1,47 @@
+variables
+i1 in [0,5];
+i2 in [0,5];
+i3 in [0,5];
+i4 in [0,5];
+i5 in [0,5];
+i6 in [0,5];
+i7 in [0,5];
+i8 in [0,5];
+i9 in [0,5];
+i10 in [0,5];
+x11 in [0,5];
+x12 in [0,5];
+x13 in [0,5];
+x14 in [0,5];
+x15 in [0,5];
+x16 in [0,5];
+x17 in [0,5];
+x18 in [0,5];
+x19 in [0,5];
+x20 in [0,5];
+
+
+
+minimize   - 0.175*i1 - 0.39*i2 - 0.83*i3 - 0.805*i4 - 0.06*i5 - 0.4*i6
+     - 0.52*i7 - 0.415*i8 - 0.655*i9 - 0.63*i10 - 0.29*x11 - 0.43*x12
+     - 0.015*x13 - 0.985*x14 - 0.165*x15 - 0.105*x16 - 0.37*x17 - 0.2*x18
+     - 0.49*x19 - 0.34*x20;
+
+constraints
+
+sqrt(0.0001 + i1^2 + i2^2 + i3^2 + i4^2 + i5^2 + i6^2 + i7^2 + i8^2 + i9^2
+     + i10^2 + x11^2 + x12^2 + x13^2 + x14^2 + x15^2 + x16^2 + x17^2 + x18^2 + 
+    x19^2 + x20^2) <= 10;
+
+integer(i1);
+integer(i2);
+integer(i3);
+integer(i4);
+integer(i5);
+integer(i6);
+integer(i7);
+integer(i8);
+integer(i9);
+integer(i10);
+
+end

benchs/optim/benchs-minlp/cvxnonsep_nsig20.bch

@@ -0,0 +1,47 @@
+variables
+i1 in [1,10];
+i2 in [1,10];
+i3 in [1,10];
+i4 in [1,10];
+i5 in [1,10];
+i6 in [1,10];
+i7 in [1,10];
+i8 in [1,10];
+i9 in [1,10];
+i10 in [0.00001,10];
+x11 in [0.00001,10];
+x12 in [0.00001,10];
+x13 in [0.00001,10];
+x14 in [0.00001,10];
+x15 in [0.00001,10];
+x16 in [0.00001,10];
+x17 in [0.00001,10];
+x18 in [0.00001,10];
+x19 in [0.00001,10];
+x20 in [0.00001,10];
+
+minimize
+
+
+1.5*i1 + 0.51*i2 + 1.01*i3 + 1.4*i4 + 1.78*i5 + 1.92*i6 + 1.09*i7
+            + 0.48*i8 + 0.67*i9 + 0.52*i10 + 1.68*x11 + 0.51*x12 + 1.63*x13
+            + 0.49*x14 + 1.86*x15 + 0.7*x16 + 0.39*x17 + 0.5*x18 + 1.23*x19
+            + 0.95*x20 ;
+
+constraints
+integer(i1);
+integer(i2);
+integer(i3);
+integer(i4);
+integer(i5);
+integer(i6);
+integer(i7);
+integer(i8);
+integer(i9);
+integer(i10);
+
+-0.2*i1^0.065*i2^0.004*i3^0.084*i4^0.093*i5^0.06*i6^0.075*i7^0.074*
+            i8^0.039*i9^0.065*i10^0.017*x11^0.07*x12^0.03*x13^0.028*x14^0.005*
+            x15^0.01*x16^0.082*x17^0.069*x18^0.032*x19^0.095*x20^0.003 <= -1;
+
+end

benchs/optim/benchs-minlp/cvxnonsep_pcon20.bch

@@ -0,0 +1,48 @@
+variables
+i1 in [0,5];
+i2 in [0,5];
+i3 in [0,5];
+i4 in [0,5];
+i5 in [0,5];
+i6 in [0,5];
+i7 in [0,5];
+i8 in [0,5];
+i9 in [0,5];
+i10 in [0,5];
+x11 in [0,5];
+x12 in [0,5];
+x13 in [0,5];
+x14 in [0,5];
+x15 in [0,5];
+x16 in [0,5];
+x17 in [0,5];
+x18 in [0,5];
+x19 in [0,5];
+x20 in [0,5];
+
+minimize
+-(0.53*i1 + 0.65*i2 + 0.49*i3 + 0.82*i4 + 0.88*i5 + 0.97*i6 + 0.53*i7
+            + 0.33*i8 + 0.11*i9 + 0.61*i10 + 0.78*x11 + 0.09*x12 + 0.27*x13
+            + 0.15*x14 + 0.28*x15 + 0.44*x16 + 0.53*x17 + 0.46*x18 + 0.88*x19
+            + 0.15*x20) ;
+
+constraints
+
+ (2^(i1 + i2) + 2^(i2 + i3) + 2^(i3 + i4) + 2^(i4 + i5) + 2^(i5 + 
+            i6) + 2^(i6 + i7) + 2^(i7 + i8) + 2^(i8 + i9) + 2^(i9 + i10) + 2^(i10
+            + x11) + 2^(x11 + x12) + 2^(x12 + x13) + 2^(x13 + x14) + 2^(x14 + x15
+            ) + 2^(x15 + x16) + 2^(x16 + x17) + 2^(x17 + x18) + 2^(x18 + x19) + 2
+            ^(x19 + x20))^2 <= 57600;
+
+integer(i1);
+integer(i2);
+integer(i3);
+integer(i4);
+integer(i5);
+integer(i6);
+integer(i7);
+integer(i8);
+integer(i9);
+integer(i10);
+
+end