diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dea082ec..43fa368ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,41 +1,16 @@ +# organised as follows: +# main variables +# sources +# system core +# libraries + cmake_minimum_required(VERSION 2.8) - + project(YAP C CXX) set(YAP_MAJOR_VERSION 6) set(YAP_MINOR_VERSION 3) set(YAP_PATCH_VERSION 4) -set(YAP_FULL_VERSION - ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION}.${YAP_PATCH_VERSION}) -set(YAP_NUMERIC_VERSION - ${YAP_MAJOR_VERSION}*10000+${YAP_MINOR_VERSION}100+${YAP_PATCH_VERSION}) -set(MYDDAS_VERSION MYDDAS-0.9.1) - -message(STATUS "Building YAP version ${YAP_VERSION}") - -# set path to additional CMake modules -set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) -set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build}) - -set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl) - -# Compatibility vars with autotols -set ( prefix "${CMAKE_INSTALL_PREFIX}") -set ( exec_prefix "${prefix}") -set ( libdir "${exec_prefix}/lib") -set ( dlls "${exec_prefix}/lib/Yap") -set ( includedir "${prefix}/include") -set ( datarootdir "${prefix}/share") -set ( libpl "${prefix}/share") -set ( datadir "${datarootdir}") -set ( mandir "${datarootdir}/man") -set ( bindir "${exec_prefix}/bin") - -set(YAP_ROOTDIR ${prefix}) -set(YAP_SHAREDIR ${datarootdir}) - -set ( _GNU_SOURCE 1 ) - if (WIN32) set (YAP_ARCH $ENV{PROCESSOR_ARCHITECTURE}) @@ -47,29 +22,54 @@ if (UNIX) OUTPUT_VARIABLE YAP_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE ) endif() +set(YAP_FULL_VERSION + ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION}.${YAP_PATCH_VERSION}) +set(YAP_FVERSION + ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION}.${YAP_PATCH_VERSION}) +set(YAP_NUMERIC_VERSION + ${YAP_MAJOR_VERSION}*10000+${YAP_MINOR_VERSION}*100+${YAP_PATCH_VERSION}) +set(MYDDAS_VERSION MYDDAS-0.9.1) + +site_name( YAP_SITE ) + + +message(STATUS "Building YAP version ${YAP_VERSION}") + +# set path to additional CMake modules +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build) + +set(CMAKE_TOP_BINARY_DIR ${CMAKE_BINARY_DIR}) +set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl) + +cmake_policy( SET CMP0042 NEW) + +# Compatibility vars with autotols +set ( prefix "${CMAKE_INSTALL_PREFIX}") +set ( exec_prefix "${prefix}") +set ( libdir "${exec_prefix}/lib") +set ( dlls "${exec_prefix}/lib/Yap") +set ( includedir "${prefix}/include") +set ( datarootdir "${prefix}/share") +set ( libpl "${prefix}/share/Yap") +set ( datadir "${datarootdir}") +set ( mandir "${datarootdir}/man") +set ( bindir "${exec_prefix}/bin") +set ( docdir "${exec_prefix}/share/doc/Yap") + +set(YAP_ROOTDIR ${prefix}) + # erootdir -> rootdir # bindir defined above # libdir defined above -set(YAPLIBDIR "${libdir}/Yap") +set(YAP_LIBDIR "${dlls}") +set(YAP_SHAREDIR "${datarootdir}") +set(YAP_BINDIR "${bindir}") +set(YAP_ROOTDIR "${prefix}") -# Compilation Flags -if (CMAKE_COMPILER_IS_GNUCC) - message(STATUS "Original CMAKE_C_FLAGS ${CMAKE_C_FLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wstrict-prototypes -Wmissing-prototypes") - message(STATUS "Running with CMAKE_C_FLAGS ${CMAKE_C_FLAGS}") - message(STATUS "Original CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}") - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -O -g") - message(STATUS "Runing with CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}") - message(STATUS "Original CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer") - message(STATUS "Running with CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}") -endif() - -add_definitions(-D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H) - -set(YAP_YAPLIB libYap.${CMAKE_SHARED_LIBRARY_SUFFIX}) +set(YAP_YAPLIB libYap${CMAKE_SHARED_LIBRARY_SUFFIX}) set(YAP_STARTUP startup.yss) -set(YAP_TIMESTAMP string(TIMESTAMP _output "%d/%m/%Y")) +string(TIMESTAMP YAP_TIMESTAMP) # # Optional libraries that affect compilation @@ -86,16 +86,13 @@ include (MacroLogFeature) include (CMakeDependentOption) include (CheckSymbolExists) -set ( USE_SYSTEM_MALLOC 1) set ( MALLOC_T void *) -set ( USE_THREADED_CODE 1) set ( MIN_STACKSPACE 1024*SIZEOF_INT_P ) set ( MIN_HEAPSPACE 2*1024*SIZEOF_INT_P ) set ( MIN_TRAILSPACE 512*SIZEOF_INT_P ) -set ( DEF_STACKSPACE 1024*SIZEOF_INT_P ) -set ( DEF_HEAPSPACE 2*1024*SIZEOF_INT_P ) -set ( DEF_TRAILSPACE 512*SIZEOF_INT_P ) -set ( HAVE_GCC 1 ) +set ( DEF_STACKSPACE 0 ) +set ( DEF_HEAPSPACE 0 ) +set ( DEF_TRAILSPACE 0 ) # option (WITH_RATIONAL_TREES "support infinite rational trees" ON) add_definitions (-DRATIONAL_TREES=1) @@ -103,6 +100,7 @@ add_definitions (-DRATIONAL_TREES=1) # option (WITH_COROUTINING # "support co-routining, attributed variables and constraints" ON) add_definitions (-DCOROUTINING=1) + # if (WITH_RATIONAL_TREES and WITH_COROUTINING) #TODO: install (cd LGPL/clp ; $(MAKE) install) # endif (WITH_RATIONAL_TREES and WITH_COROUTINING) @@ -111,6 +109,38 @@ add_definitions (-DCOROUTINING=1) # "support depth-bound computation" ON) add_definitions (-DDEPTH_LIMIT=1) +#ensure cells are properly aligned in code +set (ALIGN_LONGS 1) + +#ensure best access to slots in environments +set (MSHIFTOFFS 1) + +set (C_COMPILER CMAKE_C_COMPILER_ID) + +if ( ${C_COMPILER} MATCHES "GNU") + set (HAVE_GCC 1) +endif() + +# compatible compilers +if ( ${C_COMPILER} MATCHES "Clang") + set (HAVE_GCC 1) +endif() + +if ( ${C_COMPILER} MATCHES "Intel") + set (HAVE_GCC 1) +endif() + +# replace instructions codes by the address of their code +option (WITH_THREADED_CODE "Use threaded code" ON) +if (WITH_THREADED_CODE) + set (USE_THREADED_CODE 1) +endif (WITH_THREADED_CODE) + +# +# include libtai package as an independent library +# +add_subdirectory (os/libtai) + option (WITH_TABLING "Support tabling" ON) if (WITH_TABLING) #this depends on DEPTH_LIMIT define it after @@ -118,7 +148,6 @@ if (WITH_TABLING) #this macro should realy be in config.h or other like it #and it is used across several files outside OPTYap add_definitions (-DTABLING=1) - add_definitions (-DGC_NO_TAGS=1) include_directories (OPTYap) add_subdirectory (OPTYap) endif(WITH_TABLING) @@ -146,13 +175,193 @@ option (System_Threads "support system threads" OFF) #TODO: +# +# Sources Section +# + +set(IOLIB_SOURCES + os/pl-buffer.c + os/pl-codelist.c + os/pl-ctype.c + os/pl-dtoa.c + os/pl-error.c + os/pl-file.c + os/pl-files.c + os/pl-fmt.c + os/pl-glob.c + os/pl-option.c + os/pl-nt.c + os/pl-os.c + os/pl-privitf.c + os/pl-prologflag.c + os/pl-read.c + os/pl-rl.c + os/pl-stream.c + os/pl-string.c + os/pl-table.c + os/pl-tai.c + os/pl-text.c + os/pl-utf8.c + os/pl-write.c + C/pl-yap.c + ) + +if (WIN32) + set(IOLIBS_SOURCES + ${IOLIBS_SOURCES} + os/windows/uxnt.c + ) +endif (WIN32) + +set (ENGINE_SOURCES + C/agc.c + C/absmi.c + C/adtdefs.c + C/alloc.c + C/amasm.c + C/analyst.c + C/arrays.c + C/arith0.c + C/arith1.c + C/arith2.c + C/atomic.c + C/attvar.c + C/bignum.c + C/bb.c + C/cdmgr.c + C/cmppreds.c + C/compiler.c + C/computils.c + C/corout.c + C/cut_c.c + C/dbase.c + C/dlmalloc.c + C/errors.c + C/eval.c + C/exec.c + C/exo.c + C/exo_udi.c + C/globals.c + C/gmp_support.c + C/gprof.c + C/grow.c + C/heapgc.c + C/index.c + C/init.c + C/inlines.c + C/iopreds.c + C/depth_bound.c + C/mavar.c + C/modules.c + C/other.c + C/parser.c + C/qlyr.c + C/qlyw.c + C/range.c + C/save.c + C/scanner.c + C/signals.c + C/sort.c + C/stdpreds.c + C/sysbits.c + C/text.c + C/threads.c + C/tracer.c + C/unify.c + C/userpreds.c + C/utilpreds.c + C/yap-args.c + C/write.c + C/ypstdio.c + library/dialect/swi/fli/swi.c + library/dialect/swi/fli/blobs.c + C/udi.c + #packages/udi/rtree.c + #packages/udi/rtree_udi.c + + # ${IOLIB_SOURCES} + # MPI_SOURCES + ) + +set(C_INTERFACE_SOURCES + C/load_foreign.c + C/load_dl.c + C/load_dld.c + C/load_dyld.c + C/load_none.c + C/load_aout.c + C/load_aix.c + C/load_dll.c + C/load_shl.c + C/c_interface.c + C/clause_list.c + ) + +SET(OPTYAP_SOURCES + OPTYap/or.memory.c + OPTYap/opt.init.c + OPTYap/opt.preds.c + OPTYap/or.copy_engine.c + OPTYap/or.cow_engine.c + OPTYap/or.sba_engine.c + OPTYap/or.thread_engine.c + OPTYap/or.scheduler.c + OPTYap/or.cut.c + OPTYap/tab.tries.c + OPTYap/tab.completion.c + ) + +set(STATIC_SOURCES + #NOT INCLUDED FOR NOW + ) + +set(CONSOLE_SOURCES console/yap.c) + +#MPI STUFF +# library/mpi/mpi.c library/mpi/mpe.c +# library/lammpi/yap_mpi.c library/lammpi/hash.c library/lammpi/prologterms2c.c +# ) + +#WIN STUFF +# SET(PLCONS_SOURCES +# console/LGPL/pl-nt.c +# console/LGPL/pl-ntcon.c +# console/LGPL/pl-ntconsole.c +# console/LGPL/pl-ntmain.c +# ) + +# ADD_SUBDIRECTORY(GPL) +# ADD_SUBDIRECTORY(LGPL) +# ADD_SUBDIRECTORY(library) +# ADD_SUBDIRECTORY(os) +# ADD_SUBDIRECTORY(packages) +# ADD_SUBDIRECTORY(packages) +ADD_SUBDIRECTORY(pl) + +## define system + +add_library(libYap SHARED + ${ENGINE_SOURCES} + ${IOLIB_SOURCES} + ${C_INTERFACE_SOURCES} + ${STATIC_SOURCES} + ${OPTYAP_SOURCES} + $ ) + +target_link_libraries(libYap + m resolv stdc++ ) + +set_target_properties(libYap + PROPERTIES VERSION ${YAP_FULL_VERSION} + SOVERSION ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION} + OUTPUT_NAME Yap + ) + + option (WITH_Dynamic_BDD "dynamic bdd library" OFF) #TODO: -cmake_dependent_option (WITH_PThreadLocking - "use pthread locking primitives for internal locking" ON - System_Threads OFF) #TODO: include_directories (H include os ${CMAKE_CURRENT_BINARY_DIR}) @@ -169,32 +378,25 @@ macro_log_feature (GMP_FOUND "libgmp" "http://gmplib.org") if (GMP_FOUND) include_directories (${GMP_INCLUDE_DIR}) - set (EXTRALIBS ${EXTRALIBS} ${GMP_LIBRARIES}) + target_link_libraries(libYap ${GMP_LIBRARIES}) #config.h needs this (TODO: change in code latter) set (USE_GMP 1) + set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIR} ) + set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GMP_LIBRARIES} ) endif (GMP_FOUND) -set (CURSES_NEED_NCURSES TRUE) -macro_optional_find_package (Curses ON) -macro_log_feature (CURSES_FOUND "libncurses" - "NCurses Library" - "") -if (CURSES_FOUND) - include_directories (${CURSES_INCLUDE_DIR}) - set (EXTRALIBS ${EXTRALIBS} ${CURSES_NCURSES_LIBRARY}) -endif (CURSES_FOUND) - -macro_optional_find_package (Readline OFF) +macro_optional_find_package (Readline ON) macro_log_feature (READLINE_FOUND "libreadline" "GNU Readline Library (or similar)" "http://www.gnu.org/software/readline") if (READLINE_FOUND) include_directories (${READLINE_INCLUDE_DIR}) - set (EXTRALIBS ${EXTRALIBS} ${READLINE_LIBRARIES}) + target_link_libraries(libYap ${READLINE_LIBRARIES}) set (HAVE_READLINE_READLINE_H 1) + set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${READLINE_INCLUDE_DIR} ) + set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${READLINE_LIBRARIES} ) check_function_exists( add_history HAVE_ADD_HISTORY ) - check_function_exists( rl_ HAVE_RL_DISCARD_ARGUMENT) check_function_exists( rl_begin_undo_group HAVE_RL_BEGIN_UNDO_GROUP) check_function_exists( rl_clear_pending_input HAVE_RL_CLEAR_PENDING_INPUT) check_function_exists( rl_discard_argument HAVE_RL_DISCARD_ARGUMENT) @@ -204,12 +406,12 @@ if (READLINE_FOUND) check_function_exists( rl_reset_after_signal HAVE_RL_RESET_AFTER_SIGNAL ) check_function_exists( rl_set_keyboard_input_timeout HAVE_RL_SET_KEYBOARD_INPUT_TIMEOUT ) check_function_exists( rl_set_prompt HAVE_RL_SET_PROMPT) - check_symbol_exists( rl_catch_signals readline/readline.h HAVE_DECL_RL_CATCH_SIGNALS_ ) - check_symbol_exists( rl_completion_func_t readline/readline.h HAVE_DECL_RL_COMPLETION_FUNC_T_ ) - check_symbol_exists( rl_done readline/readline.h HAVE_DECL_RL_DONE ) - check_symbol_exists( rl_hook_func_t readline/readline.h HAVE_DECL_RL_HOOK_FUNC_T_ ) - check_symbol_exists( rl_event_hook readline/readline.h HAVE_DECL_RL_EVENT_HOOK ) - check_symbol_exists( rl_readline_state readline/readline.h HAVE_DECL_RL_READLINE_STATE ) + check_symbol_exists( rl_catch_signals stdio.h;readline/readline.h HAVE_DECL_RL_CATCH_SIGNALS ) + check_symbol_exists( rl_completion_func_t stdio.h;readline/readline.h HAVE_DECL_RL_COMPLETION_FUNC_T ) + check_symbol_exists( rl_done stdio.h;readline/readline.h HAVE_DECL_RL_DONE ) + check_symbol_exists( rl_hook_func_t stdio.h;readline/readline.h HAVE_DECL_RL_HOOK_FUNC_T ) + check_symbol_exists( rl_event_hook stdio.h;readline/readline.h HAVE_DECL_RL_EVENT_HOOK ) + check_symbol_exists( rl_readline_state stdio.h;readline/readline.h HAVE_DECL_RL_READLINE_STATE ) endif (READLINE_FOUND) @@ -242,40 +444,37 @@ if (THREADS_FOUND) # # :: # - set( THREADS_PREFER_PTHREAD_FLAG 1) - check_function_exists( pthread_mutexattr_setkind_np HAVE_PTHREAD_MUTEXATTR_SETKIND_NP ) -check_function_exists( pthread_mutexattr_settype HAVE_PTHREAD_MUTEXATTR_SETTYPE ) -check_function_exists( pthread_setconcurrency HAVE_PTHREAD_SETCONCURRENCY ) - + set( THREADS_PREFER_PTHREAD_FLAG ON) + + if (CMAKE_USE_PTHREADS_INIT) + target_link_libraries(libYap pthread) + set (HAVE_READLINE_READLINE_H 1) + set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) + check_function_exists( pthread_mutexattr_setkind_np HAVE_PTHREAD_MUTEXATTR_SETKIND_NP ) + check_function_exists( pthread_mutexattr_settype HAVE_PTHREAD_MUTEXATTR_SETTYPE ) + check_function_exists( pthread_setconcurrency HAVE_PTHREAD_SETCONCURRENCY ) + endif (CMAKE_USE_PTHREADS_INIT) # # Please note that the compiler flag can only be used with the imported # target. Use of both the imported target as well as this switch is highly # recommended for new code. endif (THREADS_FOUND) -macro_optional_add_subdirectory (library) - -add_subdirectory (docs) - -macro_optional_add_subdirectory (packages/swig) - -macro_optional_add_subdirectory (packages/myddas) - -macro_optional_add_subdirectory (packages/gecode) - -macro_optional_add_subdirectory (packages/real) - -macro_optional_add_subdirectory (packages/python) +cmake_dependent_option (WITH_PThreadLocking + "use pthread locking primitives for internal locking" ON + System_Threads OFF) macro_optional_add_subdirectory (packages/cuda) -macro_optional_add_subdirectory (packages/archive) - -macro_optional_add_subdirectory (packages/jpl) +macro_optional_add_subdirectory (packages/raptor) -macro_optional_add_subdirectory (packages/prosqlite) +#macro_optional_add_subdirectory (packages/archive) -macro_optional_add_subdirectory (packages/zlib) +#macro_optional_add_subdirectory (packages/jpl) + +#macro_optional_add_subdirectory (packages/prosqlite) + +#macro_optional_add_subdirectory (packages/zlib) #todo: use cmake target builds # option (MAXPERFORMANCE @@ -307,7 +506,10 @@ option (WITH_Static_compilation option (Use_MALLOC "use malloc to allocate memory" ON) -#TODO: +if (Use_Malloc) + # use default allocator + set ( USE_SYSTEM_MALLOC 1 ) +endif() option(CONDOR "allow YAP to be used from condor" OFF) @@ -350,255 +552,48 @@ option(CONDOR #configure_file(packages/Makefile.defs.cmake packages/Makefile.defs) #configure_file(packages/Dialect.defs.cmake packages/Dialect.defs) -# -# Sources Section -# - -set(IOLIB_SOURCES - os/pl-buffer.c - os/pl-codelist.c - os/pl-ctype.c - os/pl-dtoa.c - os/pl-error.c - os/pl-file.c - os/pl-files.c - os/pl-fmt.c - os/pl-glob.c - os/pl-option.c - os/pl-nt.c - os/pl-os.c - os/pl-privitf.c - os/pl-prologflag.c - os/pl-read.c - os/pl-rl.c - os/pl-stream.c - os/pl-string.c - os/pl-table.c - os/pl-tai.c - os/pl-text.c - os/pl-utf8.c - os/pl-write.c - C/pl-yap.c -) -if (WIN32) - set(IOLIBS_SOURCES - ${IOLIBS_SOURCES} - os/windows/uxnt.c - ) -endif (WIN32) - -set (ENGINE_SOURCES - C/agc.c - C/absmi.c - C/adtdefs.c - C/alloc.c - C/amasm.c - C/analyst.c - C/arrays.c - C/arith0.c - C/arith1.c - C/arith2.c - C/atomic.c - C/attvar.c - C/bignum.c - C/bb.c - C/cdmgr.c - C/cmppreds.c - C/compiler.c - C/computils.c - C/corout.c - C/cut_c.c - C/dbase.c - C/dlmalloc.c - C/errors.c - C/eval.c - C/exec.c - C/exo.c - C/exo_udi.c - C/globals.c - C/gmp_support.c - C/gprof.c - C/grow.c - C/heapgc.c - C/index.c - C/init.c - C/inlines.c - C/iopreds.c - C/depth_bound.c - C/mavar.c - C/modules.c - C/other.c - C/parser.c - C/qlyr.c - C/qlyw.c - C/range.c - C/save.c - C/scanner.c - C/signals.c - C/sort.c - C/stdpreds.c - C/sysbits.c - C/text.c - C/threads.c - C/tracer.c - C/unify.c - C/userpreds.c - C/utilpreds.c - C/yap-args.c - C/write.c - C/ypstdio.c - library/dialect/swi/fli/swi.c - library/dialect/swi/fli/blobs.c - - C/udi.c - #packages/udi/rtree.c - #packages/udi/rtree_udi.c - -# ${IOLIB_SOURCES} -# MPI_SOURCES -) - -set(LIBTAI_SOURCES - os/libtai/tai_add.c - os/libtai/tai_now.c - os/libtai/tai_pack.c - os/libtai/tai_sub.c - os/libtai/tai_unpack.c - os/libtai/taia_add.c - os/libtai/taia_approx.c - os/libtai/taia_fmtfrac.c - os/libtai/taia_frac.c - os/libtai/taia_half.c - os/libtai/taia_less.c - os/libtai/taia_now.c - os/libtai/taia_pack.c - os/libtai/taia_sub.c - os/libtai/taia_tai.c - os/libtai/taia_unpack.c - os/libtai/caldate_fmt.c - os/libtai/caldate_scan.c - os/libtai/caldate_fmjd.c - os/libtai/caldate_mjd.c - os/libtai/caldate_norm.c - os/libtai/caldate_ster.c - os/libtai/leapsecs_read.c - os/libtai/leapsecs_init.c - os/libtai/leapsecs_add.c - os/libtai/leapsecs_sub.c - os/libtai/caltime_fmt.c - os/libtai/caltime_scan.c - os/libtai/caltime_tai.c - os/libtai/caltime_utc.c -) - -set(C_INTERFACE_SOURCES - C/load_foreign.c - C/load_dl.c - C/load_dld.c - C/load_dyld.c - C/load_none.c - C/load_aout.c - C/load_aix.c - C/load_dll.c - C/load_shl.c - C/c_interface.c - C/clause_list.c - ) - -SET(OPTYAP_SOURCES - OPTYap/or.memory.c - OPTYap/opt.init.c - OPTYap/opt.preds.c - OPTYap/or.copy_engine.c - OPTYap/or.cow_engine.c - OPTYap/or.sba_engine.c - OPTYap/or.thread_engine.c - OPTYap/or.scheduler.c - OPTYap/or.cut.c - OPTYap/tab.tries.c - OPTYap/tab.completion.c - ) - -set(STATIC_SOURCES -#NOT INCLUDED FOR NOW -) - -set(CONSOLE_SOURCES console/yap.c) - -#MPI STUFF - # library/mpi/mpi.c library/mpi/mpe.c - # library/lammpi/yap_mpi.c library/lammpi/hash.c library/lammpi/prologterms2c.c - # ) - -#WIN STUFF -# SET(PLCONS_SOURCES -# console/LGPL/pl-nt.c -# console/LGPL/pl-ntcon.c -# console/LGPL/pl-ntconsole.c -# console/LGPL/pl-ntmain.c -# ) - -# ADD_SUBDIRECTORY(GPL) -# ADD_SUBDIRECTORY(LGPL) -# ADD_SUBDIRECTORY(library) -# ADD_SUBDIRECTORY(os) -# ADD_SUBDIRECTORY(packages) # -# include subdirecetories configuration +# include subdirectories configuration ## after we have all functionality in # -add_subdirectory (H) + +# Compilation Flags +if (CMAKE_COMPILER_IS_GNUCC) + message(STATUS "Original CMAKE_C_FLAGS ${CMAKE_C_FLAGS}") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wstrict-prototypes -Wmissing-prototypes") + message(STATUS "Running with CMAKE_C_FLAGS ${CMAKE_C_FLAGS}") + message(STATUS "Original CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -O -g ") + message(STATUS "Runing with CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}") + message(STATUS "Original CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer") + message(STATUS "Running with CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}") +endif() +add_definitions(-O -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall) +add_definitions(-D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H -DLOW_LEVEL_TRACER=1 -DDEBUG=1) +add_definitions(-DTHREADEAD_CODE=1) +add_definitions(-D_GNU_SOURCE=1 -D_XOPEN_SOURCE=700) configure_file ("${PROJECT_SOURCE_DIR}/config.h.cmake" "${PROJECT_BINARY_DIR}/config.h" ) configure_file ("${PROJECT_SOURCE_DIR}/YapTermConfig.h.cmake" "${PROJECT_BINARY_DIR}/YapTermConfig.h" ) - - -add_library(libYap SHARED - ${ENGINE_SOURCES} - ${IOLIB_SOURCES} - ${C_INTERFACE_SOURCES} - ${STATIC_SOURCES} - ${OPTYAP_SOURCES} - ${LIBTAI_SOURCES}) - -target_link_libraries(libYap - m resolv stdc++ ${EXTRALIBS} ) - -set_target_properties(libYap - PROPERTIES INSTALL_RPATH ${libdir} VERSION ${YAP_FULL_VERSION} SOVERSION ${YAP_MAJOR_VERSION}.${YAP_MINOR_VERSION} - ) - add_executable (yap-bin ${CONSOLE_SOURCES}) -set_target_properties (yap-bin PROPERTIES OUTPUT_NAME yap depends libYap) +set_target_properties (yap-bin PROPERTIES OUTPUT_NAME yap) -target_link_libraries(yap-bin libYap ) +target_link_libraries(yap-bin libYap ) -#add_custom_target (main ALL DEPENDS ${YAP_STARTUP} ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) - -#add_custom_command (TARGET ${YAP_STARTUP} -# COMMAND yap-bin -b ${CMAKE_SOURCE_DIR}/pl/boot.yap < /usr/bin/echo "bootstrap -- ${CMAKE_SOURCE_DIR}/pl/init.yap" -# DEPENDS yap-bin -#≈ß ) -# if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -# set(ORIGINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "Default prefix path" FORCE) -# endif() -# mark_as_advanced(ORIGINAL_INSTALL_PREFIX) - -# if( not( YAP_VERSION VERSION_EQUAL PROJECT_VERSION) ) -# set(CMAKE_INSTALL_PREFIX "${ORIGINAL_INSTALL_PREFIX}-${VERSION}" CACHE STRING "Install path" FORCE) -# set(PROJECT_VERSION ${YAP_VERSION}) -# endif() +add_custom_target (main ALL DEPENDS ${YAP_STARTUP} ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) install ( - TARGETS yap-bin libYap - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) + TARGETS yap-bin libYap + RUNTIME DESTINATION ${bindir} + ARCHIVE DESTINATION ${libdir} + LIBRARY DESTINATION ${libdir} + ) macro_display_feature_log() + diff --git a/cmake/Config.cmake b/cmake/Config.cmake index 043ffdbd9..ad447e702 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -108,7 +108,8 @@ endif (HAVE_LIBM) check_library_exists( dl dlopen "" HAVE_LIBDL ) if (HAVE_LIBDL) - set(EXTRALIBS ${EXTRALIBS} dl) + target_link_libraries(libYap dl) + set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} dl ) set(HAVE_DLOPEN 1) endif (HAVE_LIBDL) @@ -118,84 +119,76 @@ if (WIN32) set(EXTRALIBS ${EXTRALIBS} comdlg32) endif (HAVE_LIBCOMDLG32) check_library_exists( msvcrt strtok "" HAVE_LIBMSCRT ) + if (HAVE_LIBMSCRT) set(EXTRALIBS ${EXTRALIBS} mscrt) endif (HAVE_LIBMSCRT) check_library_exists( shell32 main "" HAVE_LIBSHELL32 ) + if (HAVE_LIBSHELL32) set(EXTRALIBS ${EXTRALIBS} shell32) endif (HAVE_LIBSHELL32) + check_library_exists( wsock32 main "" HAVE_LIBWSOCK32 ) if (HAVE_LIBWSOCK32) set(EXTRALIBS ${EXTRALIBS} wsock32) endif (HAVE_LIBWSOCK32) + + check_library_exists( ws2_32 main "" HAVE_LIBWS2_32 ) + if (HAVE_LIBWS2_32) + set(EXTRALIBS ${EXTRALIBS} ws2_32) + endif (HAVE_LIBWS2_32) endif() check_library_exists( crypt crypt "" HAVE_LIBCRYPT ) if (HAVE_LIBCRYPT) - set(EXTRALIBS ${EXTRALIBS} crypt) + target_link_libraries(libYap crypt) endif (HAVE_LIBCRYPT) check_library_exists( judy Judy1Set "" HAVE_LIBJUDY ) if (HAVE_LIBJUDY) - set(EXTRALIBS ${EXTRALIBS} judy) endif (HAVE_LIBJUDY) check_library_exists( log main "" HAVE_LIBLOG ) if (HAVE_LIBLOG) - set(EXTRALIBS ${EXTRALIBS} log) endif (HAVE_LIBLOG) +# check_library_exists( nsl nis_add "" HAVE_LIBNSL ) +# if (HAVE_LIBNSL) +# target_link_libraries(libYap nsl) +# endif (HAVE_LIBNSL) -check_library_exists( nsl nis_add "" HAVE_LIBNSL ) -if (HAVE_LIBNSL) - set(EXTRALIBS ${EXTRALIBS} nsl) -endif (HAVE_LIBNSL) +# check_library_exists( nss_dns main "" HAVE_LIBNSS_DNS ) +# if (HAVE_LIBNSS_DNS) +# target_link_libraries(libYap nss_dns) +# endif (HAVE_LIBNSS_DNS) -check_library_exists( nss_dns main "" HAVE_LIBNSS_DNS ) -if (HAVE_LIBNSS_DNS) - set(EXTRALIBS ${EXTRALIBS} nss_dns) -endif (HAVE_LIBNSS_DNS) +# check_library_exists( nss_files main "" HAVE_LIBNSS_FILES ) +# if (HAVE_LIBNSS_FILES) +# set(EXTRALIBS ${EXTRALIBS} nss_files) +# endif (HAVE_LIBNSS_FILES) -check_library_exists( nss_files main "" HAVE_LIBNSS_FILES ) -if (HAVE_LIBNSS_FILES) - set(EXTRALIBS ${EXTRALIBS} nss_files) -endif (HAVE_LIBNSS_FILES) +# check_library_exists( psapi main "" HAVE_LIBPSAPI ) +# if (HAVE_LIBPSAPI) +# set(EXTRALIBS ${EXTRALIBS} psapi) +# endif (HAVE_LIBPSAPI) -check_library_exists( psapi main "" HAVE_LIBPSAPI ) -if (HAVE_LIBPSAPI) - set(EXTRALIBS ${EXTRALIBS} psapi) -endif (HAVE_LIBPSAPI) - -check_library_exists( resolv main "" HAVE_LIBRESOLV ) -if (HAVE_LIBRESOLV) - set(EXTRALIBS ${EXTRALIBS} resolv) -endif (HAVE_LIBRESOLV) +# check_library_exists( resolv main "" HAVE_LIBRESOLV ) +# if (HAVE_LIBRESOLV) +# set(EXTRALIBS ${EXTRALIBS} resolv) +# endif (HAVE_LIBRESOLV) -check_library_exists( socket main "" HAVE_LIBSOCKET ) -if (HAVE_LIBSOCKET) - set(EXTRALIBS ${EXTRALIBS} socket) -endif (HAVE_LIBSOCKET) - -check_library_exists( stdc__ main "" HAVE_LIBSTDC__ ) -if (HAVE_LIBSTDC__) - set(EXTRALIBS ${EXTRALIBS} stdc__) -endif (HAVE_LIBSTDC__) +# check_library_exists( socket socket "" HAVE_LIBSOCKET ) +# if (HAVE_LIBSOCKET) +# set(EXTRALIBS ${EXTRALIBS} socket) +# endif (HAVE_LIBSOCKET) check_library_exists( unicode main "" HAVE_LIBUNICODE ) if (HAVE_LIBUNICODE) set(EXTRALIBS ${EXTRALIBS} unicode) endif (HAVE_LIBUNICODE) - - - -check_library_exists( ws2_32 main "" HAVE_LIBWS2_32 ) -if (HAVE_LIBWS2_32) - set(EXTRALIBS ${EXTRALIBS} ws2_32) -endif (HAVE_LIBWS2_32) - check_library_exists( xnet main "" HAVE_LIBXNET ) if (HAVE_LIBXNET) set(EXTRALIBS ${EXTRALIBS} xnet) diff --git a/cmake/EmptyArray.c b/cmake/EmptyArray.c new file mode 100644 index 000000000..1c51afb24 --- /dev/null +++ b/cmake/EmptyArray.c @@ -0,0 +1,9 @@ +#include + +int array[0]; + +int +main () +{ + return array[1]; +} diff --git a/cmake/FindGecode.cmake b/cmake/FindGecode.cmake index 318c76d56..5a37d173b 100644 --- a/cmake/FindGecode.cmake +++ b/cmake/FindGecode.cmake @@ -2,7 +2,7 @@ #Works under the assumption than when gecode is installed at least the kernel component exists # Look for the header file -find_path(GECODE_INCLUDE_DIR NAMES gecode/kernel.hh) +find_path(GECODE_INCLUDE_DIR NAMES gecode/kernel.hh ) find_file(GECODE_CONFIG gecode/support/config.hpp) # Look for the library find_library(GECODE_LIBRARY NAMES gecodekernel) @@ -40,6 +40,10 @@ if(GECODE_FOUND) if(GECODE_INT_LIBRARY) list(APPEND GECODE_LIBRARIES ${GECODE_INT_LIBRARY}) endif() + find_library(GECODE_FLOAT_LIBRARY gecodefloat) + if(GECODE_FLOAT_LIBRARY) + list(APPEND GECODE_LIBRARIES ${GECODE_FLOAT_LIBRARY}) + endif() find_library(GECODE_MM_LIBRARY gecodeminimodel) if(GECODE_MM_LIBRARY) list(APPEND GECODE_LIBRARIES ${GECODE_MM_LIBRARY}) diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake index 5441aff64..b64cf144a 100644 --- a/cmake/FindR.cmake +++ b/cmake/FindR.cmake @@ -1,99 +1,77 @@ -# -*- cmake -*- + # -# FindR.cmake: Try to find R +# - This module locates an installed R distribution. # -# (C) Copyright 2005-2012 EDF-EADS-Phimeca +# Defines the following: +# R_COMMAND - Path to R command +# R_HOME - Path to 'R home', as reported by R +# R_INCLUDE_DIR - Path to R include directory +# R_LIBRARY_BASE - Path to R library +# R_LIBRARY_BLAS - Path to Rblas / blas library +# R_LIBRARY_LAPACK - Path to Rlapack / lapack library +# R_LIBRARY_READLINE - Path to readline library +# R_LIBRARIES - Array of: R_LIBRARY_BASE, R_LIBRARY_BLAS, R_LIBRARY_LAPACK, R_LIBRARY_BASE [, R_LIBRARY_READLINE] # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. +# VTK_R_HOME - (deprecated, use R_HOME instead) Path to 'R home', as reported by R # -# This library is distributed in the hope that it will be useful -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. +# Variable search order: +# 1. Attempt to locate and set R_COMMAND +# - If unsuccessful, generate error and prompt user to manually set R_COMMAND +# 2. Use R_COMMAND to set R_HOME +# 3. Locate other libraries in the priority: +# 1. Within a user-built instance of R at R_HOME +# 2. Within an installed instance of R +# 3. Within external system libraries # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# @author dutka -# @date 2010-02-04 16:44:49 +0100 (Thu, 04 Feb 2010) -# Id Makefile.am 1473 2010-02-04 15:44:49Z dutka -# -# -# - Try to find R -# Once done this will define -# -# R_FOUND - System has R -# R_LIBRARIES - The libraries needed to use R -# R_DEFINITIONS - Compiler switches required for using R -# R_EXECUTABLE - The R interpreter +set(TEMP_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE}) +set(CMAKE_FIND_APPBUNDLE "NEVER") +find_program(R_COMMAND R DOC "R executable.") +set(CMAKE_FIND_APPBUNDLE ${TEMP_CMAKE_FIND_APPBUNDLE}) -if ( R_EXECUTABLE AND R_LIBRARIES ) - # in cache already - set( R_FIND_QUIETLY TRUE ) -endif ( R_EXECUTABLE AND R_LIBRARIES ) +if(R_COMMAND) + execute_process(WORKING_DIRECTORY . + COMMAND ${R_COMMAND} RHOME + OUTPUT_VARIABLE R_ROOT_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + # deprecated + if(VTK_R_HOME) + set(R_HOME ${VTK_R_HOME} CACHE PATH "R home directory obtained from R RHOME") + else() + set(R_HOME ${R_ROOT_DIR} CACHE PATH "R home directory obtained from R RHOME") + set(VTK_R_HOME ${R_HOME}) + endif() + # /deprecated + # the following command does nothing currently, but will be used when deprecated code is removed + set(R_HOME ${R_ROOT_DIR} CACHE PATH "R home directory obtained from R RHOME") -#IF (NOT WIN32) -# # use pkg-config to get the directories and then use these values -# # in the FIND_PATH() and FIND_LIBRARY() calls -# FIND_PACKAGE(PkgConfig) -# PKG_CHECK_MODULES(PC_R R) -# SET(R_DEFINITIONS ${PC_R_CFLAGS_OTHER}) -#ENDIF (NOT WIN32) + find_path(R_INCLUDE_DIR R.h + HINTS ${R_ROOT_DIR} + PATHS /usr/local/lib /usr/local/lib64 /usr/share + PATH_SUFFIXES include R/include + DOC "Path to file R.h") -find_program ( R_EXECUTABLE - NAMES R R.exe - DOC "Path to the R command interpreter" - ) + find_library(R_LIBRARY_BASE R + HINTS ${R_ROOT_DIR}/lib + DOC "R library (example libR.a, libR.dylib, etc.).") -get_filename_component ( _R_EXE_PATH ${R_EXECUTABLE} PATH ) + find_library(R_LIBRARY_BLAS NAMES Rblas blas + HINTS ${R_ROOT_DIR}/lib + DOC "Rblas library (example libRblas.a, libRblas.dylib, etc.).") -if ( R_EXECUTABLE ) - execute_process ( COMMAND ${R_EXECUTABLE} RHOME - OUTPUT_VARIABLE _R_HOME - OUTPUT_STRIP_TRAILING_WHITESPACE - ) -endif ( R_EXECUTABLE ) + find_library(R_LIBRARY_LAPACK NAMES Rlapack lapack + HINTS ${R_ROOT_DIR}/lib + DOC "Rlapack library (example libRlapack.a, libRlapack.dylib, etc.).") -find_library ( R_LIBRARIES - NAMES R - HINTS - ${PC_R_LIBDIR} - ${PC_R_LIBRARY_DIRS} - ${_R_HOME}/lib - ${_R_HOME}/lib/x86_64 -) + find_library(R_LIBRARY_READLINE readline + DOC "(Optional) system readline library. Only required if the R libraries were built with readline support.") -set ( R_PACKAGES ) -if ( R_EXECUTABLE ) - foreach ( _component ${R_FIND_COMPONENTS} ) - if ( NOT R_${_component}_FOUND ) - execute_process ( COMMAND echo "library(${_component})" - COMMAND ${R_EXECUTABLE} --no-save --silent --no-readline --slave - RESULT_VARIABLE _res - OUTPUT_VARIABLE _trashout - ERROR_VARIABLE _trasherr - ) - if ( NOT _res ) - message ( STATUS "Looking for R package ${_component} - found" ) - set ( R_${_component}_FOUND 1 CACHE INTERNAL "True if R package ${_component} is here" ) - else ( NOT _res ) - message ( STATUS "Looking for R package ${_component} - not found" ) - set ( R_${_component}_FOUND 0 CACHE INTERNAL "True if R package ${_component} is here" ) - endif ( NOT _res ) - list ( APPEND R_PACKAGES R_${_component}_FOUND ) - endif ( NOT R_${_component}_FOUND ) - endforeach ( _component ) -endif ( R_EXECUTABLE ) +else() + message(SEND_ERROR "FindR.cmake requires the following variables to be set: R_COMMAND") +endif() -include ( FindPackageHandleStandardArgs ) - -# handle the QUIETLY and REQUIRED arguments and set R_FOUND to TRUE if -# all listed variables are TRUE -find_package_handle_standard_args ( R DEFAULT_MSG R_EXECUTABLE R_LIBRARIES ${R_PACKAGES} ) - -mark_as_advanced ( R_EXECUTABLE R_LIBRARIES ${R_PACKAGES} ) +# Note: R_LIBRARY_BASE is added to R_LIBRARIES twice; this may be due to circular linking dependencies; needs further investigation +set(R_LIBRARIES ${R_LIBRARY_BASE} ${R_LIBRARY_BLAS} ${R_LIBRARY_LAPACK} ${R_LIBRARY_BASE}) +if(R_LIBRARY_READLINE) + set(R_LIBRARIES ${R_LIBRARIES} ${R_LIBRARY_READLINE}) +endif() diff --git a/cmake/FindRAPTOR.cmake b/cmake/FindRAPTOR.cmake deleted file mode 100755 index a399d9ccf..000000000 --- a/cmake/FindRAPTOR.cmake +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright (C) 2012 - 2013 by Pedro Mendes, Virginia Tech Intellectual -# Properties, Inc., University of Heidelberg, and The University -# of Manchester. -# All rights reserved. - -# - Try to find the Raptor RDF parsing library (http://librdf.org/raptor/) -# Once done this will define -# -# RAPTOR_FOUND - system has Raptor -# RAPTOR_LIBRARIES - Link these to use Raptor -# RAPTOR_INCLUDE_DIR - Include directory for using Raptor -# RAPTOR_DEFINITIONS - Compiler switches required for using Raptor -# -# Capabilities -# RAPTOR_HAVE_TRIG - Set if raptor has TRIG - -# (c) 2007-2011 Sebastian Trueg -# (c) 2011 Artem Serebriyskiy -# (c) 2011 Michael Jansen -# -# Based on FindFontconfig Copyright (c) 2006,2007 Laurent Montel, -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - - -MACRO (FIND_RAPTOR) - -ENDMACRO () - - - -# Check if we have cached results in case the last round was successful. -if (NOT (RAPTOR_INCLUDE_DIR AND RAPTOR_LIBRARIES) OR NOT RAPTOR_FOUND) - - set(RAPTOR_LDFLAGS) - - find_path(RAPTOR_INCLUDE_DIR raptor.h - PATHS $ENV{RAPTOR_DIR}/include - $ENV{RAPTOR_DIR} - ~/Library/Frameworks - /Library/Frameworks - /sw/include # Fink - /opt/local/include # MacPorts - /opt/csw/include # Blastwave - /opt/include - /usr/freeware/include - NO_DEFAULT_PATH) - - if (NOT RAPTOR_INCLUDE_DIR) - find_path(RAPTOR_INCLUDE_DIR raptor.h) - endif () - - find_library(RAPTOR_LIBRARY - NAMES raptor - PATHS $ENV{RAPTOR_DIR}/lib - $ENV{RAPTOR_DIR}/lib-dbg - $ENV{RAPTOR_DIR} - ~/Library/Frameworks - /Library/Frameworks - /sw/lib # Fink - /opt/local/lib # MacPorts - /opt/csw/lib # Blastwave - /opt/lib - /usr/freeware/lib64 - NO_DEFAULT_PATH) - - if (NOT RAPTOR_LIBRARY) - find_library(RAPTOR_LIBRARY NAMES raptor) - endif () - - if (NOT WIN32) - find_package(PkgConfig) - pkg_check_modules(PC_RAPTOR QUIET raptor) - - if (PC_RAPTOR_FOUND) - set(RAPTOR_DEFINITIONS ${PC_RAPTOR_CFLAGS_OTHER}) - set(RAPTOR_VERSION ${PC_RAPTOR_VERSION} CACHE STRING "Raptor Version found" ) - string( REGEX REPLACE "^.*-lraptor;" "" RAPTOR_LDFLAGS "${PC_RAPTOR_STATIC_LDFLAGS}") - string( REGEX REPLACE "-lexpat[;]*" "" RAPTOR_LDFLAGS "${RAPTOR_LDFLAGS}") - endif (PC_RAPTOR_FOUND) - endif (NOT WIN32) - - if (RAPTOR_LDFLAGS) - set(RAPTOR_LIBRARY ${RAPTOR_LIBRARY} ${RAPTOR_LDFLAGS}) - endif (RAPTOR_LDFLAGS) - - mark_as_advanced(RAPTOR_INCLUDE_DIR RAPTOR_LIBRARY) - -endif () # Check for cached values - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args( - Raptor - VERSION_VAR RAPTOR_VERSION - REQUIRED_VARS RAPTOR_LIBRARY RAPTOR_INCLUDE_DIR) - -mark_as_advanced(RAPTOR_VERSION) - -if (NOT RAPTOR_FOUND AND Raptor_FIND_VERSION_MAJOR EQUAL "2" AND NOT Raptor_FIND_QUIET ) - pkg_check_modules(PC_RAPTOR QUIET raptor) - if (PC_RAPTOR_FOUND) - message( STATUS "You have raptor1 version ${PC_RAPTOR_VERSION} installed. Please update." ) - endif () -endif () diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake index 7c160766e..548645cb4 100644 --- a/cmake/FindReadline.cmake +++ b/cmake/FindReadline.cmake @@ -1,21 +1,82 @@ -# Find the Readline libraries -# -# READLINE_FOUND - system has Readline lib -# READLINE_INCLUDE_DIR - the Readline include directory -# READLINE_LIBRARIES - Libraries needed to use Readline -# READLINE_HAVE_READLINE_HISTORY_H - true if readline/history.h is available +# - Find the readline library +# This module defines +# READLINE_INCLUDE_DIR, path to readline/readline.h, etc. +# READLINE_LIBRARIES, the libraries required to use READLINE. +# READLINE_FOUND, If false, do not try to use READLINE. +# also defined, but not for general use are +# READLINE_readline_LIBRARY, where to find the READLINE library. +# READLINE_ncurses_LIBRARY, where to find the ncurses library [might not be defined] -if (READLINE_INCLUDE_DIR AND READLINE_LIBRARIES) - # Already in cache, be silent - set(READLINE_FIND_QUIETLY TRUE) -endif (READLINE_INCLUDE_DIR AND READLINE_LIBRARIES) +# Apple readline does not support readline hooks +# So we look for another one by default +IF(APPLE) + FIND_PATH(READLINE_INCLUDE_DIR NAMES readline/readline.h PATHS + /sw/include + /opt/local/include + /opt/include + /usr/local/opt/readline/include #brew + /usr/local/include + /usr/include/ + NO_DEFAULT_PATH + ) +ENDIF(APPLE) +FIND_PATH(READLINE_INCLUDE_DIR NAMES readline/readline.h) -find_path(READLINE_INCLUDE_DIR NAMES readline/readline.h ) -find_library(READLINE_LIBRARIES NAMES readline libreadline) -find_file(READLINE_HAVE_READLINE_HISTORY_H readline/history.h) +# Apple readline does not support readline hooks +# So we look for another one by default +IF(APPLE) + FIND_LIBRARY(READLINE_readline_LIBRARY NAMES readline PATHS + /sw/lib + /opt/local/lib + /usr/local/opt/readline/lib #brew + /opt/lib + /usr/local/lib + /usr/lib + NO_DEFAULT_PATH + ) +ENDIF(APPLE) +FIND_LIBRARY(READLINE_readline_LIBRARY NAMES readline) -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(READLINE DEFAULT_MSG READLINE_INCLUDE_DIR READLINE_LIBRARIES) +# Sometimes readline really needs ncurses +IF(APPLE) + FIND_LIBRARY(READLINE_ncurses_LIBRARY NAMES ncurses PATHS + /sw/lib + /opt/local/lib + /opt/lib + /usr/local/lib + /usr/lib + NO_DEFAULT_PATH + ) +ENDIF(APPLE) +FIND_LIBRARY(READLINE_ncurses_LIBRARY NAMES ncurses) -mark_as_advanced(READLINE_INCLUDE_DIR READLINE_LIBRARIES) +MARK_AS_ADVANCED( + READLINE_INCLUDE_DIR + READLINE_readline_LIBRARY + READLINE_ncurses_LIBRARY + ) + +SET( READLINE_FOUND "NO" ) +IF(READLINE_INCLUDE_DIR) + IF(READLINE_readline_LIBRARY) + SET( READLINE_FOUND "YES" ) + SET( READLINE_LIBRARIES + ${READLINE_readline_LIBRARY} + ) + + # some readline libraries depend on ncurses + IF(READLINE_ncurses_LIBRARY) + SET(READLINE_LIBRARIES ${READLINE_LIBRARIES} ${READLINE_ncurses_LIBRARY}) + ENDIF(READLINE_ncurses_LIBRARY) + + ENDIF(READLINE_readline_LIBRARY) +ENDIF(READLINE_INCLUDE_DIR) + +IF(READLINE_FOUND) + MESSAGE(STATUS "Found readline library") +ELSE(READLINE_FOUND) + IF(READLINE_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find readline -- please give some paths to CMake") + ENDIF(READLINE_FIND_REQUIRED) +ENDIF(READLINE_FOUND) diff --git a/cmake/TestForHighBitCharacters.c b/cmake/TestForHighBitCharacters.c new file mode 100644 index 000000000..338cc5ef7 --- /dev/null +++ b/cmake/TestForHighBitCharacters.c @@ -0,0 +1,22 @@ +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int + main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) + exit(1); + exit (0); +} diff --git a/cmake/TestSignalType.c b/cmake/TestSignalType.c new file mode 100644 index 000000000..aca0bf4ed --- /dev/null +++ b/cmake/TestSignalType.c @@ -0,0 +1,16 @@ +#include +#include +#ifdef signal +# undef signal +#endif +#ifdef __cplusplus +extern "C" void (*signal (int, void (*)(int)))(int); +#else +void (*signal ()) (); +#endif + +int +main () +{ + return 0; +} diff --git a/config.h.cmake b/config.h.cmake index 4c3cc091d..b71ac7c7a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -16,7 +16,7 @@ /* longs should be in addresses that are multiple of four. */ #ifndef ALIGN_LONGS -#cmakedefine ALIGN_LONGS "${ALIGN_LONGS}" +#define ALIGN_LONGS 1 #endif /* if fflush(NULL) clobbers input pipes1 */ @@ -54,14 +54,9 @@ #define C_LIBS "${EXTRALIBS}" #endif -/* "Define if _XOPEN_SOURCE is needed" */ -#ifndef DEFINE_XOPEN_SOURCE -#cmakedefine DEFINE_XOPEN_SOURCE "${DEFINE_XOPEN_SOURCE}" -#endif - /* IEEE floating-point, basically everyone except old VAXEN */ #ifndef FFIEEE -#cmakedefine FFIEEE "${FFIEEE}" +#define FFIEEE 1 #endif /* old HP-UX VM magic, should be irrelevant now */ @@ -69,14 +64,11 @@ #cmakedefine FORCE_SECOND_QUADRANT "${FORCE_SECOND_QUADRANT}" #endif -/* support GNU extensions */ -#ifndef _GNU_SOURCE -#cmakedefine _GNU_SOURCE "${_GNU_SOURCE}" -#endif - -/* use Barts idea of allocating extra memory */ +/* use Barts idea of allocating extra memory, + probbly better to use two bits on 64bit machines +*/ #ifndef GC_NO_TAGS -#cmakedefine GC_NO_TAGS "${GC_NO_TAGS}" +#define GC_NO_TAGS 1 #endif /* Define if gethostname() is provided */ @@ -286,7 +278,7 @@ function. */ /* Define to 1 if you have the declaration of `rl_catch_signals ', and to 0 if you don't. */ #ifndef HAVE_DECL_RL_CATCH_SIGNALS_ -#cmakedefine HAVE_DECL_RL_CATCH_SIGNALS_ ${HAVE_DECL_RL_CATCH_SIGNALS_} +#cmakedefine HAVE_DECL_RL_CATCH_SIGNALS ${HAVE_DECL_RL_CATCH_SIGNALS} #endif /* Define to 1 if you have the declaration of `rl_done ', and to 0 if you @@ -604,132 +596,132 @@ you don't. */ /* Define to 1 if you have the `android' library (-landroid). */ #ifndef HAVE_LIBANDROID -#cmakedefine HAVE_LIBANDROID ${HAVE_LIBANDROID} +#define HAVE_LIBANDROID ${HAVE_LIBANDROID} #endif /* Define to 1 if you have the `comdlg32' library (-lcomdlg32). */ #ifndef HAVE_LIBCOMDLG32 -#cmakedefine HAVE_LIBCOMDLG32 ${HAVE_LIBCOMDLG32} +#define HAVE_LIBCOMDLG32 ${HAVE_LIBCOMDLG32} #endif /* Define to 1 if you have the `crypt' library (-lcrypt). */ #ifndef HAVE_LIBCRYPT -#cmakedefine HAVE_LIBCRYPT ${HAVE_LIBCRYPT} +#define HAVE_LIBCRYPT ${HAVE_LIBCRYPT} #endif /* Define to 1 if you have the `gmp' library (-lgmp). */ #ifndef HAVE_LIBGMP -#cmakedefine HAVE_LIBGMP ${HAVE_LIBGMP} +#define HAVE_LIBGMP ${HAVE_LIBGMP} #endif /* Define to 1 if you have the `Judy' library (-lJudy). */ #ifndef HAVE_LIBJUDY -#cmakedefine HAVE_LIBJUDY ${HAVE_LIBJUDY} +#define HAVE_LIBJUDY ${HAVE_LIBJUDY} #endif /* Define to 1 if you have the header file. */ #ifndef HAVE_LIBLOADERAPI_H -#cmakedefine HAVE_LIBLOADERAPI_H ${HAVE_LIBLOADERAPI_H} +#define HAVE_LIBLOADERAPI_H ${HAVE_LIBLOADERAPI_H} #endif /* Define to 1 if you have the `log' library (-llog). */ #ifndef HAVE_LIBLOG -#cmakedefine HAVE_LIBLOG ${HAVE_LIBLOG} +#define HAVE_LIBLOG ${HAVE_LIBLOG} #endif /* Define to 1 if you have the `m' library (-lm). */ #ifndef HAVE_LIBM -#cmakedefine HAVE_LIBM ${HAVE_LIBM} +#define HAVE_LIBM ${HAVE_LIBM} #endif /* MPI Debugging off */ #ifndef HAVE_LIBMPE -#cmakedefine HAVE_LIBMPE ${HAVE_LIBMPE} +#define HAVE_LIBMPE ${HAVE_LIBMPE} #endif /* Define to 1 if you have the `mscrt' library (-lmscrt). */ #ifndef HAVE_LIBMSCRT -#cmakedefine HAVE_LIBMSCRT ${HAVE_LIBMSCRT} +#define HAVE_LIBMSCRT ${HAVE_LIBMSCRT} #endif /* "Define if you have the nsl library (-lnsl)." */ #ifndef HAVE_LIBNSL -#cmakedefine HAVE_LIBNSL ${HAVE_LIBNSL} +#define HAVE_LIBNSL ${HAVE_LIBNSL} #endif /* Define to 1 if you have the `nss_dns' library (-lnss_dns). */ #ifndef HAVE_LIBNSS_DNS -#cmakedefine HAVE_LIBNSS_DNS ${HAVE_LIBNSS_DNS} +#define HAVE_LIBNSS_DNS ${HAVE_LIBNSS_DNS} #endif /* Define to 1 if you have the `nss_files' library (-lnss_files). */ #ifndef HAVE_LIBNSS_FILES -#cmakedefine HAVE_LIBNSS_FILES ${HAVE_LIBNSS_FILES} +#define HAVE_LIBNSS_FILES ${HAVE_LIBNSS_FILES} #endif /* Define to 1 if you have the `psapi' library (-lpsapi). */ #ifndef HAVE_LIBPSAPI -#cmakedefine HAVE_LIBPSAPI ${HAVE_LIBPSAPI} +#define HAVE_LIBPSAPI ${HAVE_LIBPSAPI} #endif /* Define to 1 if you have the `pthread' library (-lpthread). */ #ifndef HAVE_LIBPTHREAD -#cmakedefine HAVE_LIBPTHREAD ${HAVE_LIBPTHREAD} +#define HAVE_LIBPTHREAD ${HAVE_LIBPTHREAD} #endif /* Define to 1 if you have the `raptor' library (-lraptor). */ #ifndef HAVE_LIBRAPTOR -#cmakedefine HAVE_LIBRAPTOR ${HAVE_LIBRAPTOR} +#define HAVE_LIBRAPTOR ${HAVE_LIBRAPTOR} #endif /* Define to 1 if you have the `raptor2' library (-lraptor2). */ #ifndef HAVE_LIBRAPTOR2 -#cmakedefine HAVE_LIBRAPTOR2 ${HAVE_LIBRAPTOR2} +#define HAVE_LIBRAPTOR2 ${HAVE_LIBRAPTOR2} #endif /* Define if you have libreadline */ #ifndef HAVE_LIBREADLINE -#cmakedefine HAVE_LIBREADLINE ${READLINE_FOUND} +#define HAVE_LIBREADLINE ${READLINE_FOUND} #endif /* Define to 1 if you have the `resolv' library (-lresolv). */ #ifndef HAVE_LIBRESOLV -#cmakedefine HAVE_LIBRESOLV ${HAVE_LIBRESOLV} +#define HAVE_LIBRESOLV ${HAVE_LIBRESOLV} #endif /* Define to 1 if you have the `shell32' library (-lshell32). */ #ifndef HAVE_LIBSHELL32 -#cmakedefine HAVE_LIBSHELL32 ${HAVE_LIBSHELL32} +#define HAVE_LIBSHELL32 ${HAVE_LIBSHELL32} #endif /* "Define if you have the socket library (-lsocket)." */ #ifndef HAVE_LIBSOCKET -#cmakedefine HAVE_LIBSOCKET ${HAVE_LIBSOCKET} +#define HAVE_LIBSOCKET ${HAVE_LIBSOCKET} #endif /* Define to 1 if you have the `stdc++' library (-lstdc++). */ #ifndef HAVE_LIBSTDC__ -#cmakedefine HAVE_LIBSTDC__ ${HAVE_LIBSTDC__} +#define HAVE_LIBSTDC__ ${HAVE_LIBSTDC__} #endif /* Whether we have libunicode.a */ #ifndef HAVE_LIBUNICODE -#cmakedefine HAVE_LIBUNICODE ${HAVE_LIBUNICODE} +#define HAVE_LIBUNICODE ${HAVE_LIBUNICODE} #endif /* Define to 1 if you have the `ws2_32' library (-lws2_32). */ #ifndef HAVE_LIBWS2_32 -#cmakedefine HAVE_LIBWS2_32 ${HAVE_LIBWS2_32} +#define HAVE_LIBWS2_32 ${HAVE_LIBWS2_32} #endif /* Define to 1 if you have the `wsock32' library (-lwsock32). */ #ifndef HAVE_LIBWSOCK32 -#cmakedefine HAVE_LIBWSOCK32 ${HAVE_LIBWSOCK32} +#define HAVE_LIBWSOCK32 ${HAVE_LIBWSOCK32} #endif /* Define to 1 if you have the `xnet' library (-lxnet). */ #ifndef HAVE_LIBXNET -#cmakedefine HAVE_LIBXNET ${HAVE_LIBXNET} +#define HAVE_LIBXNET ${HAVE_LIBXNET} #endif /* Define to 1 if you have the header file. */ @@ -959,12 +951,12 @@ you don't. */ /* Define to 1 if you have the header file. */ #ifndef HAVE_READLINE_HISTORY_H -#cmakedefine HAVE_READLINE_HISTORY_H ${HAVE_READLINE_HISTORY_H} +#define HAVE_READLINE_HISTORY_H ${HAVE_READLINE_HISTORY_H} #endif /* Define to 1 if you have the header file. */ #ifndef HAVE_READLINE_READLINE_H -#cmakedefine HAVE_READLINE_READLINE_H ${HAVE_READLINE_READLINE_H} +#define HAVE_READLINE_READLINE_H ${HAVE_READLINE_READLINE_H} #endif /* Define to 1 if you have the `readlink' function. */ @@ -1038,9 +1030,14 @@ signal. */ #cmakedefine HAVE_RL_DISCARD_ARGUMENT ${HAVE_RL_DISCARD_ARGUMENT} #endif +/* Define to 1 if you have the `rl_done' variable. */ +#ifndef HAVE_RL_DONE +#define HAVE_RL_DONE ${HAVE_RL_DONE} +#endif + /* Define to 1 if you have the `rl_filename_completion_function' function. */ #ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION -#cmakedefine HAVE_RL_FILENAME_COMPLETION_FUNCTION ${HAVE_RL_FILENAME_COMPLETION_FUNCTION} +#define HAVE_RL_FILENAME_COMPLETION_FUNCTION ${HAVE_RL_FILENAME_COMPLETION_FUNCTION} #endif /* Define to 1 if you have the `rl_free_line_state' function. */ @@ -1406,6 +1403,7 @@ signal. */ /* Define to 1 if you have the header file. */ #ifndef HAVE_SYS_SOCKET_H + #cmakedefine HAVE_SYS_SOCKET_H ${HAVE_SYS_SOCKET_H} #endif @@ -1616,12 +1614,12 @@ signal. */ /* max number of threads, default 1 or 1024 */ #ifndef MAX_THREADS -#cmakedefine MAX_THREADS "${MAX_THREADS}" +#cmakedefine MAX_THREADS ${MAX_THREADS} #endif /* maximum amount of or-parallelism */ #ifndef MAX_WORKERS -#cmakedefine MAX_WORKERS "${MAX_WORKERS}" +#cmakedefine MAX_WORKERS ${MAX_WORKERS} #endif /* o not use realloc() from HP-UX 10.20 together with MPI */ @@ -1631,12 +1629,12 @@ signal. */ /* compiler should shift offsets. */ #ifndef MSHIFTOFFS -#cmakedefine MSHIFTOFFS "${MSHIFTOFFS}" +#cmakedefine MSHIFTOFFS ${MSHIFTOFFS} #endif /* myddas release */ #ifndef MYDDAS_VERSION -#cmakedefine MYDDAS_VERSION "${MYDDAS_VERSION}" +#define MYDDAS_VERSION "${MYDDAS_VERSION}" #endif /* at least 2M Cells for Heap */ @@ -1701,7 +1699,7 @@ signal. */ /* Define to the version of this package. */ #ifndef PACKAGE_VERSION -#cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}" +#define PACKAGE_VERSION "${YAP_VERSION}" #endif /* Define as the return type of signal handlers (`int' or `void'). */ @@ -1786,7 +1784,7 @@ signal. */ /* relocable objects */ #ifndef SO_EXT -#define SO_EXT "${CMAKE_SHARED_LIBRARY_PREFIX}" +#define SO_EXT "${CMAKE_SHARED_LIBRARY_SUFFIX}" #endif /* library search variable */ @@ -1886,17 +1884,17 @@ significant byte first (like Motorola and SPARC, unlike Intel). */ /* where the yap executable lives */ #ifndef YAP_BINDIR -#define YAP_BINDIR "${bindir}" +#define YAP_BINDIR "${YAP_BINDIR}" #endif /* YAP version string */ #ifndef YAP_FULL_VERSION -#define YAP_FULL_VERSION "${YAP_FULL_VERSION}" +#define YAP_FULL_VERSION "YAP ${YAP_FULL_VERSION}: ${YAP_ARCH}-${CMAKE_SYSTEM}, @${YAP_SITE}, ${YAP_TIMESTAMP}" #endif /* where to look for shared libraries */ #ifndef YAP_LIBDIR -#define YAP_LIBDIR "${libdir}" +#define YAP_LIBDIR "${YAP_LIBDIR}" #endif /* numerical version */ @@ -1941,7 +1939,7 @@ significant byte first (like Motorola and SPARC, unlike Intel). */ /* name of YAP library */ #ifndef YAP_YAPLIB -#cmakedefine YAP_YAPLIB "${YAP_YAPLIB}" +#define YAP_YAPLIB "${YAP_YAPLIB}" #endif /* HP-UX old socket stuff */ diff --git a/console/yap.c b/console/yap.c index 8d7494291..604b1f576 100755 --- a/console/yap.c +++ b/console/yap.c @@ -167,6 +167,7 @@ main (int argc, char **argv) t_goal = YAP_MkApplTerm(YAP_MkFunctor(YAP_LookupAtom("ypp_define"),2), 2, t_args); YAP_RunGoalOnce(t_goal); } + } YAP_Reset( YAP_FULL_RESET ); /* End preprocessor code */ diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index c2729609b..d39e2db54 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -1,3 +1,64 @@ +set (LIBRARY_PL + INDEX.pl + apply.yap + apply_macros.yap + arg.yap + assoc.yap + atts.yap + autoloader.yap + avl.yap + bhash.yap + charsio.yap + coinduction.yap + dbqueues.yap + dbusage.yap + dgraphs.yap + exo_interval.yap + expand_macros.yap + gensym.yap + hacks.yap + heaps.yap + lambda.pl + lineutils.yap + listing.yap + lists.yap + nb.yap + ordsets.yap + mapargs.yap + maplist.yap + maputils.yap + matlab.yap + matrix.yap + prandom.yap + queues.yap + random.yap + range.yap + rbtrees.yap + regexp.yap + rltree.yap + sockets.yap + splay.yap + stringutils.yap + system.yap + terms.yap + tries.yap + itries.yap + timeout.yap + trees.yap + ugraphs.yap + undgraphs.yap + varnumbers.yap + wdgraphs.yap + wgraphs.yap + wundgraphs.yap + lam_mpi.yap + ypp.yap + c_alarms.yap + flags.yap + block_diagram.yap + ) + +add_subdirectory(clp) add_subdirectory(lammpi) add_subdirectory(matlab) add_subdirectory(matrix) @@ -7,3 +68,11 @@ add_subdirectory(regex) add_subdirectory(rltree) add_subdirectory(system) add_subdirectory(tries) + +install(FILES ${LIBRARY_PL} + DESTINATION ${libpl} + ) + + + + diff --git a/library/matlab/CMakeLists.txt b/library/matlab/CMakeLists.txt index 9d50040b9..8295d320b 100644 --- a/library/matlab/CMakeLists.txt +++ b/library/matlab/CMakeLists.txt @@ -1,6 +1,6 @@ macro_optional_find_package (Matlab OFF) macro_log_feature (MATLAB_FOUND "matlab" - "MATLAB Distributed Parallel Programming" + "MATLAB A Language for Technical Computing" "http://matlab.com") if (MATLAB_FOUND) # MATLAB_INCLUDE_DIR: include path for mex.h, engine.h @@ -8,5 +8,16 @@ if (MATLAB_FOUND) # MATLAB_MEX_LIBRARY: path to libmex.lib # MATLAB_MX_LIBRARY: path to libmx.lib # MATLAB_ENG_LIBRARY: path to libeng.lib + + add_library (matlab SHARED matlab.c) + + set_target_properties (matlab PROPERTIES prefix "") + + include_directories (${MATLAB_INCLUDE_DIR}) + target_link_libraries(matlab libYap $(MATLAB_LIBRARIES) ) + + install(TARGETS matlab + LIBRARY DESTINATION ${dlls} ) + endif (MATLAB_FOUND) diff --git a/library/matrix/CMakeLists.txt b/library/matrix/CMakeLists.txt index e69de29bb..4544b4fea 100644 --- a/library/matrix/CMakeLists.txt +++ b/library/matrix/CMakeLists.txt @@ -0,0 +1,10 @@ + +add_library (matrix SHARED matrix.c) + +target_link_libraries(matrix libYap) + +set_target_properties (matrix PROPERTIES PREFIX "") + +install(TARGETS matrix + LIBRARY DESTINATION ${dlls} ) + diff --git a/library/random/CMakeLists.txt b/library/random/CMakeLists.txt index e69de29bb..5b585c9e4 100644 --- a/library/random/CMakeLists.txt +++ b/library/random/CMakeLists.txt @@ -0,0 +1,10 @@ + +add_library (yap_random SHARED yap_random.c) + +target_link_libraries(yap_random libYap) + +set_target_properties (yap_random PROPERTIES PREFIX "") + +install(TARGETS yap_random + LIBRARY DESTINATION ${dlls} ) + diff --git a/library/regex/CMakeLists.txt b/library/regex/CMakeLists.txt index e69de29bb..801149770 100644 --- a/library/regex/CMakeLists.txt +++ b/library/regex/CMakeLists.txt @@ -0,0 +1,22 @@ + +add_library (regexp SHARED regexp.c) + +if( NOT HAVE_REGEX_H ) + set ( REGEX_SOURCES + cclass.h + cname.h + collate.h + utils.h + yapregex.h + engine.c + regcomp.c + ) +endif( NOT HAVE_REGEX_H ) + +target_link_libraries(regexp libYap ${REGEX_SOURCES}) + +set_target_properties (regexp PROPERTIES PREFIX "") + +install(TARGETS regexp + LIBRARY DESTINATION ${dlls} ) + diff --git a/library/rltree/CMakeLists.txt b/library/rltree/CMakeLists.txt index e69de29bb..50cc6555b 100644 --- a/library/rltree/CMakeLists.txt +++ b/library/rltree/CMakeLists.txt @@ -0,0 +1,15 @@ + +set ( RLTREE_SOURCES + range_list.c + range_list.h + ) + +add_library (yap_rl SHARED yap_rl.c ${RLTREE_SOURCES}) + +target_link_libraries(yap_rl libYap) + +set_target_properties (yap_rl PROPERTIES PREFIX "") + +install(TARGETS yap_rl + LIBRARY DESTINATION ${dlls} ) + diff --git a/library/system/CMakeLists.txt b/library/system/CMakeLists.txt index e69de29bb..0800cedc4 100644 --- a/library/system/CMakeLists.txt +++ b/library/system/CMakeLists.txt @@ -0,0 +1,10 @@ + +add_library (sys SHARED sys.c) + +target_link_libraries(sys libYap) + +set_target_properties (sys PROPERTIES PREFIX "") + +install(TARGETS sys + LIBRARY DESTINATION ${dlls} ) + diff --git a/library/tries/CMakeLists.txt b/library/tries/CMakeLists.txt index e69de29bb..967fff528 100644 --- a/library/tries/CMakeLists.txt +++ b/library/tries/CMakeLists.txt @@ -0,0 +1,32 @@ + +set ( TRIES_SOURCES + core_tries.c + base_tries.c + tries.c + ) + +add_library (tries SHARED ${TRIES_SOURCES}) + +target_link_libraries(tries libYap) + +set_target_properties (tries PROPERTIES PREFIX "") + +install(TARGETS tries + LIBRARY DESTINATION ${dlls} ) + + +set ( ITRIES_SOURCES + core_tries.c + base_itries.c + itries.c + ) + +add_library (itries SHARED ${ITRIES_SOURCES}) + +target_link_libraries(itries libYap) + +set_target_properties (itries PROPERTIES PREFIX "") + +install(TARGETS itries + LIBRARY DESTINATION ${dlls} ) + diff --git a/misc/buildheap b/misc/buildheap index f67d70e29..048080992 100644 --- a/misc/buildheap +++ b/misc/buildheap @@ -65,6 +65,9 @@ gen_struct(Inp,Out) :- gen_struct(Inp,Out) :- split(Inp," ",["union",Type, Field|_]), !, append([" union ",Type," ",Field,";"], Out). +gen_struct(Inp,Out) :- + split(Inp," ",["const",Type, Field|_]), !, + append([" const ",Type," ",Field,";"], Out). gen_struct(Inp,"") :- split(Inp," ",["void","void"|_]), !. gen_struct(Inp,Out) :- @@ -105,6 +108,10 @@ gen_dstruct(Inp,Out) :- split(Inp," ",["union"|Inp2]), !, glue(Inp2, " ", Inp3), gen_dstruct(Inp3, Out). +gen_dstruct(Inp,Out) :- + split(Inp," ",["const"|Inp2]), !, + glue(Inp2, " ", Inp3), + gen_dstruct(Inp3, Out). gen_dstruct(Inp,Out) :- split(Inp," ",[_, Field, Name|_]), !, cut_c_stuff(Field, RField), @@ -177,6 +184,10 @@ gen_hstruct(Inp,Out) :- split(Inp," ",["union"|Inp2]), !, glue(Inp2, " ", Inp3), gen_hstruct(Inp3,Out). +gen_hstruct(Inp,Out) :- + split(Inp," ",["const"|Inp2]), !, + glue(Inp2, " ", Inp3), + gen_hstruct(Inp3,Out). gen_hstruct(Inp,Out) :- split(Inp," ",[_, Field, MacroName, "MkAT", _]), !, fetch_name(Global,Field,MacroName), @@ -254,6 +265,10 @@ gen_init(Inp,Out) :- split(Inp," ",["union"|Inp2]), !, glue(Inp2, " ", Inp3), gen_init(Inp3, Out). +gen_init(Inp,Out) :- + split(Inp," ",["const"|Inp2]), !, + glue(Inp2, " ", Inp3), + gen_init(Inp3, Out). gen_init(Inp,"") :- split(Inp," ",[_, _, _, "void"|_]), !. gen_init(Inp,Init) :- diff --git a/os/pl-prologflag.c b/os/pl-prologflag.c index 09756fc59..f1121a835 100755 --- a/os/pl-prologflag.c +++ b/os/pl-prologflag.c @@ -1136,7 +1136,7 @@ initPrologFlags(void) #endif #if defined(HAVE_DLOPEN) || defined(HAVE_SHL_LOAD) || defined(EMULATE_DLOPEN) || defined(HAVE_LOAD_LIBRARY) setPrologFlag("open_shared_object", FT_BOOL|FF_READONLY, TRUE, 0); - setPrologFlag("shared_object_extension", FT_ATOM|FF_READONLY, SO_EXT); + setPrologFlag("shared_object_extension", FT_ATOM|FF_READONLY, SO_EXT+1); setPrologFlag("shared_object_search_path", FT_ATOM|FF_READONLY, SO_PATH); #endif setPrologFlag("address_bits", FT_INTEGER|FF_READONLY, sizeof(void*)*8); diff --git a/packages/clib b/packages/clib index 55f1b0d76..dc25a433d 160000 --- a/packages/clib +++ b/packages/clib @@ -1 +1 @@ -Subproject commit 55f1b0d765c607c99b9b9c67f150df64d33128b0 +Subproject commit dc25a433df1f77e6271179664080d338e10c9d6b diff --git a/packages/gecode/CMakeLists.txt b/packages/gecode/CMakeLists.txt index 0596b293c..920f1a641 100644 --- a/packages/gecode/CMakeLists.txt +++ b/packages/gecode/CMakeLists.txt @@ -1,6 +1,8 @@ + #TODO: change macro_log_feature to check both WITH_{$name} and ${name}_FOUND #TODO: improve FindGecode.cmake to be similar to other Find*.cmake #CHECK: GECODE + macro_optional_find_package (Gecode ON) macro_log_feature (GECODE_FOUND "libgecode" "Use Generic Constraint Development Environment (GECODE) library" @@ -13,6 +15,44 @@ if (GECODE_FOUND) #set (EXTRALIBS gecode) - #include_directories (${GECODE_INCLUDE_DIR}) - #set (EXTRALIBS ${EXTRALIBS} ${GECODE_LIBRARIES}) + string(SUBSTRING ${GECODE_VERSION} 0 1 GECODE_MAJOR ) + + set (GECODE_SOURCES gecode${GECODE_MAJOR}_yap.cc + gecode${GECODE_MAJOR}-common.icc + ${GECODE_VERSION}/gecode_yap_cc_impl_auto_generated.icc + ${GECODE_VERSION}/gecode_yap_cc_init_auto_generated.icc + ${GECODE_VERSION}/gecode_yap_cc_forward_auto_generated.icc + disjunctor.icc + disjunctor.hh ) + + add_custom_target (gecodeyap ALL DEPENDS gecode${GECODE_MAJOR}_yap_hand_written.yap ${GECODE_VERSION}/gecode_yap_auto_generated.yap gecode + ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) + + # create a startup.yss on the top directory. + add_custom_command (TARGET gecodeyap + COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/gecode${GECODE_MAJOR}_yap_hand_written.yap ${CMAKE_CURRENT_SOURCE_DIR}/${GECODE_VERSION}/gecode_yap_auto_generated.yap > gecode.yap + VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + + add_library (gecode SHARED ${GECODE_SOURCES}) + + target_link_libraries(gecode libYap ${GECODE_LIBRARIES}) + + set_target_properties (gecode PROPERTIES PREFIX "") + + include_directories (${GECODE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${GECODE_VERSION}) + + install(TARGETS gecode + LIBRARY DESTINATION ${dlls} + ) + + install(FILES gecode.yap + DESTINATION ${libpl} + ) + + install(FILES clpfd.yap + DESTINATION ${libpl}/gecode + ) + endif (GECODE_FOUND) diff --git a/packages/gecode/dev/extractor/Doxyfile b/packages/gecode/dev/extractor/Doxyfile index 2b3c64d99..c11bf9b38 100644 --- a/packages/gecode/dev/extractor/Doxyfile +++ b/packages/gecode/dev/extractor/Doxyfile @@ -610,7 +610,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = /usr/include/gecode +INPUT = /usr/local/include/gecode # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/packages/gecode/dev/extractor/xml/namespaceGecode.xml b/packages/gecode/dev/extractor/xml/namespaceGecode.xml index 92b39be61..8afa34cb9 100644 --- a/packages/gecode/dev/extractor/xml/namespaceGecode.xml +++ b/packages/gecode/dev/extractor/xml/namespaceGecode.xml @@ -1,216 +1,216 @@ - + Gecode - Gecode::BaseOptions - Gecode::Options - Gecode::SizeOptions - Gecode::InstanceOptions - Gecode::ArrayTraits< VarArgArray< FloatVar > > - Gecode::ArrayTraits< VarArray< FloatVar > > - Gecode::ArrayTraits< PrimArgArray< FloatVal > > - Gecode::ArrayTraits< FloatVarArray > - Gecode::ArrayTraits< FloatVarArgs > - Gecode::ArrayTraits< FloatValArgs > - Gecode::BranchTraits< FloatVar > - Gecode::FloatVal - Gecode::FloatVar - Gecode::FloatValArgs - Gecode::FloatVarArgs - Gecode::FloatVarArray - Gecode::FloatNumBranch - Gecode::FloatAFC - Gecode::FloatActivity - Gecode::FloatVarBranch - Gecode::FloatValBranch - Gecode::FloatAssign - Gecode::ArrayTraits< VarArgArray< IntVar > > - Gecode::ArrayTraits< VarArray< IntVar > > - Gecode::ArrayTraits< VarArgArray< BoolVar > > - Gecode::ArrayTraits< VarArray< BoolVar > > - Gecode::ArrayTraits< PrimArgArray< int > > - Gecode::ArrayTraits< ArgArray< IntSet > > - Gecode::ArrayTraits< IntVarArray > - Gecode::ArrayTraits< IntVarArgs > - Gecode::ArrayTraits< IntArgs > - Gecode::ArrayTraits< BoolVarArray > - Gecode::ArrayTraits< BoolVarArgs > - Gecode::BranchTraits< IntVar > - Gecode::BranchTraits< BoolVar > - Gecode::IntSetInit - Gecode::IntSetInit< IntSet > - Gecode::IntSetInit< IntArgs > - Gecode::ArrayTraits< ArgArray< VarImpBase * > > - Gecode::ArrayTraits< LiteralArgs > - Gecode::ViewArray< Int::Linear::NoView > - Gecode::IntSet - Gecode::IntSetRanges - Gecode::IntSetValues - Gecode::IntVar - Gecode::IntVarRanges - Gecode::IntVarValues - Gecode::BoolVar - Gecode::IntArgs - Gecode::IntVarArgs - Gecode::BoolVarArgs - Gecode::IntVarArray - Gecode::BoolVarArray - Gecode::Reify - Gecode::ArrayTraits< PrimArgArray< TaskType > > - Gecode::DFA - Gecode::TupleSet - Gecode::IntAFC - Gecode::IntActivity - Gecode::IntVarBranch - Gecode::IntValBranch - Gecode::IntAssign - Gecode::SymmetryHandle - Gecode::ArrayTraits< ArgArray< SymmetryHandle > > - Gecode::Symmetries Gecode::Activity - Gecode::ViewAdvisor - Gecode::AFC - Gecode::space_allocator - Gecode::space_allocator< void > - Gecode::region_allocator - Gecode::region_allocator< void > - Gecode::Archive - Gecode::VarArray - Gecode::VarArgArray - Gecode::ArrayTraits - Gecode::ViewArray - Gecode::ArgArrayBase - Gecode::PrimArgArray - Gecode::ArgArray - Gecode::TieBreak - Gecode::BranchTraits - Gecode::ValBranch - Gecode::VarBranch - Gecode::MeritBase - Gecode::MeritFunction - Gecode::MeritDegree - Gecode::MeritAFC - Gecode::MeritActivity - Gecode::ValCommit - Gecode::ValCommitFunction - Gecode::ValSelCommitBase - Gecode::ValSelCommit - Gecode::ValSel - Gecode::ValSelFunction - Gecode::ViewSel - Gecode::ViewSelNone - Gecode::ViewSelRnd - Gecode::ChooseMin - Gecode::ChooseMax - Gecode::ViewSelChoose - Gecode::ViewSelChooseTbl - Gecode::ViewSelMin - Gecode::ViewSelMinTbl - Gecode::ViewSelMax - Gecode::ViewSelMaxTbl - Gecode::PosValChoice - Gecode::ViewValNGL - Gecode::ViewValBrancher - Gecode::Pos - Gecode::PosChoice - Gecode::ViewBrancher - Gecode::SharedHandle - Gecode::NoIdxVarImpConf - Gecode::Council - Gecode::Advisors - Gecode::VarImp - Gecode::VarImpBase - Gecode::VarImpDisposerBase - Gecode::VarImpDisposer - Gecode::Delta - Gecode::PropCost - Gecode::ActorLink + Gecode::ActivityWrongArity Gecode::Actor - Gecode::Home - Gecode::Propagator + Gecode::ActorLink Gecode::Advisor - Gecode::NGL - Gecode::Choice + Gecode::Advisors + Gecode::AFC + Gecode::AFCWrongArity + Gecode::AllVarConf + Gecode::Archive + Gecode::ArgArray + Gecode::ArgArrayBase + Gecode::ArrayTraits + Gecode::ArrayTraits< ArgArray< IntSet > > + Gecode::ArrayTraits< ArgArray< SymmetryHandle > > + Gecode::ArrayTraits< ArgArray< VarImpBase * > > + Gecode::ArrayTraits< BoolVarArgs > + Gecode::ArrayTraits< BoolVarArray > + Gecode::ArrayTraits< FloatValArgs > + Gecode::ArrayTraits< FloatVarArgs > + Gecode::ArrayTraits< FloatVarArray > + Gecode::ArrayTraits< IntArgs > + Gecode::ArrayTraits< IntVarArgs > + Gecode::ArrayTraits< IntVarArray > + Gecode::ArrayTraits< LiteralArgs > + Gecode::ArrayTraits< PrimArgArray< FloatVal > > + Gecode::ArrayTraits< PrimArgArray< int > > + Gecode::ArrayTraits< PrimArgArray< TaskType > > + Gecode::ArrayTraits< SetVarArgs > + Gecode::ArrayTraits< SetVarArray > + Gecode::ArrayTraits< VarArgArray< BoolVar > > + Gecode::ArrayTraits< VarArgArray< FloatVar > > + Gecode::ArrayTraits< VarArgArray< IntVar > > + Gecode::ArrayTraits< VarArgArray< SetVar > > + Gecode::ArrayTraits< VarArray< BoolVar > > + Gecode::ArrayTraits< VarArray< FloatVar > > + Gecode::ArrayTraits< VarArray< IntVar > > + Gecode::ArrayTraits< VarArray< SetVar > > + Gecode::BAB + Gecode::BaseOptions + Gecode::BinaryPropagator + Gecode::BoolExpr + Gecode::BoolVar + Gecode::BoolVarArgs + Gecode::BoolVarArray Gecode::Brancher Gecode::BrancherHandle - Gecode::LocalObject - Gecode::LocalHandle - Gecode::NoGoods - Gecode::StatusStatistics + Gecode::BranchTraits + Gecode::BranchTraits< BoolVar > + Gecode::BranchTraits< FloatVar > + Gecode::BranchTraits< IntVar > + Gecode::BranchTraits< SetVar > + Gecode::Choice + Gecode::ChooseMax + Gecode::ChooseMin Gecode::CloneStatistics Gecode::CommitStatistics - Gecode::Space - Gecode::SpaceFailed - Gecode::SpaceNotStable - Gecode::SpaceNotCloned - Gecode::SpaceNoBrancher - Gecode::SpaceIllegalAlternative - Gecode::TooManyBranchers - Gecode::IllegalDecay - Gecode::UninitializedAFC - Gecode::UninitializedActivity - Gecode::UninitializedRnd - Gecode::AFCWrongArity - Gecode::ActivityWrongArity - Gecode::GlobalAFC - Gecode::MemoryChunk - Gecode::HeapChunk - Gecode::SharedMemory - Gecode::FreeList - Gecode::MemoryManager - Gecode::UnaryPropagator - Gecode::BinaryPropagator - Gecode::TernaryPropagator - Gecode::NaryPropagator - Gecode::NaryOnePropagator - Gecode::MixBinaryPropagator - Gecode::MixTernaryPropagator - Gecode::MixNaryOnePropagator - Gecode::RangeList - Gecode::Region - Gecode::Rnd - Gecode::SharedArray - Gecode::AllVarConf - Gecode::Var - Gecode::VarImpVar Gecode::ConstView - Gecode::VarImpView + Gecode::Council + Gecode::Delta Gecode::DerivedView - Gecode::NonLinIntExpr + Gecode::DFA + Gecode::DFS + Gecode::DynamicCastFailed + Gecode::EngineBase + Gecode::Exception + Gecode::FloatActivity + Gecode::FloatAFC + Gecode::FloatAssign + Gecode::FloatNumBranch + Gecode::FloatVal + Gecode::FloatValArgs + Gecode::FloatValBranch + Gecode::FloatVar + Gecode::FloatVarArgs + Gecode::FloatVarArray + Gecode::FloatVarBranch + Gecode::FreeList + Gecode::GlobalAFC + Gecode::Heap + Gecode::HeapChunk + Gecode::Home + Gecode::IllegalDecay + Gecode::InstanceOptions + Gecode::IntActivity + Gecode::IntAFC + Gecode::IntArgs + Gecode::IntAssign + Gecode::IntSet + Gecode::IntSetInit + Gecode::IntSetInit< IntArgs > + Gecode::IntSetInit< IntSet > + Gecode::IntSetRanges + Gecode::IntSetValues + Gecode::IntValBranch + Gecode::IntVar + Gecode::IntVarArgs + Gecode::IntVarArray + Gecode::IntVarBranch + Gecode::IntVarRanges + Gecode::IntVarValues Gecode::LinIntExpr Gecode::LinIntRel - Gecode::BoolExpr - Gecode::REG + Gecode::LocalHandle + Gecode::LocalObject Gecode::Matrix - Gecode::Slice + Gecode::MemoryChunk + Gecode::MemoryExhausted + Gecode::MemoryManager + Gecode::MeritActivity + Gecode::MeritAFC + Gecode::MeritBase + Gecode::MeritDegree + Gecode::MeritFunction + Gecode::MixBinaryPropagator + Gecode::MixNaryOnePropagator + Gecode::MixTernaryPropagator + Gecode::NaryOnePropagator + Gecode::NaryPropagator + Gecode::NGL + Gecode::NoGoods + Gecode::NoIdxVarImpConf + Gecode::NonLinIntExpr + Gecode::OperatingSystemError + Gecode::Options + Gecode::Pos + Gecode::PosChoice + Gecode::PosValChoice + Gecode::PrimArgArray + Gecode::Propagator + Gecode::PropCost + Gecode::RangeList Gecode::RBS - Gecode::EngineBase - Gecode::DFS - Gecode::BAB - Gecode::ArrayTraits< VarArgArray< SetVar > > - Gecode::ArrayTraits< VarArray< SetVar > > - Gecode::ArrayTraits< SetVarArray > - Gecode::ArrayTraits< SetVarArgs > - Gecode::BranchTraits< SetVar > + Gecode::REG + Gecode::Region + Gecode::region_allocator + Gecode::region_allocator< void > + Gecode::Reify + Gecode::Rnd + Gecode::SetActivity + Gecode::SetAFC + Gecode::SetAssign + Gecode::SetValBranch Gecode::SetVar - Gecode::SetVarGlbRanges - Gecode::SetVarLubRanges - Gecode::SetVarUnknownRanges - Gecode::SetVarGlbValues - Gecode::SetVarLubValues - Gecode::SetVarUnknownValues Gecode::SetVarArgs Gecode::SetVarArray - Gecode::SetAFC - Gecode::SetActivity Gecode::SetVarBranch - Gecode::SetValBranch - Gecode::SetAssign - Gecode::Exception - Gecode::MemoryExhausted - Gecode::DynamicCastFailed - Gecode::OperatingSystemError - Gecode::Heap + Gecode::SetVarGlbRanges + Gecode::SetVarGlbValues + Gecode::SetVarLubRanges + Gecode::SetVarLubValues + Gecode::SetVarUnknownRanges + Gecode::SetVarUnknownValues + Gecode::SharedArray + Gecode::SharedHandle + Gecode::SharedMemory + Gecode::SizeOptions + Gecode::Slice + Gecode::Space + Gecode::space_allocator + Gecode::space_allocator< void > + Gecode::SpaceFailed + Gecode::SpaceIllegalAlternative + Gecode::SpaceNoBrancher + Gecode::SpaceNotCloned + Gecode::SpaceNotStable + Gecode::StatusStatistics + Gecode::Symmetries + Gecode::SymmetryHandle + Gecode::TernaryPropagator + Gecode::TieBreak + Gecode::TooManyBranchers + Gecode::TupleSet + Gecode::UnaryPropagator + Gecode::UninitializedActivity + Gecode::UninitializedAFC + Gecode::UninitializedRnd + Gecode::ValBranch + Gecode::ValCommit + Gecode::ValCommitFunction + Gecode::ValSel + Gecode::ValSelCommit + Gecode::ValSelCommitBase + Gecode::ValSelFunction + Gecode::Var + Gecode::VarArgArray + Gecode::VarArray + Gecode::VarBranch + Gecode::VarImp + Gecode::VarImpBase + Gecode::VarImpDisposer + Gecode::VarImpDisposerBase + Gecode::VarImpVar + Gecode::VarImpView + Gecode::ViewAdvisor + Gecode::ViewArray + Gecode::ViewArray< Int::Linear::NoView > + Gecode::ViewBrancher + Gecode::ViewSel + Gecode::ViewSelChoose + Gecode::ViewSelChooseTbl + Gecode::ViewSelMax + Gecode::ViewSelMaxTbl + Gecode::ViewSelMin + Gecode::ViewSelMinTbl + Gecode::ViewSelNone + Gecode::ViewSelRnd + Gecode::ViewValBrancher + Gecode::ViewValNGL Gecode::Driver Gecode::FlatZinc Gecode::Float @@ -260,7 +260,7 @@ - + RestartMode @@ -305,7 +305,7 @@ - + FloatRelType @@ -357,7 +357,7 @@ - + ReifyMode @@ -388,7 +388,7 @@ - + IntRelType @@ -440,7 +440,7 @@ - + BoolOpType @@ -485,7 +485,7 @@ - + IntConLevel @@ -523,7 +523,7 @@ The descriptions are meant to be suggestions. It is not required that a propagator achieves full domain consistency or full bounds consistency. It is more like: which level of consistency comes closest.If in the description of a constraint below no consistency level is mentioned, the propagator for the constraint implements domain consistency. - + TaskType @@ -554,7 +554,7 @@ - + ExtensionalPropKind @@ -585,7 +585,7 @@ Signals that a particular kind is used in propagation for the implementation of a extensional constraint. - + ExecStatus @@ -651,7 +651,7 @@ - + ActorProperty @@ -677,7 +677,7 @@ - + SpaceStatus @@ -708,7 +708,7 @@ - + SetRelType @@ -788,7 +788,7 @@ The total order on sets is defined as the lexicographic order on their characteristic functions, e.g., $x\leq y$ means that either $x$ is empty or the minimal element of the symmetric difference $x\ominus y$ is in $y$. - + SetOpType @@ -826,7 +826,7 @@ - + @@ -841,7 +841,7 @@ - + Driver::ScriptBase< MinimizeSpace > @@ -854,7 +854,7 @@ - + Driver::ScriptBase< MaximizeSpace > @@ -867,7 +867,7 @@ - + Driver::ScriptBase< IntMinimizeSpace > @@ -880,7 +880,7 @@ - + Driver::ScriptBase< IntMaximizeSpace > @@ -893,7 +893,7 @@ - + double @@ -906,11 +906,11 @@ This type defines the interval bounds used for representing floating point values. - + - + bool(* - typedef bool(* Gecode::FloatBranchFilter)(const Space &home, FloatVar x, int i) + typedef bool(* Gecode::FloatBranchFilter) (const Space &home, FloatVar x, int i) )(const Space &home, FloatVar x, int i) FloatBranchFilter @@ -919,11 +919,11 @@ The variable x is considered for selection and i refers to the variable's position in the original array passed to the brancher. - + - + double(* - typedef double(* Gecode::FloatBranchMerit)(const Space &home, FloatVar x, int i) + typedef double(* Gecode::FloatBranchMerit) (const Space &home, FloatVar x, int i) )(const Space &home, FloatVar x, int i) FloatBranchMerit @@ -932,11 +932,11 @@ The function must return a merit value for the variable x. The value i refers to the variable's position in the original array passed to the brancher. - + - + FloatNumBranch(* - typedef FloatNumBranch(* Gecode::FloatBranchVal)(const Space &home, FloatVar x, int i) + typedef FloatNumBranch(* Gecode::FloatBranchVal) (const Space &home, FloatVar x, int i) )(const Space &home, FloatVar x, int i) FloatBranchVal @@ -945,11 +945,11 @@ Returns a value for the variable x that is to be used in the corresponding branch commit function. The integer i refers to the variable's position in the original array passed to the brancher. - + - + void(* - typedef void(* Gecode::FloatBranchCommit)(Space &home, unsigned int a, FloatVar x, int i, FloatNumBranch nl) + typedef void(* Gecode::FloatBranchCommit) (Space &home, unsigned int a, FloatVar x, int i, FloatNumBranch nl) )(Space &home, unsigned int a, FloatVar x, int i, FloatNumBranch nl) FloatBranchCommit @@ -958,11 +958,11 @@ The function must post a constraint on the variable x which corresponds to the alternative a. The integer i refers to the variable's position in the original array passed to the brancher. The value nl is the value description computed by the corresponding branch value function. - + - + void(* - typedef void(* Gecode::FloatVarValPrint)(const Space &home, const BrancherHandle &bh, unsigned int a, FloatVar x, int i, const FloatNumBranch &n, std::ostream &o) + typedef void(* Gecode::FloatVarValPrint) (const Space &home, const BrancherHandle &bh, unsigned int a, FloatVar x, int i, const FloatNumBranch &n, std::ostream &o) )(const Space &home, const BrancherHandle &bh, unsigned int a, FloatVar x, int i, const FloatNumBranch &n, std::ostream &o) FloatVarValPrint @@ -971,7 +971,7 @@ - + ArgArray< Int::LDSB::Literal > @@ -984,7 +984,7 @@ - + ArgArray< IntSet > @@ -997,7 +997,7 @@ - + PrimArgArray< TaskType > @@ -1010,7 +1010,7 @@ - + SharedArray< int > @@ -1023,11 +1023,11 @@ - + - + bool(* - typedef bool(* Gecode::IntBranchFilter)(const Space &home, IntVar x, int i) + typedef bool(* Gecode::IntBranchFilter) (const Space &home, IntVar x, int i) )(const Space &home, IntVar x, int i) IntBranchFilter @@ -1036,11 +1036,11 @@ The variable x is considered for selection and i refers to the variable's position in the original array passed to the brancher. - + - + bool(* - typedef bool(* Gecode::BoolBranchFilter)(const Space &home, BoolVar x, int i) + typedef bool(* Gecode::BoolBranchFilter) (const Space &home, BoolVar x, int i) )(const Space &home, BoolVar x, int i) BoolBranchFilter @@ -1049,11 +1049,11 @@ The variable x is considered for selection and i refers to the variable's position in the original array passed to the brancher. - + - + double(* - typedef double(* Gecode::IntBranchMerit)(const Space &home, IntVar x, int i) + typedef double(* Gecode::IntBranchMerit) (const Space &home, IntVar x, int i) )(const Space &home, IntVar x, int i) IntBranchMerit @@ -1062,11 +1062,11 @@ The function must return a merit value for the variable x. The integer i refers to the variable's position in the original array passed to the brancher. - + - + double(* - typedef double(* Gecode::BoolBranchMerit)(const Space &home, BoolVar x, int i) + typedef double(* Gecode::BoolBranchMerit) (const Space &home, BoolVar x, int i) )(const Space &home, BoolVar x, int i) BoolBranchMerit @@ -1075,11 +1075,11 @@ The function must return a merit value for the variable x. The integer i refers to the variable's position in the original array passed to the brancher. - + - + int(* - typedef int(* Gecode::IntBranchVal)(const Space &home, IntVar x, int i) + typedef int(* Gecode::IntBranchVal) (const Space &home, IntVar x, int i) )(const Space &home, IntVar x, int i) IntBranchVal @@ -1088,11 +1088,11 @@ Returns a value for the variable x that is to be used in the corresponding branch commit function. The integer i refers to the variable's position in the original array passed to the brancher. - + - + int(* - typedef int(* Gecode::BoolBranchVal)(const Space &home, BoolVar x, int i) + typedef int(* Gecode::BoolBranchVal) (const Space &home, BoolVar x, int i) )(const Space &home, BoolVar x, int i) BoolBranchVal @@ -1101,11 +1101,11 @@ Returns a value for the variable x that is to be used in the corresponding branch commit function. The integer i refers to the variable's position in the original array passed to the brancher. - + - + void(* - typedef void(* Gecode::IntBranchCommit)(Space &home, unsigned int a, IntVar x, int i, int n) + typedef void(* Gecode::IntBranchCommit) (Space &home, unsigned int a, IntVar x, int i, int n) )(Space &home, unsigned int a, IntVar x, int i, int n) IntBranchCommit @@ -1114,11 +1114,11 @@ The function must post a constraint on the variable x which corresponds to the alternative a. The integer i refers to the variable's position in the original array passed to the brancher. The value n is the value computed by the corresponding branch value function. - + - + void(* - typedef void(* Gecode::BoolBranchCommit)(Space &home, unsigned int a, BoolVar x, int i, int n) + typedef void(* Gecode::BoolBranchCommit) (Space &home, unsigned int a, BoolVar x, int i, int n) )(Space &home, unsigned int a, BoolVar x, int i, int n) BoolBranchCommit @@ -1127,11 +1127,11 @@ The function must post a constraint on the variable x which corresponds to the alternative a. The integer i refers to the variable's position in the original array passed to the brancher. The value n is the value computed by the corresponding branch value function. - + - + void(* - typedef void(* Gecode::IntVarValPrint)(const Space &home, const BrancherHandle &bh, unsigned int a, IntVar x, int i, const int &n, std::ostream &o) + typedef void(* Gecode::IntVarValPrint) (const Space &home, const BrancherHandle &bh, unsigned int a, IntVar x, int i, const int &n, std::ostream &o) )(const Space &home, const BrancherHandle &bh, unsigned int a, IntVar x, int i, const int &n, std::ostream &o) IntVarValPrint @@ -1140,11 +1140,11 @@ - + - + void(* - typedef void(* Gecode::BoolVarValPrint)(const Space &home, const BrancherHandle &bh, unsigned int a, BoolVar x, int i, const int &n, std::ostream &o) + typedef void(* Gecode::BoolVarValPrint) (const Space &home, const BrancherHandle &bh, unsigned int a, BoolVar x, int i, const int &n, std::ostream &o) )(const Space &home, const BrancherHandle &bh, unsigned int a, BoolVar x, int i, const int &n, std::ostream &o) BoolVarValPrint @@ -1153,11 +1153,11 @@ - + - + double(* - typedef double(* Gecode::BranchTbl)(const Space &home, double w, double b) + typedef double(* Gecode::BranchTbl) (const Space &home, double w, double b) )(const Space &home, double w, double b) BranchTbl @@ -1166,7 +1166,7 @@ Here the value w is the worst and is the best merit value found. The function must return the merit value that is considered the limit for breaking ties. - + int @@ -1179,7 +1179,7 @@ - + int @@ -1192,7 +1192,7 @@ - + int @@ -1205,7 +1205,7 @@ Modification event deltas are used by propagators. A propagator stores a modification event for each variable type. They can be accessed through a variable or a view from a given propagator. They can be constructed from a given modevent by a variable or view. - + MiniModel::IntOptimizeSpace< IRT_LE > @@ -1218,7 +1218,7 @@ - + MiniModel::IntOptimizeSpace< IRT_GR > @@ -1231,7 +1231,7 @@ - + MiniModel::IntOptimizeSpace< IRT_LE > @@ -1244,7 +1244,7 @@ - + MiniModel::IntOptimizeSpace< IRT_GR > @@ -1257,11 +1257,11 @@ - + - + bool(* - typedef bool(* Gecode::SetBranchFilter)(const Space &home, SetVar x, int i) + typedef bool(* Gecode::SetBranchFilter) (const Space &home, SetVar x, int i) )(const Space &home, SetVar x, int i) SetBranchFilter @@ -1270,11 +1270,11 @@ The variable x is considered for selection and i refers to the variable's position in the original array passed to the brancher. - + - + double(* - typedef double(* Gecode::SetBranchMerit)(const Space &home, SetVar x, int i) + typedef double(* Gecode::SetBranchMerit) (const Space &home, SetVar x, int i) )(const Space &home, SetVar x, int i) SetBranchMerit @@ -1283,11 +1283,11 @@ The function must return a merit value for the variable x. The value i refers to the variable's position in the original array passed to the brancher. - + - + int(* - typedef int(* Gecode::SetBranchVal)(const Space &home, SetVar x, int i) + typedef int(* Gecode::SetBranchVal) (const Space &home, SetVar x, int i) )(const Space &home, SetVar x, int i) SetBranchVal @@ -1296,11 +1296,11 @@ Returns a value for the variable x that is to be used in the corresponding branch commit function. The integer i refers to the variable's position in the original array passed to the brancher. - + - + void(* - typedef void(* Gecode::SetBranchCommit)(Space &home, unsigned int a, SetVar x, int i, int n) + typedef void(* Gecode::SetBranchCommit) (Space &home, unsigned int a, SetVar x, int i, int n) )(Space &home, unsigned int a, SetVar x, int i, int n) SetBranchCommit @@ -1309,11 +1309,11 @@ The function must post a constraint on the variable x which corresponds to the alternative a. The integer i refers to the variable's position in the original array passed to the brancher. The value n is the value computed by the corresponding branch value function. - + - + void(* - typedef void(* Gecode::SetVarValPrint)(const Space &home, const BrancherHandle &bh, unsigned int a, SetVar x, int i, const int &n, std::ostream &o) + typedef void(* Gecode::SetVarValPrint) (const Space &home, const BrancherHandle &bh, unsigned int a, SetVar x, int i, const int &n, std::ostream &o) )(const Space &home, const BrancherHandle &bh, unsigned int a, SetVar x, int i, const int &n, std::ostream &o) SetVarValPrint @@ -1322,11 +1322,11 @@ - + - + void(* - typedef void(* Gecode::VoidFunction)(void) + typedef void(* Gecode::VoidFunction) (void) )(void) VoidFunction @@ -1335,7 +1335,7 @@ - + @@ -1351,7 +1351,7 @@ - + const ModEvent @@ -1365,7 +1365,7 @@ - + const ModEvent @@ -1379,7 +1379,7 @@ - + const PropCond @@ -1393,7 +1393,7 @@ - + const PropCond @@ -1407,7 +1407,7 @@ - + GECODE_SUPPORT_EXPORT Heap @@ -1420,7 +1420,7 @@ - + @@ -1438,7 +1438,7 @@ - + FloatAssign @@ -1454,7 +1454,7 @@ - + FloatAssign @@ -1471,7 +1471,7 @@ - + FloatAssign @@ -1479,11 +1479,11 @@ (FloatBranchVal v, FloatBranchCommit c) FLOAT_ASSIGN - FloatBranchVal + FloatBranchVal v - FloatBranchCommit + FloatBranchCommit c NULL @@ -1493,7 +1493,7 @@ Select value as defined by the value function v and commit function c The default commit function posts the constraint that the float variable x must be less or equal than the value n. - + forceinline Archive & @@ -1514,7 +1514,7 @@ - + forceinline Archive & @@ -1535,7 +1535,7 @@ - + FloatValBranch @@ -1551,7 +1551,7 @@ - + FloatValBranch @@ -1567,7 +1567,7 @@ - + FloatValBranch @@ -1584,7 +1584,7 @@ - + FloatValBranch @@ -1592,11 +1592,11 @@ (FloatBranchVal v, FloatBranchCommit c) FLOAT_VAL - FloatBranchVal + FloatBranchVal v - FloatBranchCommit + FloatBranchCommit c NULL @@ -1606,7 +1606,7 @@ Select value as defined by the value function v and commit function c The default commit function posts the constraint that the float variable x must be less or equal than the value n for the first alternative and that x must be greater or equal than n otherwise. - + FloatVarBranch @@ -1622,7 +1622,7 @@ - + FloatVarBranch @@ -1630,11 +1630,11 @@ (FloatBranchMerit bm, BranchTbl tbl=NULL) FLOAT_VAR_MERIT_MIN - FloatBranchMerit + FloatBranchMerit bm - BranchTbl + BranchTbl tbl @@ -1643,7 +1643,7 @@ - + FloatVarBranch @@ -1651,11 +1651,11 @@ (FloatBranchMerit bm, BranchTbl tbl=NULL) FLOAT_VAR_MERIT_MAX - FloatBranchMerit + FloatBranchMerit bm - BranchTbl + BranchTbl tbl @@ -1664,7 +1664,7 @@ - + FloatVarBranch @@ -1681,7 +1681,7 @@ - + FloatVarBranch @@ -1689,7 +1689,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_DEGREE_MIN - BranchTbl + BranchTbl tbl @@ -1698,7 +1698,7 @@ - + FloatVarBranch @@ -1706,7 +1706,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_DEGREE_MAX - BranchTbl + BranchTbl tbl @@ -1715,7 +1715,7 @@ - + FloatVarBranch @@ -1727,7 +1727,7 @@ d - BranchTbl + BranchTbl tbl @@ -1736,7 +1736,7 @@ - + FloatVarBranch @@ -1748,7 +1748,7 @@ a - BranchTbl + BranchTbl tbl @@ -1757,7 +1757,7 @@ - + FloatVarBranch @@ -1769,7 +1769,7 @@ d - BranchTbl + BranchTbl tbl @@ -1778,7 +1778,7 @@ - + FloatVarBranch @@ -1790,7 +1790,7 @@ a - BranchTbl + BranchTbl tbl @@ -1799,7 +1799,7 @@ - + FloatVarBranch @@ -1811,7 +1811,7 @@ d - BranchTbl + BranchTbl tbl @@ -1820,7 +1820,7 @@ - + FloatVarBranch @@ -1832,7 +1832,7 @@ a - BranchTbl + BranchTbl tbl @@ -1841,7 +1841,7 @@ - + FloatVarBranch @@ -1853,7 +1853,7 @@ d - BranchTbl + BranchTbl tbl @@ -1862,7 +1862,7 @@ - + FloatVarBranch @@ -1874,7 +1874,7 @@ a - BranchTbl + BranchTbl tbl @@ -1883,7 +1883,7 @@ - + FloatVarBranch @@ -1891,7 +1891,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_MIN_MIN - BranchTbl + BranchTbl tbl @@ -1900,7 +1900,7 @@ - + FloatVarBranch @@ -1908,7 +1908,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_MIN_MAX - BranchTbl + BranchTbl tbl @@ -1917,7 +1917,7 @@ - + FloatVarBranch @@ -1925,7 +1925,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_MAX_MIN - BranchTbl + BranchTbl tbl @@ -1934,7 +1934,7 @@ - + FloatVarBranch @@ -1942,7 +1942,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_MAX_MAX - BranchTbl + BranchTbl tbl @@ -1951,7 +1951,7 @@ - + FloatVarBranch @@ -1959,7 +1959,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_SIZE_MIN - BranchTbl + BranchTbl tbl @@ -1968,7 +1968,7 @@ - + FloatVarBranch @@ -1976,7 +1976,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_SIZE_MAX - BranchTbl + BranchTbl tbl @@ -1985,7 +1985,7 @@ - + FloatVarBranch @@ -1993,7 +1993,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_DEGREE_SIZE_MIN - BranchTbl + BranchTbl tbl @@ -2002,7 +2002,7 @@ - + FloatVarBranch @@ -2010,7 +2010,7 @@ (BranchTbl tbl=NULL) FLOAT_VAR_DEGREE_SIZE_MAX - BranchTbl + BranchTbl tbl @@ -2019,7 +2019,7 @@ - + FloatVarBranch @@ -2031,7 +2031,7 @@ d - BranchTbl + BranchTbl tbl @@ -2040,7 +2040,7 @@ - + FloatVarBranch @@ -2052,7 +2052,7 @@ a - BranchTbl + BranchTbl tbl @@ -2061,7 +2061,7 @@ - + FloatVarBranch @@ -2073,7 +2073,7 @@ d - BranchTbl + BranchTbl tbl @@ -2082,7 +2082,7 @@ - + FloatVarBranch @@ -2094,7 +2094,7 @@ a - BranchTbl + BranchTbl tbl @@ -2103,7 +2103,7 @@ - + FloatVarBranch @@ -2115,7 +2115,7 @@ d - BranchTbl + BranchTbl tbl @@ -2124,7 +2124,7 @@ - + FloatVarBranch @@ -2136,7 +2136,7 @@ a - BranchTbl + BranchTbl tbl @@ -2145,7 +2145,7 @@ - + FloatVarBranch @@ -2157,7 +2157,7 @@ d - BranchTbl + BranchTbl tbl @@ -2166,7 +2166,7 @@ - + FloatVarBranch @@ -2178,7 +2178,7 @@ a - BranchTbl + BranchTbl tbl @@ -2187,7 +2187,7 @@ - + forceinline FloatNum @@ -2203,7 +2203,7 @@ - + forceinline FloatNum @@ -2219,7 +2219,7 @@ - + forceinline FloatNum @@ -2235,7 +2235,7 @@ - + forceinline FloatNum @@ -2251,7 +2251,7 @@ - + forceinline FloatNum @@ -2267,7 +2267,7 @@ - + forceinline FloatNum @@ -2283,7 +2283,7 @@ - + forceinline FloatVal @@ -2300,7 +2300,7 @@ - + forceinline FloatVal @@ -2317,7 +2317,7 @@ - + forceinline FloatVal @@ -2338,7 +2338,7 @@ - + forceinline FloatVal @@ -2359,7 +2359,7 @@ - + forceinline FloatVal @@ -2380,7 +2380,7 @@ - + forceinline FloatVal @@ -2401,7 +2401,7 @@ - + forceinline FloatVal @@ -2422,7 +2422,7 @@ - + forceinline FloatVal @@ -2443,7 +2443,7 @@ - + forceinline FloatVal @@ -2464,7 +2464,7 @@ - + forceinline FloatVal @@ -2485,7 +2485,7 @@ - + forceinline FloatVal @@ -2506,7 +2506,7 @@ - + forceinline FloatVal @@ -2527,7 +2527,7 @@ - + forceinline FloatVal @@ -2548,7 +2548,7 @@ - + forceinline FloatVal @@ -2569,7 +2569,7 @@ - + forceinline bool @@ -2590,7 +2590,7 @@ - + forceinline bool @@ -2611,7 +2611,7 @@ - + forceinline bool @@ -2632,7 +2632,7 @@ - + forceinline bool @@ -2653,7 +2653,7 @@ - + forceinline bool @@ -2674,7 +2674,7 @@ - + forceinline bool @@ -2695,7 +2695,7 @@ - + forceinline bool @@ -2716,7 +2716,7 @@ - + forceinline bool @@ -2737,7 +2737,7 @@ - + forceinline bool @@ -2758,7 +2758,7 @@ - + forceinline bool @@ -2779,7 +2779,7 @@ - + forceinline bool @@ -2800,7 +2800,7 @@ - + forceinline bool @@ -2821,7 +2821,7 @@ - + forceinline bool @@ -2842,7 +2842,7 @@ - + forceinline bool @@ -2863,7 +2863,7 @@ - + forceinline bool @@ -2884,7 +2884,7 @@ - + forceinline bool @@ -2905,7 +2905,7 @@ - + forceinline bool @@ -2926,7 +2926,7 @@ - + forceinline bool @@ -2947,7 +2947,7 @@ - + @@ -2976,7 +2976,7 @@ - + forceinline FloatVal @@ -2993,7 +2993,7 @@ - + forceinline FloatVal @@ -3010,7 +3010,7 @@ - + forceinline FloatVal @@ -3027,7 +3027,7 @@ - + forceinline FloatVal @@ -3048,7 +3048,7 @@ - + forceinline FloatVal @@ -3069,7 +3069,7 @@ - + forceinline FloatVal @@ -3090,7 +3090,7 @@ - + forceinline FloatVal @@ -3111,7 +3111,7 @@ - + forceinline FloatVal @@ -3132,7 +3132,7 @@ - + forceinline FloatVal @@ -3153,7 +3153,7 @@ - + forceinline FloatVal @@ -3174,7 +3174,7 @@ - + forceinline FloatVal @@ -3195,7 +3195,7 @@ - + @@ -3224,7 +3224,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3249,7 +3249,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3274,7 +3274,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3303,7 +3303,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3332,7 +3332,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3361,7 +3361,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3394,7 +3394,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3419,7 +3419,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3444,7 +3444,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3473,7 +3473,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3502,7 +3502,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3535,7 +3535,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3568,7 +3568,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3597,7 +3597,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3626,7 +3626,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3655,7 +3655,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3680,7 +3680,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3709,7 +3709,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3734,7 +3734,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3759,7 +3759,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3788,7 +3788,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3813,7 +3813,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3838,7 +3838,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3867,7 +3867,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3896,7 +3896,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3925,7 +3925,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3954,7 +3954,7 @@ - + GECODE_FLOAT_EXPORT void @@ -3983,7 +3983,7 @@ - + GECODE_FLOAT_EXPORT void @@ -4016,7 +4016,7 @@ - + GECODE_FLOAT_EXPORT void @@ -4049,7 +4049,7 @@ - + GECODE_FLOAT_EXPORT void @@ -4082,7 +4082,7 @@ Throws an exception of type Float::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_FLOAT_EXPORT void @@ -4115,7 +4115,7 @@ Throws an exception of type Float::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_FLOAT_EXPORT void @@ -4152,7 +4152,7 @@ Throws an exception of type Float::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_FLOAT_EXPORT void @@ -4189,7 +4189,7 @@ Throws an exception of type Float::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_FLOAT_EXPORT void @@ -4214,7 +4214,7 @@ - + GECODE_FLOAT_EXPORT void @@ -4239,7 +4239,7 @@ - + GECODE_FLOAT_EXPORT void @@ -4264,7 +4264,7 @@ - + GECODE_FLOAT_EXPORT void @@ -4289,7 +4289,7 @@ - + GECODE_FLOAT_EXPORT BrancherHandle @@ -4313,12 +4313,12 @@ vals - FloatBranchFilter + FloatBranchFilter bf NULL - FloatVarValPrint + FloatVarValPrint vvp NULL @@ -4328,7 +4328,7 @@ - + GECODE_FLOAT_EXPORT BrancherHandle @@ -4352,12 +4352,12 @@ vals - FloatBranchFilter + FloatBranchFilter bf NULL - FloatVarValPrint + FloatVarValPrint vvp NULL @@ -4367,7 +4367,7 @@ - + GECODE_FLOAT_EXPORT BrancherHandle @@ -4387,7 +4387,7 @@ vals - FloatVarValPrint + FloatVarValPrint vvp NULL @@ -4397,7 +4397,7 @@ - + GECODE_FLOAT_EXPORT BrancherHandle @@ -4417,12 +4417,12 @@ vals - FloatBranchFilter + FloatBranchFilter fbf NULL - FloatVarValPrint + FloatVarValPrint vvp NULL @@ -4432,7 +4432,7 @@ - + GECODE_FLOAT_EXPORT BrancherHandle @@ -4452,7 +4452,7 @@ vals - FloatVarValPrint + FloatVarValPrint vvp NULL @@ -4462,7 +4462,7 @@ - + IntAssign @@ -4478,7 +4478,7 @@ - + IntAssign @@ -4494,7 +4494,7 @@ - + IntAssign @@ -4510,7 +4510,7 @@ - + IntAssign @@ -4527,7 +4527,7 @@ - + IntAssign @@ -4535,11 +4535,11 @@ (IntBranchVal v, IntBranchCommit c=NULL) INT_ASSIGN - IntBranchVal + IntBranchVal v - IntBranchCommit + IntBranchCommit c NULL @@ -4549,7 +4549,7 @@ Uses a commit function as default that posts the constraint that a variable x must be equal to the value n. - + IntAssign @@ -4557,11 +4557,11 @@ (BoolBranchVal v, BoolBranchCommit c=NULL) INT_ASSIGN - BoolBranchVal + BoolBranchVal v - BoolBranchCommit + BoolBranchCommit c NULL @@ -4571,7 +4571,7 @@ Uses a commit function as default that posts the constraint that a variable x must be equal to the value n. - + IntValBranch @@ -4587,7 +4587,7 @@ - + IntValBranch @@ -4603,7 +4603,7 @@ - + IntValBranch @@ -4619,7 +4619,7 @@ - + IntValBranch @@ -4636,7 +4636,7 @@ - + IntValBranch @@ -4652,7 +4652,7 @@ - + IntValBranch @@ -4668,7 +4668,7 @@ - + IntValBranch @@ -4684,7 +4684,7 @@ - + IntValBranch @@ -4700,7 +4700,7 @@ - + IntValBranch @@ -4708,11 +4708,11 @@ (IntBranchVal v, IntBranchCommit c=NULL) INT_VAL - IntBranchVal + IntBranchVal v - IntBranchCommit + IntBranchCommit c @@ -4721,7 +4721,7 @@ - + IntValBranch @@ -4729,11 +4729,11 @@ (BoolBranchVal v, BoolBranchCommit c=NULL) INT_VAL - BoolBranchVal + BoolBranchVal v - BoolBranchCommit + BoolBranchCommit c @@ -4742,7 +4742,7 @@ - + IntValBranch @@ -4758,7 +4758,7 @@ - + IntValBranch @@ -4774,7 +4774,7 @@ - + IntValBranch @@ -4791,7 +4791,7 @@ - + IntValBranch @@ -4808,7 +4808,7 @@ - + IntValBranch @@ -4825,7 +4825,7 @@ - + IntValBranch @@ -4842,7 +4842,7 @@ - + IntVarBranch @@ -4858,7 +4858,7 @@ - + IntVarBranch @@ -4875,7 +4875,7 @@ - + IntVarBranch @@ -4883,11 +4883,11 @@ (IntBranchMerit bm, BranchTbl tbl=NULL) INT_VAR_MERIT_MIN - IntBranchMerit + IntBranchMerit bm - BranchTbl + BranchTbl tbl @@ -4896,7 +4896,7 @@ - + IntVarBranch @@ -4904,11 +4904,11 @@ (BoolBranchMerit bm, BranchTbl tbl=NULL) INT_VAR_MERIT_MIN - BoolBranchMerit + BoolBranchMerit bm - BranchTbl + BranchTbl tbl @@ -4917,7 +4917,7 @@ - + IntVarBranch @@ -4925,11 +4925,11 @@ (IntBranchMerit bm, BranchTbl tbl=NULL) INT_VAR_MERIT_MAX - IntBranchMerit + IntBranchMerit bm - BranchTbl + BranchTbl tbl @@ -4938,7 +4938,7 @@ - + IntVarBranch @@ -4946,11 +4946,11 @@ (BoolBranchMerit bm, BranchTbl tbl=NULL) INT_VAR_MERIT_MAX - BoolBranchMerit + BoolBranchMerit bm - BranchTbl + BranchTbl tbl @@ -4959,7 +4959,7 @@ - + IntVarBranch @@ -4967,7 +4967,7 @@ (BranchTbl tbl=NULL) INT_VAR_DEGREE_MIN - BranchTbl + BranchTbl tbl @@ -4976,7 +4976,7 @@ - + IntVarBranch @@ -4984,7 +4984,7 @@ (BranchTbl tbl=NULL) INT_VAR_DEGREE_MAX - BranchTbl + BranchTbl tbl @@ -4993,7 +4993,7 @@ - + IntVarBranch @@ -5005,7 +5005,7 @@ d - BranchTbl + BranchTbl tbl @@ -5014,7 +5014,7 @@ - + IntVarBranch @@ -5026,7 +5026,7 @@ a - BranchTbl + BranchTbl tbl @@ -5035,7 +5035,7 @@ - + IntVarBranch @@ -5047,7 +5047,7 @@ d - BranchTbl + BranchTbl tbl @@ -5056,7 +5056,7 @@ - + IntVarBranch @@ -5068,7 +5068,7 @@ a - BranchTbl + BranchTbl tbl @@ -5077,7 +5077,7 @@ - + IntVarBranch @@ -5089,7 +5089,7 @@ d - BranchTbl + BranchTbl tbl @@ -5098,7 +5098,7 @@ - + IntVarBranch @@ -5110,7 +5110,7 @@ a - BranchTbl + BranchTbl tbl @@ -5119,7 +5119,7 @@ - + IntVarBranch @@ -5131,7 +5131,7 @@ d - BranchTbl + BranchTbl tbl @@ -5140,7 +5140,7 @@ - + IntVarBranch @@ -5152,7 +5152,7 @@ a - BranchTbl + BranchTbl tbl @@ -5161,7 +5161,7 @@ - + IntVarBranch @@ -5169,7 +5169,7 @@ (BranchTbl tbl=NULL) INT_VAR_MIN_MIN - BranchTbl + BranchTbl tbl @@ -5178,7 +5178,7 @@ - + IntVarBranch @@ -5186,7 +5186,7 @@ (BranchTbl tbl=NULL) INT_VAR_MIN_MAX - BranchTbl + BranchTbl tbl @@ -5195,7 +5195,7 @@ - + IntVarBranch @@ -5203,7 +5203,7 @@ (BranchTbl tbl=NULL) INT_VAR_MAX_MIN - BranchTbl + BranchTbl tbl @@ -5212,7 +5212,7 @@ - + IntVarBranch @@ -5220,7 +5220,7 @@ (BranchTbl tbl=NULL) INT_VAR_MAX_MAX - BranchTbl + BranchTbl tbl @@ -5229,7 +5229,7 @@ - + IntVarBranch @@ -5237,7 +5237,7 @@ (BranchTbl tbl=NULL) INT_VAR_SIZE_MIN - BranchTbl + BranchTbl tbl @@ -5246,7 +5246,7 @@ - + IntVarBranch @@ -5254,7 +5254,7 @@ (BranchTbl tbl=NULL) INT_VAR_SIZE_MAX - BranchTbl + BranchTbl tbl @@ -5263,7 +5263,7 @@ - + IntVarBranch @@ -5271,7 +5271,7 @@ (BranchTbl tbl=NULL) INT_VAR_DEGREE_SIZE_MIN - BranchTbl + BranchTbl tbl @@ -5280,7 +5280,7 @@ - + IntVarBranch @@ -5288,7 +5288,7 @@ (BranchTbl tbl=NULL) INT_VAR_DEGREE_SIZE_MAX - BranchTbl + BranchTbl tbl @@ -5297,7 +5297,7 @@ - + IntVarBranch @@ -5309,7 +5309,7 @@ d - BranchTbl + BranchTbl tbl @@ -5318,7 +5318,7 @@ - + IntVarBranch @@ -5330,7 +5330,7 @@ a - BranchTbl + BranchTbl tbl @@ -5339,7 +5339,7 @@ - + IntVarBranch @@ -5351,7 +5351,7 @@ d - BranchTbl + BranchTbl tbl @@ -5360,7 +5360,7 @@ - + IntVarBranch @@ -5372,7 +5372,7 @@ a - BranchTbl + BranchTbl tbl @@ -5381,7 +5381,7 @@ - + IntVarBranch @@ -5393,7 +5393,7 @@ d - BranchTbl + BranchTbl tbl @@ -5402,7 +5402,7 @@ - + IntVarBranch @@ -5414,7 +5414,7 @@ a - BranchTbl + BranchTbl tbl @@ -5423,7 +5423,7 @@ - + IntVarBranch @@ -5435,7 +5435,7 @@ d - BranchTbl + BranchTbl tbl @@ -5444,7 +5444,7 @@ - + IntVarBranch @@ -5456,7 +5456,7 @@ a - BranchTbl + BranchTbl tbl @@ -5465,7 +5465,7 @@ - + IntVarBranch @@ -5473,7 +5473,7 @@ (BranchTbl tbl=NULL) INT_VAR_REGRET_MIN_MIN - BranchTbl + BranchTbl tbl NULL @@ -5483,7 +5483,7 @@ The min-regret of a variable is the difference between the smallest and second-smallest value still in the domain. - + IntVarBranch @@ -5491,7 +5491,7 @@ (BranchTbl tbl=NULL) INT_VAR_REGRET_MIN_MAX - BranchTbl + BranchTbl tbl NULL @@ -5501,7 +5501,7 @@ The min-regret of a variable is the difference between the smallest and second-smallest value still in the domain. - + IntVarBranch @@ -5509,7 +5509,7 @@ (BranchTbl tbl=NULL) INT_VAR_REGRET_MAX_MIN - BranchTbl + BranchTbl tbl NULL @@ -5519,7 +5519,7 @@ The max-regret of a variable is the difference between the largest and second-largest value still in the domain. - + IntVarBranch @@ -5527,7 +5527,7 @@ (BranchTbl tbl=NULL) INT_VAR_REGRET_MAX_MAX - BranchTbl + BranchTbl tbl NULL @@ -5537,7 +5537,7 @@ The max-regret of a variable is the difference between the largest and second-largest value still in the domain. - + @@ -5566,7 +5566,7 @@ - + @@ -5598,7 +5598,7 @@ - + @@ -5627,7 +5627,7 @@ - + forceinline Reify @@ -5644,7 +5644,7 @@ - + forceinline Reify @@ -5661,7 +5661,7 @@ - + forceinline Reify @@ -5678,7 +5678,7 @@ - + @@ -5707,7 +5707,7 @@ - + @@ -5736,7 +5736,7 @@ - + GECODE_INT_EXPORT void @@ -5766,7 +5766,7 @@ - + GECODE_INT_EXPORT void @@ -5796,7 +5796,7 @@ - + GECODE_INT_EXPORT void @@ -5830,7 +5830,7 @@ - + GECODE_INT_EXPORT void @@ -5864,7 +5864,7 @@ - + GECODE_INT_EXPORT void @@ -5894,7 +5894,7 @@ - + GECODE_INT_EXPORT void @@ -5924,7 +5924,7 @@ - + GECODE_INT_EXPORT void @@ -5958,7 +5958,7 @@ - + GECODE_INT_EXPORT void @@ -5996,7 +5996,7 @@ - + GECODE_INT_EXPORT void @@ -6030,7 +6030,7 @@ - + GECODE_INT_EXPORT void @@ -6060,7 +6060,7 @@ - + GECODE_INT_EXPORT void @@ -6090,7 +6090,7 @@ - + GECODE_INT_EXPORT void @@ -6120,7 +6120,7 @@ - + GECODE_INT_EXPORT void @@ -6150,7 +6150,7 @@ - + GECODE_INT_EXPORT void @@ -6184,7 +6184,7 @@ Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default). - + GECODE_INT_EXPORT void @@ -6218,7 +6218,7 @@ Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default). - + GECODE_INT_EXPORT void @@ -6252,7 +6252,7 @@ - + GECODE_INT_EXPORT void @@ -6286,7 +6286,7 @@ - + GECODE_INT_EXPORT void @@ -6324,7 +6324,7 @@ Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default). - + GECODE_INT_EXPORT void @@ -6362,7 +6362,7 @@ Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default). - + GECODE_INT_EXPORT void @@ -6394,7 +6394,7 @@ - + GECODE_INT_EXPORT void @@ -6428,7 +6428,7 @@ Note that for the inequality relations this corresponds to the lexical order between x and y.Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default).Note that the constraint is also defined if x and y are of different size. That means that if x and y are of different size, then if r = IRT_EQ the constraint is false and if r = IRT_NQ the constraint is subsumed. - + GECODE_INT_EXPORT void @@ -6462,7 +6462,7 @@ - + GECODE_INT_EXPORT void @@ -6500,7 +6500,7 @@ - + GECODE_INT_EXPORT void @@ -6534,7 +6534,7 @@ - + GECODE_INT_EXPORT void @@ -6568,7 +6568,7 @@ Throws an exception of type Int::NotZeroOne, if n is neither 0 or 1. - + GECODE_INT_EXPORT void @@ -6606,7 +6606,7 @@ Throws an exception of type Int::NotZeroOne, if n is neither 0 or 1. - + GECODE_INT_EXPORT void @@ -6640,7 +6640,7 @@ Throws an exception of type Int::NotZeroOne, if n is neither 0 or 1. - + GECODE_INT_EXPORT void @@ -6674,7 +6674,7 @@ Note that for the inequality relations this corresponds to the lexical order between x and y.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + GECODE_INT_EXPORT void @@ -6706,7 +6706,7 @@ - + GECODE_INT_EXPORT void @@ -6744,7 +6744,7 @@ Posts propagator for $ x_0 \diamond_{\mathit{o}} x_1 = x_2$ - + GECODE_INT_EXPORT void @@ -6782,7 +6782,7 @@ Posts propagator for $ x_0 \diamond_{\mathit{o}} x_1 = n$Throws an exception of type Int::NotZeroOne, if n is neither 0 or 1. - + GECODE_INT_EXPORT void @@ -6816,7 +6816,7 @@ Posts propagator for $ x_0 \diamond_{\mathit{o}} \cdots \diamond_{\mathit{o}} x_{|x|-1}= y$Throws an exception of type Int::TooFewArguments, if $|x|<2$ and o is BOT_IMP, BOT_EQV, or BOT_XOR. - + GECODE_INT_EXPORT void @@ -6850,7 +6850,7 @@ Posts propagator for $ x_0 \diamond_{\mathit{o}} \cdots \diamond_{\mathit{o}} x_{|x|-1}= n$Throws an exception of type Int::NotZeroOne, if n is neither 0 or 1.Throws an exception of type Int::TooFewArguments, if $|x|<2$ and o is BOT_IMP, BOT_EQV, or BOT_XOR. - + GECODE_INT_EXPORT void @@ -6888,7 +6888,7 @@ Posts propagator for $ x_0 \diamond_{\mathit{o}} \cdots \diamond_{\mathit{o}} x_{|x|-1} \diamond_{\mathit{o}} \neg y_0 \diamond_{\mathit{o}} \cdots \diamond_{\mathit{o}} \neg y_{|y|-1}= z$Throws an exception of type Int::IllegalOperation, if o is different from BOT_AND or BOT_OR. - + GECODE_INT_EXPORT void @@ -6926,7 +6926,7 @@ Posts propagator for $ x_0 \diamond_{\mathit{o}} \cdots \diamond_{\mathit{o}} x_{|x|-1} \diamond_{\mathit{o}} \neg y_0 \diamond_{\mathit{o}} \cdots \diamond_{\mathit{o}} \neg y_{|y|-1}= n$Throws an exception of type Int::NotZeroOne, if n is neither 0 or 1.Throws an exception of type Int::IllegalOperation, if o is different from BOT_AND or BOT_OR. - + GECODE_INT_EXPORT void @@ -6964,7 +6964,7 @@ Posts propagator for $ z = b ? x : y $ - + GECODE_INT_EXPORT void @@ -6997,7 +6997,7 @@ This constraint enforces that $x_0\neq t$ and $x_j=t \to \bigvee_{0\leq i<j} x_i=s$ for $0\leq j<|x|$. The propagator is domain consistent. - + GECODE_INT_EXPORT void @@ -7026,7 +7026,7 @@ This constraint enforces that $x_0\neq c_k$ for $0<k<|c|$ and $x_j=c_{k} \to \bigvee_{0\leq i<j} x_i=c_{k-1}$ for $0\leq j<|x|$ and $0< k<|c|$. - + GECODE_INT_EXPORT void @@ -7056,7 +7056,7 @@ - + GECODE_INT_EXPORT void @@ -7086,7 +7086,7 @@ - + GECODE_INT_EXPORT void @@ -7120,7 +7120,7 @@ - + GECODE_INT_EXPORT void @@ -7154,7 +7154,7 @@ - + GECODE_INT_EXPORT void @@ -7188,7 +7188,7 @@ Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits. - + GECODE_INT_EXPORT void @@ -7222,7 +7222,7 @@ Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits. - + GECODE_INT_EXPORT void @@ -7256,7 +7256,7 @@ Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits. - + GECODE_INT_EXPORT void @@ -7290,7 +7290,7 @@ Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default). - + GECODE_INT_EXPORT void @@ -7324,7 +7324,7 @@ Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default). - + GECODE_INT_EXPORT void @@ -7358,7 +7358,7 @@ - + GECODE_INT_EXPORT void @@ -7392,7 +7392,7 @@ - + GECODE_INT_EXPORT void @@ -7438,7 +7438,7 @@ If a is regarded as a two-dimensional array in row-major order of width w and height h, then z is constrained to be the element in column x and row y.Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits.Throws an exception of type Int::ArgumentSizeMismatch, if $ w\cdot h\neq|a|$. - + GECODE_INT_EXPORT void @@ -7484,7 +7484,7 @@ If a is regarded as a two-dimensional array in row-major order of width w and height h, then z is constrained to be the element in column x and row y.Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits.Throws an exception of type Int::ArgumentSizeMismatch, if $ w\cdot h\neq|a|$. - + GECODE_INT_EXPORT void @@ -7530,7 +7530,7 @@ If a is regarded as a two-dimensional array in row-major order of width w and height h, then z is constrained to be the element in column x and row y.Supports both bounds (icl = ICL_BND) and domain consistency (icl = ICL_DOM, default).Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits.Throws an exception of type Int::ArgumentSizeMismatch, if $ w\cdot h\neq|a|$. - + GECODE_INT_EXPORT void @@ -7576,7 +7576,7 @@ If a is regarded as a two-dimensional array in row-major order of width w and height h, then z is constrained to be the element in column x and row y.Throws an exception of type Int::OutOfLimits, if the integers in n exceed the limits in Int::Limits.Throws an exception of type Int::ArgumentSizeMismatch, if $ w\cdot h\neq|a|$. - + GECODE_INT_EXPORT void @@ -7602,7 +7602,7 @@ Supports value (icl = ICL_VAL, default), bounds (icl = ICL_BND), and domain consistency (icl = ICL_DOM).Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply. - + GECODE_INT_EXPORT void @@ -7638,7 +7638,7 @@ - + GECODE_INT_EXPORT void @@ -7673,7 +7673,7 @@ - + GECODE_INT_EXPORT void @@ -7717,7 +7717,7 @@ - + GECODE_INT_EXPORT void @@ -7747,7 +7747,7 @@ - + forceinline void @@ -7777,7 +7777,7 @@ - + GECODE_INT_EXPORT void @@ -7812,7 +7812,7 @@ Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply. - + GECODE_INT_EXPORT void @@ -7844,7 +7844,7 @@ - + GECODE_INT_EXPORT void @@ -7880,7 +7880,7 @@ - + GECODE_INT_EXPORT void @@ -7918,7 +7918,7 @@ Performs domain propagation but is not domain consistent. - + GECODE_INT_EXPORT void @@ -7956,7 +7956,7 @@ Performs domain propagation but is not domain consistent. - + GECODE_INT_EXPORT void @@ -7994,7 +7994,7 @@ Performs domain propagation (icl = ICL_DOM, default) and slightly less domain propagation (all other values for icl), where y is not pruned. Note that in both cases propagation is not comain consistent. - + GECODE_INT_EXPORT void @@ -8032,7 +8032,7 @@ Performs domain propagation but is not domain consistent.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + GECODE_INT_EXPORT void @@ -8070,7 +8070,7 @@ Performs domain propagation but is not domain consistent. - + GECODE_INT_EXPORT void @@ -8108,7 +8108,7 @@ Performs domain propagation but is not domain consistent. - + GECODE_INT_EXPORT void @@ -8146,7 +8146,7 @@ Performs domain propagation (icl = ICL_DOM, default) and slightly less domain propagation (all other values for icl), where y is not pruned. Note that in both cases propagation is not comain consistent. - + GECODE_INT_EXPORT void @@ -8184,7 +8184,7 @@ Performs domain propagation but is not domain consistent.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + GECODE_INT_EXPORT void @@ -8214,7 +8214,7 @@ Posts the constraint that $\#\{i\in\{0,\ldots,|x|-1\}\;|\;x_i=j\}=c_j$ and $ \bigcup_i \{x_i\} \subseteq \{0,\ldots,|c|-1\}$ (no other value occurs).Supports value (icl = ICL_VAL, default), bounds (icl = ICL_BND), and domain consistency (icl = ICL_DOM).Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply. - + GECODE_INT_EXPORT void @@ -8244,7 +8244,7 @@ Posts the constraint that $\#\{i\in\{0,\ldots,|x|-1\}\;|\;x_i=j\}\in c_j$ and $ \bigcup_i \{x_i\} \subseteq \{0,\ldots,|c|-1\}$ (no other value occurs).Supports value (icl = ICL_VAL, default), bounds (icl = ICL_BND), and domain consistency (icl = ICL_DOM).Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply. - + GECODE_INT_EXPORT void @@ -8278,7 +8278,7 @@ Posts the constraint that $\#\{i\in\{0,\ldots,|x|-1\}\;|\;x_i=v_j\}=c_j$ and $ \bigcup_i \{x_i\} \subseteq \bigcup_j \{v_j\}$ (no other value occurs).Supports value (icl = ICL_VAL, default), bounds (icl = ICL_BND), and domain consistency (icl = ICL_DOM).Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply.Throws an exception of type Int::ArgumentSizeMismatch, if c and v are of different size. - + GECODE_INT_EXPORT void @@ -8312,7 +8312,7 @@ Posts the constraint that $\#\{i\in\{0,\ldots,|x|-1\}\;|\;x_i=v_j\}\in c_j$ and $ \bigcup_i \{x_i\} \subseteq \bigcup_j \{v_j\}$ (no other value occurs).Supports value (icl = ICL_VAL, default), bounds (icl = ICL_BND), and domain consistency (icl = ICL_DOM).Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply.Throws an exception of type Int::ArgumentSizeMismatch, if c and v are of different size. - + GECODE_INT_EXPORT void @@ -8346,7 +8346,7 @@ Posts the constraint that $\#\{i\in\{0,\ldots,|x|-1\}\;|\;x_i=v_j\}\in c$ and $ \bigcup_i \{x_i\} \subseteq \bigcup_j \{v_j\}$ (no other value occurs).Supports value (icl = ICL_VAL, default), bounds (icl = ICL_BND), and domain consistency (icl = ICL_DOM).Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply.Throws an exception of type Int::ArgumentSizeMismatch, if c and v are of different size. - + GECODE_INT_EXPORT void @@ -8380,7 +8380,7 @@ - + GECODE_INT_EXPORT void @@ -8414,7 +8414,7 @@ - + GECODE_INT_EXPORT void @@ -8448,7 +8448,7 @@ - + GECODE_INT_EXPORT void @@ -8482,7 +8482,7 @@ - + GECODE_INT_EXPORT void @@ -8526,7 +8526,7 @@ - + GECODE_INT_EXPORT void @@ -8570,7 +8570,7 @@ - + GECODE_INT_EXPORT void @@ -8600,7 +8600,7 @@ The elements of x must be a word of the language described by the DFA d.Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply. If shared occurences of variables are required, unshare should be used. - + GECODE_INT_EXPORT void @@ -8630,7 +8630,7 @@ The elements of x must be a word of the language described by the DFA d.Throws an exception of type Int::ArgumentSame, if x contains the same unassigned variable multiply. If shared occurences of variables are required, unshare should be used. - + GECODE_INT_EXPORT void @@ -8672,7 +8672,7 @@ - + GECODE_INT_EXPORT void @@ -8713,7 +8713,7 @@ - + GECODE_INT_EXPORT void @@ -8747,7 +8747,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM). - + GECODE_INT_EXPORT void @@ -8777,7 +8777,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM).If x is empty, an exception of type Int::TooFewArguments is thrown. - + GECODE_INT_EXPORT void @@ -8811,7 +8811,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM). - + GECODE_INT_EXPORT void @@ -8841,7 +8841,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM).If x is empty, an exception of type Int::TooFewArguments is thrown. - + GECODE_INT_EXPORT void @@ -8871,7 +8871,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM). - + GECODE_INT_EXPORT void @@ -8905,7 +8905,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM). - + GECODE_INT_EXPORT void @@ -8943,7 +8943,7 @@ Supports bounds consistency (icl = ICL_BND, default). - + GECODE_INT_EXPORT void @@ -8977,7 +8977,7 @@ Supports bounds consistency (icl = ICL_BND, default). - + GECODE_INT_EXPORT void @@ -9011,7 +9011,7 @@ Supports bounds consistency (icl = ICL_BND, default). - + GECODE_INT_EXPORT void @@ -9041,7 +9041,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM). - + GECODE_INT_EXPORT void @@ -9071,7 +9071,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM). - + GECODE_INT_EXPORT void @@ -9105,7 +9105,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM).Throws an exception of type Int::OutOfLimits, if n is negative. - + GECODE_INT_EXPORT void @@ -9139,7 +9139,7 @@ Supports both bounds consistency (icl = ICL_BND, default) and domain consistency (icl = ICL_DOM).Throws an exception of type Int::OutOfLimits, if n is not strictly positive. - + GECODE_INT_EXPORT void @@ -9173,7 +9173,7 @@ - + GECODE_INT_EXPORT void @@ -9207,7 +9207,7 @@ - + GECODE_INT_EXPORT void @@ -9245,7 +9245,7 @@ - + GECODE_INT_EXPORT void @@ -9283,7 +9283,7 @@ - + GECODE_INT_EXPORT void @@ -9321,7 +9321,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9359,7 +9359,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9401,7 +9401,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9443,7 +9443,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9477,7 +9477,7 @@ - + GECODE_INT_EXPORT void @@ -9515,7 +9515,7 @@ - + GECODE_INT_EXPORT void @@ -9549,7 +9549,7 @@ - + GECODE_INT_EXPORT void @@ -9587,7 +9587,7 @@ - + GECODE_INT_EXPORT void @@ -9625,7 +9625,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9667,7 +9667,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9705,7 +9705,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9747,7 +9747,7 @@ Throws an exception of type Int::ArgumentSizeMismatch, if a and x are of different size. - + GECODE_INT_EXPORT void @@ -9783,7 +9783,7 @@ - + GECODE_INT_EXPORT void @@ -9823,7 +9823,7 @@ - + GECODE_INT_EXPORT void @@ -9867,7 +9867,7 @@ - + GECODE_INT_EXPORT void @@ -9915,7 +9915,7 @@ - + GECODE_INT_EXPORT void @@ -9967,7 +9967,7 @@ - + GECODE_INT_EXPORT void @@ -10097,7 +10097,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -10227,7 +10227,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -10357,7 +10357,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -10487,7 +10487,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -10617,7 +10617,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -10747,7 +10747,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -10877,7 +10877,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11007,7 +11007,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11039,7 +11039,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11075,7 +11075,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11113,7 +11113,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11155,7 +11155,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11189,7 +11189,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Schedule tasks with start times s, processing times p, and end times e on a unary resource. The propagator uses the algorithms from: Petr Vilím, Global Constraints in Scheduling, PhD thesis, Charles University, Prague, Czech Republic, 2007.The propagator does not enforce $s_i+p_i=e_i$, this constraint has to be posted in addition to ensure consistency of the task bounds.The propagator performs overload checking, detectable precendence propagation, not-first-not-last propagation, and edge finding.The processing times are constrained to be non-negative.Throws an exception of type Int::ArgumentSizeMismatch, if s and p are of different size. - + GECODE_INT_EXPORT void @@ -11227,7 +11227,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Schedule optional tasks with start times s, processing times p, end times e, and whether a task is mandatory m (a task is mandatory if the Boolean variable is 1) on a unary resource. The propagator uses the algorithms from: Petr Vilím, Global Constraints in Scheduling, PhD thesis, Charles University, Prague, Czech Republic, 2007.The propagator does not enforce $s_i+p_i=e_i$, this constraint has to be posted in addition to ensure consistency of the task bounds.The processing times are constrained to be non-negative.The propagator performs overload checking, detectable precendence propagation, not-first-not-last propagation, and edge finding.Throws an exception of type Int::ArgumentSizeMismatch, if s, p, or m are of different size. - + GECODE_INT_EXPORT void @@ -11273,7 +11273,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11319,7 +11319,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11369,7 +11369,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11419,7 +11419,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11459,7 +11459,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11499,7 +11499,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11543,7 +11543,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11587,7 +11587,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11631,7 +11631,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11675,7 +11675,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11723,7 +11723,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11771,7 +11771,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11799,7 +11799,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11831,7 +11831,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11871,7 +11871,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11915,7 +11915,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11951,7 +11951,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -11991,7 +11991,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12027,7 +12027,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12067,7 +12067,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12115,7 +12115,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12167,7 +12167,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12211,7 +12211,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12259,7 +12259,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12289,7 +12289,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12319,7 +12319,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12349,7 +12349,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12379,7 +12379,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12414,7 +12414,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT void @@ -12440,7 +12440,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistency (icl = ICL_DOM, default) and bounds consistency (icl = ICL_BND). - + GECODE_INT_EXPORT void @@ -12466,7 +12466,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12490,12 +12490,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - IntBranchFilter + IntBranchFilter bf NULL - IntVarValPrint + IntVarValPrint vvp NULL @@ -12505,7 +12505,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12529,12 +12529,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - IntBranchFilter + IntBranchFilter bf NULL - IntVarValPrint + IntVarValPrint vvp NULL @@ -12544,7 +12544,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12564,7 +12564,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - IntVarValPrint + IntVarValPrint vvp NULL @@ -12574,7 +12574,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12598,12 +12598,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - BoolBranchFilter + BoolBranchFilter bf NULL - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -12613,7 +12613,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12637,12 +12637,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - BoolBranchFilter + BoolBranchFilter bf NULL - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -12652,7 +12652,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12672,7 +12672,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -12682,7 +12682,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12702,12 +12702,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - IntBranchFilter + IntBranchFilter ibf NULL - IntVarValPrint + IntVarValPrint vvp NULL @@ -12717,7 +12717,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12737,7 +12737,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - IntVarValPrint + IntVarValPrint vvp NULL @@ -12747,7 +12747,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12767,12 +12767,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - BoolBranchFilter + BoolBranchFilter bbf NULL - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -12782,7 +12782,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -12802,7 +12802,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr vals - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -12812,7 +12812,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12829,7 +12829,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12846,7 +12846,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12867,7 +12867,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12884,7 +12884,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12901,7 +12901,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12918,7 +12918,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -12939,7 +12939,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr The size of x must be a multiple of ss. - + GECODE_INT_EXPORT SymmetryHandle @@ -12960,7 +12960,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr The size of x must be a multiple of ss. - + GECODE_INT_EXPORT SymmetryHandle @@ -12981,7 +12981,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr The size of v must be a multiple of ss. - + GECODE_INT_EXPORT SymmetryHandle @@ -13002,7 +13002,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT SymmetryHandle @@ -13019,7 +13019,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_INT_EXPORT BrancherHandle @@ -13047,12 +13047,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr syms - IntBranchFilter + IntBranchFilter bf NULL - IntVarValPrint + IntVarValPrint vvp NULL @@ -13062,7 +13062,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Throws LDSBBadValueSelection exception if vals is any of SEL_SPLIT_MIN, SEL_SPLIT_MAX, SEL_RANGE_MIN, SEL_RANGE_MAX, SEL_VALUES_MIN, and SEL_VALUES_MAX, or if vals is SEL_VAL_COMMIT with a custom commit function. - + GECODE_INT_EXPORT BrancherHandle @@ -13090,12 +13090,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr syms - IntBranchFilter + IntBranchFilter bf NULL - IntVarValPrint + IntVarValPrint vvp NULL @@ -13105,7 +13105,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Throws LDSBBadValueSelection exception if vals is any of SEL_SPLIT_MIN, SEL_SPLIT_MAX, SEL_RANGE_MIN, SEL_RANGE_MAX, SEL_VALUES_MIN, and SEL_VALUES_MAX, or if vals is SEL_VAL_COMMIT with a custom commit function. - + GECODE_INT_EXPORT BrancherHandle @@ -13133,12 +13133,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr syms - BoolBranchFilter + BoolBranchFilter bf NULL - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -13148,7 +13148,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Throws LDSBBadValueSelection exception if vals is any of SEL_SPLIT_MIN, SEL_SPLIT_MAX, SEL_RANGE_MIN, SEL_RANGE_MAX, SEL_VALUES_MIN, and SEL_VALUES_MAX, or if vals is SEL_VAL_COMMIT with a custom commit function. - + GECODE_INT_EXPORT BrancherHandle @@ -13176,12 +13176,12 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr syms - BoolBranchFilter + BoolBranchFilter bf NULL - BoolVarValPrint + BoolVarValPrint vvp NULL @@ -13191,7 +13191,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Throws LDSBBadValueSelection exception if vals is any of SEL_SPLIT_MIN, SEL_SPLIT_MAX, SEL_RANGE_MIN, SEL_RANGE_MAX, SEL_VALUES_MIN, and SEL_VALUES_MAX, or if vals is SEL_VAL_COMMIT with a custom commit function. - + @@ -13220,7 +13220,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13249,7 +13249,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13279,7 +13279,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Two allocators are equal when each can release storage allocated from the other. - + @@ -13309,7 +13309,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Two allocators are equal when each can release storage allocated from the other. - + @@ -13339,7 +13339,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13369,7 +13369,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13390,7 +13390,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13411,7 +13411,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13432,7 +13432,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13453,7 +13453,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13474,7 +13474,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13495,7 +13495,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13516,7 +13516,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13537,7 +13537,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13558,7 +13558,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13579,7 +13579,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13600,7 +13600,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13621,7 +13621,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13642,7 +13642,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13663,7 +13663,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13684,7 +13684,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13705,7 +13705,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13726,7 +13726,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline Archive & @@ -13747,7 +13747,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13773,7 +13773,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13799,7 +13799,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13825,7 +13825,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13851,7 +13851,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13877,7 +13877,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13903,7 +13903,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13932,7 +13932,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13961,7 +13961,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -13987,7 +13987,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14013,7 +14013,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14039,7 +14039,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14065,7 +14065,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14091,7 +14091,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14117,7 +14117,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14143,7 +14143,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14169,7 +14169,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14195,7 +14195,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14227,7 +14227,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14259,7 +14259,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14291,7 +14291,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14317,7 +14317,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14347,7 +14347,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14381,7 +14381,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14407,7 +14407,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14437,7 +14437,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14471,7 +14471,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + bool @@ -14488,7 +14488,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + bool @@ -14505,7 +14505,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14537,7 +14537,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14564,7 +14564,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14591,7 +14591,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14618,7 +14618,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14645,7 +14645,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14672,7 +14672,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14699,7 +14699,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14726,7 +14726,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14753,7 +14753,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14780,7 +14780,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14807,7 +14807,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14834,7 +14834,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14861,7 +14861,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14888,7 +14888,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14915,7 +14915,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14941,7 +14941,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14970,7 +14970,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -14999,7 +14999,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15026,7 +15026,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15053,7 +15053,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15080,7 +15080,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15107,7 +15107,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15134,7 +15134,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15163,7 +15163,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15192,7 +15192,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15221,7 +15221,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15250,7 +15250,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_KERNEL_EXPORT void @@ -15271,7 +15271,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15293,7 +15293,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15315,7 +15315,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15337,7 +15337,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15359,7 +15359,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15381,7 +15381,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15407,7 +15407,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15433,7 +15433,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15459,7 +15459,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15485,7 +15485,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15511,7 +15511,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15543,7 +15543,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15575,7 +15575,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline void @@ -15612,7 +15612,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline void @@ -15649,7 +15649,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline void @@ -15686,7 +15686,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + forceinline void @@ -15723,7 +15723,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -15752,7 +15752,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15771,7 +15771,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15790,7 +15790,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15809,7 +15809,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15828,7 +15828,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15847,7 +15847,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15866,7 +15866,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15885,7 +15885,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15904,7 +15904,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15923,7 +15923,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15942,7 +15942,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15961,7 +15961,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15980,7 +15980,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -15999,7 +15999,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16018,7 +16018,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16037,7 +16037,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16056,7 +16056,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16075,7 +16075,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16094,7 +16094,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16113,7 +16113,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16132,7 +16132,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16151,7 +16151,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16170,7 +16170,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16189,7 +16189,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16208,7 +16208,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16227,7 +16227,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16246,7 +16246,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16265,7 +16265,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16284,7 +16284,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16303,7 +16303,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16322,7 +16322,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16338,7 +16338,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16354,7 +16354,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16370,7 +16370,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16389,7 +16389,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16408,7 +16408,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16427,7 +16427,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16446,7 +16446,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16465,7 +16465,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16484,7 +16484,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16501,7 +16501,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16522,7 +16522,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16539,7 +16539,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16560,7 +16560,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -16577,7 +16577,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16598,7 +16598,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16619,7 +16619,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16640,7 +16640,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16661,7 +16661,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16682,7 +16682,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16703,7 +16703,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16724,7 +16724,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16745,7 +16745,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16766,7 +16766,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16787,7 +16787,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16808,7 +16808,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16829,7 +16829,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16850,7 +16850,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16871,7 +16871,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16892,7 +16892,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16913,7 +16913,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16934,7 +16934,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16955,7 +16955,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16976,7 +16976,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -16997,7 +16997,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17018,7 +17018,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17039,7 +17039,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17060,7 +17060,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17081,7 +17081,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17102,7 +17102,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17123,7 +17123,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17144,7 +17144,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17165,7 +17165,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17186,7 +17186,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17207,7 +17207,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17228,7 +17228,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17249,7 +17249,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17270,7 +17270,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17291,7 +17291,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17312,7 +17312,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17333,7 +17333,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17354,7 +17354,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17375,7 +17375,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17396,7 +17396,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17417,7 +17417,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17438,7 +17438,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17459,7 +17459,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17480,7 +17480,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17501,7 +17501,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17522,7 +17522,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17543,7 +17543,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17564,7 +17564,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17585,7 +17585,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17606,7 +17606,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17627,7 +17627,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17648,7 +17648,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17669,7 +17669,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17690,7 +17690,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17711,7 +17711,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17732,7 +17732,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17753,7 +17753,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17774,7 +17774,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17795,7 +17795,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17816,7 +17816,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17837,7 +17837,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17858,7 +17858,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17879,7 +17879,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17900,7 +17900,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17921,7 +17921,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17942,7 +17942,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17963,7 +17963,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -17984,7 +17984,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18005,7 +18005,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18026,7 +18026,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18047,7 +18047,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18068,7 +18068,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18089,7 +18089,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18110,7 +18110,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18131,7 +18131,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18152,7 +18152,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18173,7 +18173,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18194,7 +18194,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18215,7 +18215,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18236,7 +18236,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18257,7 +18257,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18278,7 +18278,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18299,7 +18299,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18320,7 +18320,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18341,7 +18341,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18362,7 +18362,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18383,7 +18383,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18404,7 +18404,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18425,7 +18425,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18446,7 +18446,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntRel @@ -18467,7 +18467,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18483,7 +18483,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18502,7 +18502,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18521,7 +18521,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18540,7 +18540,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18559,7 +18559,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18578,7 +18578,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18597,7 +18597,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18616,7 +18616,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT IntVar @@ -18642,7 +18642,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolVar @@ -18668,7 +18668,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT void @@ -18694,7 +18694,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18711,7 +18711,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18732,7 +18732,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18749,7 +18749,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18770,7 +18770,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18787,7 +18787,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18808,7 +18808,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18829,7 +18829,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18850,7 +18850,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18867,7 +18867,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18884,7 +18884,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18905,7 +18905,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18926,7 +18926,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18947,7 +18947,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT BoolExpr @@ -18968,7 +18968,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -18989,7 +18989,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -19014,7 +19014,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + BoolVar @@ -19040,7 +19040,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + IntVar @@ -19066,7 +19066,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + void @@ -19100,7 +19100,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19134,7 +19134,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19168,7 +19168,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + void @@ -19202,7 +19202,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19236,7 +19236,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19270,7 +19270,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + void @@ -19304,7 +19304,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19338,7 +19338,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19372,7 +19372,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + void @@ -19406,7 +19406,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19440,7 +19440,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19474,7 +19474,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + void @@ -19508,7 +19508,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19542,7 +19542,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19576,7 +19576,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + void @@ -19610,7 +19610,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19644,7 +19644,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only. - + void @@ -19678,7 +19678,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Supports domain consistent propagation only.Throws an exception of type Int::ArgumentSizeMismatch, if x and y are of different size. - + void @@ -19712,7 +19712,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + void @@ -19746,7 +19746,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + void @@ -19776,7 +19776,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -19793,7 +19793,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + GECODE_MINIMODEL_EXPORT LinIntExpr @@ -19810,7 +19810,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -19834,11 +19834,11 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Perform depth-first branch-and-bound search for subclass T of space s and options o. -Additionally, s must implement a member function virtualvoidconstrain(constT&t) +Additionally, s must implement a member function virtualvoidconstrain(constT&t) Whenever exploration requires to add a constraint to the space c currently being explored, the engine executes c.constrain(t) where t is the so-far best solution. - + @@ -19864,7 +19864,7 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr - + @@ -19892,13 +19892,13 @@ with negative heights", Nicolas Beldiceanu and Mats Carlsson, Pr Perform restart-based search. -The engine uses the Cutoff sequence supplied in the options o to periodically restart the search of an engine of type E.The class T can implement member functions virtualvoidmaster(unsignedlonginti,constSpace*s) - and virtualvoidslave(unsignedlonginti,constSpace*s) +The engine uses the Cutoff sequence supplied in the options o to periodically restart the search of an engine of type E.The class T can implement member functions virtualvoidmaster(unsignedlonginti,constSpace*s) + and virtualvoidslave(unsignedlonginti,constSpace*s) Whenever exploration restarts or a solution is found, the engine executes the functions on the master and slave space. For more details, consult "Modeling and Programming with Gecode". - + @@ -19925,7 +19925,7 @@ with Gecode". - + @@ -19953,13 +19953,13 @@ with Gecode". Perform restart-based search. -The engine uses the Cutoff sequence supplied in the options o to periodically restart the search of an engine of type E.The class T can implement member functions virtualvoidmaster(unsignedlonginti,constSpace*s) - and virtualvoidslave(unsignedlonginti,constSpace*s) +The engine uses the Cutoff sequence supplied in the options o to periodically restart the search of an engine of type E.The class T can implement member functions virtualvoidmaster(unsignedlonginti,constSpace*s) + and virtualvoidslave(unsignedlonginti,constSpace*s) Whenever exploration restarts or a solution is found, the engine executes the functions on the master and slave space. For more details, consult "Modeling and Programming with Gecode". - + SetAssign @@ -19975,7 +19975,7 @@ with Gecode". - + SetAssign @@ -19991,7 +19991,7 @@ with Gecode". - + SetAssign @@ -20007,7 +20007,7 @@ with Gecode". - + SetAssign @@ -20023,7 +20023,7 @@ with Gecode". - + SetAssign @@ -20039,7 +20039,7 @@ with Gecode". - + SetAssign @@ -20055,7 +20055,7 @@ with Gecode". - + SetAssign @@ -20072,7 +20072,7 @@ with Gecode". - + SetAssign @@ -20089,7 +20089,7 @@ with Gecode". - + SetAssign @@ -20097,11 +20097,11 @@ with Gecode". (SetBranchVal v, SetBranchCommit c=NULL) SET_ASSIGN - SetBranchVal + SetBranchVal v - SetBranchCommit + SetBranchCommit c NULL @@ -20111,7 +20111,7 @@ with Gecode". The default commit function posts the constraint that the value n must be included in the set variable x. - + SetValBranch @@ -20127,7 +20127,7 @@ with Gecode". - + SetValBranch @@ -20143,7 +20143,7 @@ with Gecode". - + SetValBranch @@ -20159,7 +20159,7 @@ with Gecode". - + SetValBranch @@ -20175,7 +20175,7 @@ with Gecode". - + SetValBranch @@ -20191,7 +20191,7 @@ with Gecode". - + SetValBranch @@ -20207,7 +20207,7 @@ with Gecode". - + SetValBranch @@ -20224,7 +20224,7 @@ with Gecode". - + SetValBranch @@ -20241,7 +20241,7 @@ with Gecode". - + SetValBranch @@ -20249,11 +20249,11 @@ with Gecode". (SetBranchVal v, SetBranchCommit c=NULL) SET_VAL - SetBranchVal + SetBranchVal v - SetBranchCommit + SetBranchCommit c NULL @@ -20263,7 +20263,7 @@ with Gecode". The default commit function posts the constraint that the value n must be included in the set variable x for the first alternative, and that n must be excluded from x otherwise. - + SetVarBranch @@ -20279,7 +20279,7 @@ with Gecode". - + SetVarBranch @@ -20296,7 +20296,7 @@ with Gecode". - + SetVarBranch @@ -20304,11 +20304,11 @@ with Gecode". (SetBranchMerit bm, BranchTbl tbl=NULL) SET_VAR_MERIT_MIN - SetBranchMerit + SetBranchMerit bm - BranchTbl + BranchTbl tbl @@ -20317,7 +20317,7 @@ with Gecode". - + SetVarBranch @@ -20325,11 +20325,11 @@ with Gecode". (SetBranchMerit bm, BranchTbl tbl=NULL) SET_VAR_MERIT_MAX - SetBranchMerit + SetBranchMerit bm - BranchTbl + BranchTbl tbl @@ -20338,7 +20338,7 @@ with Gecode". - + SetVarBranch @@ -20346,7 +20346,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_DEGREE_MIN - BranchTbl + BranchTbl tbl @@ -20355,7 +20355,7 @@ with Gecode". - + SetVarBranch @@ -20363,7 +20363,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_DEGREE_MAX - BranchTbl + BranchTbl tbl @@ -20372,7 +20372,7 @@ with Gecode". - + SetVarBranch @@ -20384,7 +20384,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20393,7 +20393,7 @@ with Gecode". - + SetVarBranch @@ -20405,7 +20405,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20414,7 +20414,7 @@ with Gecode". - + SetVarBranch @@ -20426,7 +20426,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20435,7 +20435,7 @@ with Gecode". - + SetVarBranch @@ -20447,7 +20447,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20456,7 +20456,7 @@ with Gecode". - + SetVarBranch @@ -20468,7 +20468,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20477,7 +20477,7 @@ with Gecode". - + SetVarBranch @@ -20489,7 +20489,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20498,7 +20498,7 @@ with Gecode". - + SetVarBranch @@ -20510,7 +20510,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20519,7 +20519,7 @@ with Gecode". - + SetVarBranch @@ -20531,7 +20531,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20540,7 +20540,7 @@ with Gecode". - + SetVarBranch @@ -20548,7 +20548,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_MIN_MIN - BranchTbl + BranchTbl tbl @@ -20557,7 +20557,7 @@ with Gecode". - + SetVarBranch @@ -20565,7 +20565,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_MIN_MAX - BranchTbl + BranchTbl tbl @@ -20574,7 +20574,7 @@ with Gecode". - + SetVarBranch @@ -20582,7 +20582,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_MAX_MIN - BranchTbl + BranchTbl tbl @@ -20591,7 +20591,7 @@ with Gecode". - + SetVarBranch @@ -20599,7 +20599,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_MAX_MAX - BranchTbl + BranchTbl tbl @@ -20608,7 +20608,7 @@ with Gecode". - + SetVarBranch @@ -20616,7 +20616,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_SIZE_MIN - BranchTbl + BranchTbl tbl @@ -20625,7 +20625,7 @@ with Gecode". - + SetVarBranch @@ -20633,7 +20633,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_SIZE_MAX - BranchTbl + BranchTbl tbl @@ -20642,7 +20642,7 @@ with Gecode". - + SetVarBranch @@ -20650,7 +20650,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_DEGREE_SIZE_MIN - BranchTbl + BranchTbl tbl @@ -20659,7 +20659,7 @@ with Gecode". - + SetVarBranch @@ -20667,7 +20667,7 @@ with Gecode". (BranchTbl tbl=NULL) SET_VAR_DEGREE_SIZE_MAX - BranchTbl + BranchTbl tbl @@ -20676,7 +20676,7 @@ with Gecode". - + SetVarBranch @@ -20688,7 +20688,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20697,7 +20697,7 @@ with Gecode". - + SetVarBranch @@ -20709,7 +20709,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20718,7 +20718,7 @@ with Gecode". - + SetVarBranch @@ -20730,7 +20730,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20739,7 +20739,7 @@ with Gecode". - + SetVarBranch @@ -20751,7 +20751,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20760,7 +20760,7 @@ with Gecode". - + SetVarBranch @@ -20772,7 +20772,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20781,7 +20781,7 @@ with Gecode". - + SetVarBranch @@ -20793,7 +20793,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20802,7 +20802,7 @@ with Gecode". - + SetVarBranch @@ -20814,7 +20814,7 @@ with Gecode". d - BranchTbl + BranchTbl tbl @@ -20823,7 +20823,7 @@ with Gecode". - + SetVarBranch @@ -20835,7 +20835,7 @@ with Gecode". a - BranchTbl + BranchTbl tbl @@ -20844,7 +20844,7 @@ with Gecode". - + @@ -20877,7 +20877,7 @@ with Gecode". - + @@ -20901,7 +20901,7 @@ with Gecode". - + @@ -20930,7 +20930,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -20959,7 +20959,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -20988,7 +20988,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21021,7 +21021,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21054,7 +21054,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21083,7 +21083,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21112,7 +21112,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21141,7 +21141,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21170,7 +21170,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21203,7 +21203,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21240,7 +21240,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21273,7 +21273,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21298,7 +21298,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21323,7 +21323,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21352,7 +21352,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21385,7 +21385,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21414,7 +21414,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21443,7 +21443,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21476,7 +21476,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21509,7 +21509,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21538,7 +21538,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21567,7 +21567,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21604,7 +21604,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21633,7 +21633,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21666,7 +21666,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21699,7 +21699,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21728,7 +21728,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21765,7 +21765,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21802,7 +21802,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21839,7 +21839,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21876,7 +21876,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21913,7 +21913,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21934,7 +21934,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21959,7 +21959,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -21980,7 +21980,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22005,7 +22005,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22030,7 +22030,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22055,7 +22055,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22080,7 +22080,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22109,7 +22109,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22134,7 +22134,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22159,7 +22159,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22188,7 +22188,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22213,7 +22213,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22246,7 +22246,7 @@ with Gecode". The weights are given as pairs of elements and their weight: $\mathrm{weight}(\mathrm{elements}_i) = \mathrm{weights}_i$The upper bound of x is constrained to contain only elements from elements. The weight of a set is the sum of the weights of its elements. - + GECODE_SET_EXPORT void @@ -22271,7 +22271,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22296,7 +22296,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22321,7 +22321,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22346,7 +22346,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22375,7 +22375,7 @@ with Gecode". This constraint enforces that if there exists $j$ such that $s\notin x_j\land t\in x_j$, then there exists $i<j$ such that $s\in x_i\land t\notin x_i$. - + GECODE_SET_EXPORT void @@ -22400,7 +22400,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22438,7 +22438,7 @@ with Gecode". If y is the empty set, the usual conventions for set operations apply: an empty union is empty, while an empty intersection is the universe, which can be given as the optional parameter u.The indices for y start at 0. - + GECODE_SET_EXPORT void @@ -22476,7 +22476,7 @@ with Gecode". If y is the empty set, the usual conventions for set operations apply: an empty union is empty, while an empty intersection is the universe, which can be given as the optional parameter u.The indices for y start at 0. - + GECODE_SET_EXPORT void @@ -22514,7 +22514,7 @@ with Gecode". If y is the empty set, the usual conventions for set operations apply: an empty union is empty, while an empty intersection is the universe, which can be given as the optional parameter u.The indices for y start at 0. - + GECODE_SET_EXPORT void @@ -22552,7 +22552,7 @@ with Gecode". If y is the empty set, the usual conventions for set operations apply: an empty union is empty, while an empty intersection is the universe, which can be given as the optional parameter u.The indices for y start at 0. - + GECODE_SET_EXPORT void @@ -22581,7 +22581,7 @@ with Gecode". The indices for y start at 0. - + GECODE_SET_EXPORT void @@ -22610,7 +22610,7 @@ with Gecode". The indices for y start at 0. - + GECODE_SET_EXPORT void @@ -22651,7 +22651,7 @@ with Gecode". Throws an exception of type Set::ArgumentSizeMismatch, if $ w\cdot h\neq|a|$. - + GECODE_SET_EXPORT void @@ -22692,7 +22692,7 @@ with Gecode". Throws an exception of type Set::ArgumentSizeMismatch, if $ w\cdot h\neq|a|$. - + GECODE_SET_EXPORT void @@ -22717,7 +22717,7 @@ with Gecode". - + GECODE_SET_EXPORT void @@ -22742,7 +22742,7 @@ with Gecode". - + GECODE_SET_EXPORT BrancherHandle @@ -22766,12 +22766,12 @@ with Gecode". vals - SetBranchFilter + SetBranchFilter bf NULL - SetVarValPrint + SetVarValPrint vvp NULL @@ -22781,7 +22781,7 @@ with Gecode". - + GECODE_SET_EXPORT BrancherHandle @@ -22805,12 +22805,12 @@ with Gecode". vals - SetBranchFilter + SetBranchFilter bf NULL - SetVarValPrint + SetVarValPrint vvp NULL @@ -22820,7 +22820,7 @@ with Gecode". - + GECODE_SET_EXPORT BrancherHandle @@ -22840,7 +22840,7 @@ with Gecode". vals - SetVarValPrint + SetVarValPrint vvp NULL @@ -22850,7 +22850,7 @@ with Gecode". - + GECODE_SET_EXPORT BrancherHandle @@ -22870,12 +22870,12 @@ with Gecode". vals - SetBranchFilter + SetBranchFilter bf NULL - SetVarValPrint + SetVarValPrint vvp NULL @@ -22885,7 +22885,7 @@ with Gecode". - + GECODE_SET_EXPORT BrancherHandle @@ -22905,7 +22905,7 @@ with Gecode". vals - SetVarValPrint + SetVarValPrint vvp NULL @@ -22915,7 +22915,7 @@ with Gecode". - + GECODE_SET_EXPORT SymmetryHandle @@ -22932,7 +22932,7 @@ with Gecode". - + GECODE_SET_EXPORT SymmetryHandle @@ -22953,7 +22953,7 @@ with Gecode". The size of x must be a multiple of ss. - + GECODE_SET_EXPORT BrancherHandle @@ -22981,12 +22981,12 @@ with Gecode". syms - SetBranchFilter + SetBranchFilter bf NULL - SetVarValPrint + SetVarValPrint vvp NULL @@ -22996,7 +22996,7 @@ with Gecode". - + GECODE_SET_EXPORT BrancherHandle @@ -23024,12 +23024,12 @@ with Gecode". syms - SetBranchFilter + SetBranchFilter bf NULL - SetVarValPrint + SetVarValPrint vvp NULL @@ -23039,7 +23039,7 @@ with Gecode". - + @@ -23061,7 +23061,7 @@ with Gecode". - + @@ -23086,7 +23086,7 @@ with Gecode". - + @@ -23108,7 +23108,7 @@ with Gecode". - + @@ -23133,13 +23133,13 @@ with Gecode". - + Gecode toplevel namespace The Gecode namespace contains nested namespaces for the various submodules (for example Int for the definition of integer propagator classes). Functionality that is used for interfacing (search engines, variables, and so on) or belongs to the Gecode Kernel is contained directly in the Gecode namespace. - + diff --git a/packages/gecode/dev/gecode-prototypes-4.2.1.hh b/packages/gecode/dev/gecode-prototypes-4.2.1.hh index 8fe67ddf5..fba6513f5 100644 --- a/packages/gecode/dev/gecode-prototypes-4.2.1.hh +++ b/packages/gecode/dev/gecode-prototypes-4.2.1.hh @@ -2,83 +2,83 @@ // It is subject to the same Copyright as the source files from which // it is derived, and is distributed under the same Licensing conditions. BrancherHandle assign(Home,BoolVar,IntAssign,BoolVarValPrint=NULL); +BrancherHandle assign(Home,FloatVar,FloatAssign,FloatVarValPrint=NULL); +BrancherHandle assign(Home,IntVar,IntAssign,IntVarValPrint=NULL); +BrancherHandle assign(Home,SetVar,SetAssign,SetVarValPrint=NULL); BrancherHandle assign(Home,const BoolVarArgs&,IntAssign,BoolBranchFilter=NULL,BoolVarValPrint=NULL); BrancherHandle assign(Home,const FloatVarArgs&,FloatAssign,FloatBranchFilter=NULL,FloatVarValPrint=NULL); BrancherHandle assign(Home,const IntVarArgs&,IntAssign,IntBranchFilter=NULL,IntVarValPrint=NULL); BrancherHandle assign(Home,const SetVarArgs&,SetAssign,SetBranchFilter=NULL,SetVarValPrint=NULL); -BrancherHandle assign(Home,FloatVar,FloatAssign,FloatVarValPrint=NULL); -BrancherHandle assign(Home,IntVar,IntAssign,IntVarValPrint=NULL); -BrancherHandle assign(Home,SetVar,SetAssign,SetVarValPrint=NULL); BrancherHandle branch(Home,BoolVar,IntValBranch,BoolVarValPrint=NULL); +BrancherHandle branch(Home,FloatVar,FloatValBranch,FloatVarValPrint=NULL); +BrancherHandle branch(Home,IntVar,IntValBranch,IntVarValPrint=NULL); +BrancherHandle branch(Home,SetVar,SetValBranch,SetVarValPrint=NULL); BrancherHandle branch(Home,const BoolVarArgs&,IntVarBranch,IntValBranch,BoolBranchFilter=NULL,BoolVarValPrint=NULL); BrancherHandle branch(Home,const BoolVarArgs&,IntVarBranch,IntValBranch,const Symmetries&,BoolBranchFilter=NULL,BoolVarValPrint=NULL); BrancherHandle branch(Home,const BoolVarArgs&,TieBreak,IntValBranch,BoolBranchFilter=NULL,BoolVarValPrint=NULL); BrancherHandle branch(Home,const BoolVarArgs&,TieBreak,IntValBranch,const Symmetries&,BoolBranchFilter=NULL,BoolVarValPrint=NULL); BrancherHandle branch(Home,const FloatVarArgs&,FloatVarBranch,FloatValBranch,FloatBranchFilter=NULL,FloatVarValPrint=NULL); BrancherHandle branch(Home,const FloatVarArgs&,TieBreak,FloatValBranch,FloatBranchFilter=NULL,FloatVarValPrint=NULL); -BrancherHandle branch(Home,const IntVarArgs&,IntVarBranch,IntValBranch,const Symmetries&,IntBranchFilter=NULL,IntVarValPrint=NULL); BrancherHandle branch(Home,const IntVarArgs&,IntVarBranch,IntValBranch,IntBranchFilter=NULL,IntVarValPrint=NULL); -BrancherHandle branch(Home,const IntVarArgs&,TieBreak,IntValBranch,const Symmetries&,IntBranchFilter=NULL,IntVarValPrint=NULL); +BrancherHandle branch(Home,const IntVarArgs&,IntVarBranch,IntValBranch,const Symmetries&,IntBranchFilter=NULL,IntVarValPrint=NULL); BrancherHandle branch(Home,const IntVarArgs&,TieBreak,IntValBranch,IntBranchFilter=NULL,IntVarValPrint=NULL); -BrancherHandle branch(Home,const SetVarArgs&,SetVarBranch,SetValBranch,const Symmetries&,SetBranchFilter=NULL,SetVarValPrint=NULL); +BrancherHandle branch(Home,const IntVarArgs&,TieBreak,IntValBranch,const Symmetries&,IntBranchFilter=NULL,IntVarValPrint=NULL); BrancherHandle branch(Home,const SetVarArgs&,SetVarBranch,SetValBranch,SetBranchFilter=NULL,SetVarValPrint=NULL); -BrancherHandle branch(Home,const SetVarArgs&,TieBreak,SetValBranch,const Symmetries&,SetBranchFilter=NULL,SetVarValPrint=NULL); +BrancherHandle branch(Home,const SetVarArgs&,SetVarBranch,SetValBranch,const Symmetries&,SetBranchFilter=NULL,SetVarValPrint=NULL); BrancherHandle branch(Home,const SetVarArgs&,TieBreak,SetValBranch,SetBranchFilter=NULL,SetVarValPrint=NULL); -BrancherHandle branch(Home,FloatVar,FloatValBranch,FloatVarValPrint=NULL); -BrancherHandle branch(Home,IntVar,IntValBranch,IntVarValPrint=NULL); -BrancherHandle branch(Home,SetVar,SetValBranch,SetVarValPrint=NULL); +BrancherHandle branch(Home,const SetVarArgs&,TieBreak,SetValBranch,const Symmetries&,SetBranchFilter=NULL,SetVarValPrint=NULL); void abs(Home,FloatVar,FloatVar); void abs(Home,IntVar,IntVar,IntConLevel=ICL_DEF); void atmostOne(Home,const SetVarArgs&,unsigned int); void binpacking(Home,const IntVarArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void cardinality(Home,const SetVarArgs&,unsigned int,unsigned int); void cardinality(Home,SetVar,IntVar); void cardinality(Home,SetVar,unsigned int,unsigned int); +void cardinality(Home,const SetVarArgs&,unsigned int,unsigned int); void channel(Home,BoolVar,IntVar,IntConLevel=ICL_DEF); +void channel(Home,FloatVar,IntVar); +void channel(Home,IntVar,FloatVar); void channel(Home,const BoolVarArgs&,IntVar,int=0,IntConLevel=ICL_DEF); void channel(Home,const BoolVarArgs&,SetVar); void channel(Home,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); void channel(Home,const IntVarArgs&,const SetVarArgs&); void channel(Home,const IntVarArgs&,int,const IntVarArgs&,int,IntConLevel=ICL_DEF); void channel(Home,const SetVarArgs&,const SetVarArgs&); -void channel(Home,FloatVar,IntVar); -void channel(Home,IntVar,FloatVar); void channelSorted(Home,const IntVarArgs&,SetVar); -void circuit(Home,const IntArgs&,const IntVarArgs&,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void circuit(Home,const IntArgs&,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); -void circuit(Home,const IntArgs&,int,const IntVarArgs&,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); +void circuit(Home,const IntArgs&,const IntVarArgs&,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void circuit(Home,const IntArgs&,int,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); +void circuit(Home,const IntArgs&,int,const IntVarArgs&,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void circuit(Home,const IntVarArgs&,IntConLevel=ICL_DEF); void circuit(Home,int,const IntVarArgs&,IntConLevel=ICL_DEF); void clause(Home,BoolOpType,const BoolVarArgs&,const BoolVarArgs&,BoolVar,IntConLevel=ICL_DEF); void clause(Home,BoolOpType,const BoolVarArgs&,const BoolVarArgs&,int,IntConLevel=ICL_DEF); void convex(Home,SetVar); void convex(Home,SetVar,SetVar); -void count(Home,const IntVarArgs&,const IntArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntSetArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntSetArgs&,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntSet&,const IntArgs&,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntSet&,IntRelType,int,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntSet&,IntRelType,IntVar,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,int,IntRelType,int,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,int,IntRelType,IntVar,IntConLevel=ICL_DEF); -void count(Home,const IntVarArgs&,IntVar,IntRelType,int,IntConLevel=ICL_DEF); void count(Home,const IntVarArgs&,IntVar,IntRelType,IntVar,IntConLevel=ICL_DEF); -void cumulative(Home,int,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,int,const IntVarArgs&,const IntArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,int,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,int,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,int,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,int,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,IntVar,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,IntVar,IntRelType,int,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntSet&,IntRelType,IntVar,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntSet&,IntRelType,int,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntSet&,const IntArgs&,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntSetArgs&,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntSetArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,int,IntRelType,IntVar,IntConLevel=ICL_DEF); +void count(Home,const IntVarArgs&,int,IntRelType,int,IntConLevel=ICL_DEF); void cumulative(Home,IntVar,const IntVarArgs&,const IntArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,IntVar,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,IntVar,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void cumulative(Home,IntVar,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void cumulative(Home,IntVar,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,IntVar,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void cumulative(Home,IntVar,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,IntVar,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,int,const IntVarArgs&,const IntArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,int,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,int,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,int,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,int,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void cumulative(Home,int,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void cumulatives(Home,const IntArgs&,const IntVarArgs&,const IntArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,bool,IntConLevel=ICL_DEF); void cumulatives(Home,const IntArgs&,const IntVarArgs&,const IntArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,bool,IntConLevel=ICL_DEF); void cumulatives(Home,const IntArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntArgs&,const IntArgs&,bool,IntConLevel=ICL_DEF); @@ -93,65 +93,65 @@ void div(Home,FloatVar,FloatVar,FloatVar); void div(Home,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); void divmod(Home,IntVar,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); void dom(Home,BoolVar,BoolVar,IntConLevel=ICL_DEF); -void dom(Home,const BoolVarArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); -void dom(Home,const FloatVarArgs&,const FloatVarArgs&); -void dom(Home,const FloatVarArgs&,FloatNum,FloatNum); -void dom(Home,const FloatVarArgs&,FloatVal); -void dom(Home,const IntVarArgs&,const IntSet&,IntConLevel=ICL_DEF); -void dom(Home,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); -void dom(Home,const IntVarArgs&,int,IntConLevel=ICL_DEF); -void dom(Home,const IntVarArgs&,int,int,IntConLevel=ICL_DEF); -void dom(Home,const SetVarArgs&,const SetVarArgs&); -void dom(Home,const SetVarArgs&,SetRelType,const IntSet&); -void dom(Home,const SetVarArgs&,SetRelType,int); -void dom(Home,const SetVarArgs&,SetRelType,int,int); void dom(Home,FloatVar,FloatNum,FloatNum); void dom(Home,FloatVar,FloatNum,FloatNum,Reify); void dom(Home,FloatVar,FloatVal); void dom(Home,FloatVar,FloatVal,Reify); void dom(Home,FloatVar,FloatVar); +void dom(Home,IntVar,IntVar,IntConLevel=ICL_DEF); void dom(Home,IntVar,const IntSet&,IntConLevel=ICL_DEF); void dom(Home,IntVar,const IntSet&,Reify,IntConLevel=ICL_DEF); void dom(Home,IntVar,int,IntConLevel=ICL_DEF); +void dom(Home,IntVar,int,Reify,IntConLevel=ICL_DEF); void dom(Home,IntVar,int,int,IntConLevel=ICL_DEF); void dom(Home,IntVar,int,int,Reify,IntConLevel=ICL_DEF); -void dom(Home,IntVar,int,Reify,IntConLevel=ICL_DEF); -void dom(Home,IntVar,IntVar,IntConLevel=ICL_DEF); void dom(Home,SetVar,SetRelType,const IntSet&); void dom(Home,SetVar,SetRelType,const IntSet&,Reify); void dom(Home,SetVar,SetRelType,int); +void dom(Home,SetVar,SetRelType,int,Reify); void dom(Home,SetVar,SetRelType,int,int); void dom(Home,SetVar,SetRelType,int,int,Reify); -void dom(Home,SetVar,SetRelType,int,Reify); void dom(Home,SetVar,SetVar); -void element(Home,const BoolVarArgs&,IntVar,BoolVar,IntConLevel=ICL_DEF); -void element(Home,const BoolVarArgs&,IntVar,int,IntConLevel=ICL_DEF); -void element(Home,const BoolVarArgs&,IntVar,int,IntVar,int,BoolVar,IntConLevel=ICL_DEF); -void element(Home,const IntSetArgs&,IntVar,int,IntVar,int,SetVar); -void element(Home,const IntSetArgs&,IntVar,SetVar); -void element(Home,const IntVarArgs&,IntVar,int,IntConLevel=ICL_DEF); -void element(Home,const IntVarArgs&,IntVar,int,IntVar,int,IntVar,IntConLevel=ICL_DEF); -void element(Home,const IntVarArgs&,IntVar,IntVar,IntConLevel=ICL_DEF); -void element(Home,const SetVarArgs&,IntVar,int,IntVar,int,SetVar); -void element(Home,const SetVarArgs&,IntVar,SetVar); +void dom(Home,const BoolVarArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void dom(Home,const FloatVarArgs&,FloatNum,FloatNum); +void dom(Home,const FloatVarArgs&,FloatVal); +void dom(Home,const FloatVarArgs&,const FloatVarArgs&); +void dom(Home,const IntVarArgs&,const IntSet&,IntConLevel=ICL_DEF); +void dom(Home,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); +void dom(Home,const IntVarArgs&,int,IntConLevel=ICL_DEF); +void dom(Home,const IntVarArgs&,int,int,IntConLevel=ICL_DEF); +void dom(Home,const SetVarArgs&,SetRelType,const IntSet&); +void dom(Home,const SetVarArgs&,SetRelType,int); +void dom(Home,const SetVarArgs&,SetRelType,int,int); +void dom(Home,const SetVarArgs&,const SetVarArgs&); void element(Home,IntSharedArray,IntVar,BoolVar,IntConLevel=ICL_DEF); +void element(Home,IntSharedArray,IntVar,IntVar,IntConLevel=ICL_DEF); void element(Home,IntSharedArray,IntVar,int,IntConLevel=ICL_DEF); void element(Home,IntSharedArray,IntVar,int,IntVar,int,BoolVar,IntConLevel=ICL_DEF); void element(Home,IntSharedArray,IntVar,int,IntVar,int,IntVar,IntConLevel=ICL_DEF); -void element(Home,IntSharedArray,IntVar,IntVar,IntConLevel=ICL_DEF); void element(Home,SetOpType,const IntArgs&,SetVar,SetVar,const IntSet&=IntSet(Set::Limits::min,Set::Limits::max)); void element(Home,SetOpType,const IntSetArgs&,SetVar,SetVar,const IntSet&=IntSet(Set::Limits::min,Set::Limits::max)); void element(Home,SetOpType,const IntVarArgs&,SetVar,SetVar,const IntSet&=IntSet(Set::Limits::min,Set::Limits::max)); void element(Home,SetOpType,const SetVarArgs&,SetVar,SetVar,const IntSet&=IntSet(Set::Limits::min,Set::Limits::max)); -void extensional(Home,const BoolVarArgs&,const TupleSet&,ExtensionalPropKind=EPK_DEF,IntConLevel=ICL_DEF); +void element(Home,const BoolVarArgs&,IntVar,BoolVar,IntConLevel=ICL_DEF); +void element(Home,const BoolVarArgs&,IntVar,int,IntConLevel=ICL_DEF); +void element(Home,const BoolVarArgs&,IntVar,int,IntVar,int,BoolVar,IntConLevel=ICL_DEF); +void element(Home,const IntSetArgs&,IntVar,SetVar); +void element(Home,const IntSetArgs&,IntVar,int,IntVar,int,SetVar); +void element(Home,const IntVarArgs&,IntVar,IntVar,IntConLevel=ICL_DEF); +void element(Home,const IntVarArgs&,IntVar,int,IntConLevel=ICL_DEF); +void element(Home,const IntVarArgs&,IntVar,int,IntVar,int,IntVar,IntConLevel=ICL_DEF); +void element(Home,const SetVarArgs&,IntVar,SetVar); +void element(Home,const SetVarArgs&,IntVar,int,IntVar,int,SetVar); void extensional(Home,const BoolVarArgs&,DFA,IntConLevel=ICL_DEF); -void extensional(Home,const IntVarArgs&,const TupleSet&,ExtensionalPropKind=EPK_DEF,IntConLevel=ICL_DEF); +void extensional(Home,const BoolVarArgs&,const TupleSet&,ExtensionalPropKind=EPK_DEF,IntConLevel=ICL_DEF); void extensional(Home,const IntVarArgs&,DFA,IntConLevel=ICL_DEF); +void extensional(Home,const IntVarArgs&,const TupleSet&,ExtensionalPropKind=EPK_DEF,IntConLevel=ICL_DEF); void ite(Home,BoolVar,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); -void linear(Home,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void linear(Home,const BoolVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); void linear(Home,const BoolVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); void linear(Home,const BoolVarArgs&,IntRelType,IntVar,Reify,IntConLevel=ICL_DEF); +void linear(Home,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void linear(Home,const BoolVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); void linear(Home,const FloatValArgs&,const FloatVarArgs&,FloatRelType,FloatNum); void linear(Home,const FloatValArgs&,const FloatVarArgs&,FloatRelType,FloatNum,Reify); void linear(Home,const FloatValArgs&,const FloatVarArgs&,FloatRelType,FloatVar); @@ -160,53 +160,53 @@ void linear(Home,const FloatVarArgs&,FloatRelType,FloatNum); void linear(Home,const FloatVarArgs&,FloatRelType,FloatNum,Reify); void linear(Home,const FloatVarArgs&,FloatRelType,FloatVar); void linear(Home,const FloatVarArgs&,FloatRelType,FloatVar,Reify); -void linear(Home,const IntArgs&,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void linear(Home,const IntArgs&,const BoolVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); void linear(Home,const IntArgs&,const BoolVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); void linear(Home,const IntArgs&,const BoolVarArgs&,IntRelType,IntVar,Reify,IntConLevel=ICL_DEF); -void linear(Home,const IntArgs&,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void linear(Home,const IntArgs&,const IntVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); +void linear(Home,const IntArgs&,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void linear(Home,const IntArgs&,const BoolVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); void linear(Home,const IntArgs&,const IntVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); void linear(Home,const IntArgs&,const IntVarArgs&,IntRelType,IntVar,Reify,IntConLevel=ICL_DEF); -void linear(Home,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void linear(Home,const IntVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); +void linear(Home,const IntArgs&,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void linear(Home,const IntArgs&,const IntVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); void linear(Home,const IntVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); void linear(Home,const IntVarArgs&,IntRelType,IntVar,Reify,IntConLevel=ICL_DEF); -void max(Home,const FloatVarArgs&,FloatVar); -void max(Home,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); +void linear(Home,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void linear(Home,const IntVarArgs&,IntRelType,int,Reify,IntConLevel=ICL_DEF); void max(Home,FloatVar,FloatVar,FloatVar); void max(Home,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); void max(Home,SetVar,IntVar); void max(Home,SetVar,IntVar,Reify); +void max(Home,const FloatVarArgs&,FloatVar); +void max(Home,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void member(Home,const BoolVarArgs&,BoolVar,IntConLevel=ICL_DEF); void member(Home,const BoolVarArgs&,BoolVar,Reify,IntConLevel=ICL_DEF); void member(Home,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void member(Home,const IntVarArgs&,IntVar,Reify,IntConLevel=ICL_DEF); -void min(Home,const FloatVarArgs&,FloatVar); -void min(Home,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void min(Home,FloatVar,FloatVar,FloatVar); void min(Home,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); void min(Home,SetVar,IntVar); void min(Home,SetVar,IntVar,Reify); +void min(Home,const FloatVarArgs&,FloatVar); +void min(Home,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void mod(Home,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); void mult(Home,FloatVar,FloatVar,FloatVar); void mult(Home,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); -void nooverlap(Home,const IntVarArgs&,const IntArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void nooverlap(Home,const IntVarArgs&,const IntArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void nooverlap(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void nooverlap(Home,const IntVarArgs&,const IntArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void nooverlap(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); +void nooverlap(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void notMax(Home,SetVar,IntVar); void notMin(Home,SetVar,IntVar); void nroot(Home,FloatVar,int,FloatVar); void nroot(Home,IntVar,int,IntVar,IntConLevel=ICL_DEF); -void nvalues(Home,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); void nvalues(Home,const BoolVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); -void nvalues(Home,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void nvalues(Home,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); void nvalues(Home,const IntVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); -void path(Home,const IntArgs&,const IntVarArgs&,IntVar,IntVar,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); +void nvalues(Home,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); void path(Home,const IntArgs&,const IntVarArgs&,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); -void path(Home,const IntArgs&,int,const IntVarArgs&,IntVar,IntVar,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); +void path(Home,const IntArgs&,const IntVarArgs&,IntVar,IntVar,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void path(Home,const IntArgs&,int,const IntVarArgs&,IntVar,IntVar,IntVar,IntConLevel=ICL_DEF); +void path(Home,const IntArgs&,int,const IntVarArgs&,IntVar,IntVar,const IntVarArgs&,IntVar,IntConLevel=ICL_DEF); void path(Home,const IntVarArgs&,IntVar,IntVar,IntConLevel=ICL_DEF); void path(Home,int,const IntVarArgs&,IntVar,IntVar,IntConLevel=ICL_DEF); void pow(Home,FloatVar,int,FloatVar); @@ -223,58 +223,58 @@ void rel(Home,BoolVar,IntRelType,BoolVar,IntConLevel=ICL_DEF); void rel(Home,BoolVar,IntRelType,BoolVar,Reify,IntConLevel=ICL_DEF); void rel(Home,BoolVar,IntRelType,int,IntConLevel=ICL_DEF); void rel(Home,BoolVar,IntRelType,int,Reify,IntConLevel=ICL_DEF); -void rel(Home,const BoolVarArgs&,IntRelType,BoolVar,IntConLevel=ICL_DEF); -void rel(Home,const BoolVarArgs&,IntRelType,const BoolVarArgs&,IntConLevel=ICL_DEF); -void rel(Home,const BoolVarArgs&,IntRelType,IntConLevel=ICL_DEF); -void rel(Home,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void rel(Home,const FloatVarArgs&,FloatRelType,FloatVal); -void rel(Home,const FloatVarArgs&,FloatRelType,FloatVar); -void rel(Home,const IntSet&,SetOpType,SetVar,SetRelType,const IntSet&); -void rel(Home,const IntSet&,SetOpType,SetVar,SetRelType,SetVar); -void rel(Home,const IntVarArgs&,IntRelType,const IntVarArgs&,IntConLevel=ICL_DEF); -void rel(Home,const IntVarArgs&,IntRelType,IntConLevel=ICL_DEF); -void rel(Home,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); -void rel(Home,const IntVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); void rel(Home,FloatVar,FloatRelType,FloatVal); void rel(Home,FloatVar,FloatRelType,FloatVal,Reify); void rel(Home,FloatVar,FloatRelType,FloatVar); void rel(Home,FloatVar,FloatRelType,FloatVar,Reify); -void rel(Home,IntVar,IntRelType,int,IntConLevel=ICL_DEF); -void rel(Home,IntVar,IntRelType,int,Reify,IntConLevel=ICL_DEF); void rel(Home,IntVar,IntRelType,IntVar,IntConLevel=ICL_DEF); void rel(Home,IntVar,IntRelType,IntVar,Reify,IntConLevel=ICL_DEF); void rel(Home,IntVar,IntRelType,SetVar); +void rel(Home,IntVar,IntRelType,int,IntConLevel=ICL_DEF); +void rel(Home,IntVar,IntRelType,int,Reify,IntConLevel=ICL_DEF); void rel(Home,IntVar,SetRelType,SetVar); void rel(Home,IntVar,SetRelType,SetVar,Reify); -void rel(Home,SetOpType,const IntVarArgs&,const IntSet&,SetVar); void rel(Home,SetOpType,const IntVarArgs&,SetVar); -void rel(Home,SetOpType,const SetVarArgs&,const IntSet&,SetVar); +void rel(Home,SetOpType,const IntVarArgs&,const IntSet&,SetVar); void rel(Home,SetOpType,const SetVarArgs&,SetVar); +void rel(Home,SetOpType,const SetVarArgs&,const IntSet&,SetVar); void rel(Home,SetVar,IntRelType,IntVar); -void rel(Home,SetVar,SetOpType,const IntSet&,SetRelType,const IntSet&); -void rel(Home,SetVar,SetOpType,const IntSet&,SetRelType,SetVar); -void rel(Home,SetVar,SetOpType,SetVar,SetRelType,const IntSet&); void rel(Home,SetVar,SetOpType,SetVar,SetRelType,SetVar); +void rel(Home,SetVar,SetOpType,SetVar,SetRelType,const IntSet&); +void rel(Home,SetVar,SetOpType,const IntSet&,SetRelType,SetVar); +void rel(Home,SetVar,SetOpType,const IntSet&,SetRelType,const IntSet&); void rel(Home,SetVar,SetRelType,IntVar); void rel(Home,SetVar,SetRelType,IntVar,Reify); void rel(Home,SetVar,SetRelType,SetVar); void rel(Home,SetVar,SetRelType,SetVar,Reify); +void rel(Home,const BoolVarArgs&,IntRelType,BoolVar,IntConLevel=ICL_DEF); +void rel(Home,const BoolVarArgs&,IntRelType,IntConLevel=ICL_DEF); +void rel(Home,const BoolVarArgs&,IntRelType,const BoolVarArgs&,IntConLevel=ICL_DEF); +void rel(Home,const BoolVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); +void rel(Home,const FloatVarArgs&,FloatRelType,FloatVal); +void rel(Home,const FloatVarArgs&,FloatRelType,FloatVar); +void rel(Home,const IntSet&,SetOpType,SetVar,SetRelType,SetVar); +void rel(Home,const IntSet&,SetOpType,SetVar,SetRelType,const IntSet&); +void rel(Home,const IntVarArgs&,IntRelType,IntConLevel=ICL_DEF); +void rel(Home,const IntVarArgs&,IntRelType,IntVar,IntConLevel=ICL_DEF); +void rel(Home,const IntVarArgs&,IntRelType,const IntVarArgs&,IntConLevel=ICL_DEF); +void rel(Home,const IntVarArgs&,IntRelType,int,IntConLevel=ICL_DEF); void sequence(Home,const BoolVarArgs&,const IntSet&,int,int,int,IntConLevel=ICL_DEF); void sequence(Home,const IntVarArgs&,const IntSet&,int,int,int,IntConLevel=ICL_DEF); void sequence(Home,const SetVarArgs&); void sequence(Home,const SetVarArgs&,SetVar); -void sorted(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); void sorted(Home,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); +void sorted(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); void sqr(Home,FloatVar,FloatVar); void sqr(Home,IntVar,IntVar,IntConLevel=ICL_DEF); void sqrt(Home,FloatVar,FloatVar); void sqrt(Home,IntVar,IntVar,IntConLevel=ICL_DEF); -void unary(Home,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void unary(Home,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); -void unary(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void unary(Home,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void unary(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,IntConLevel=ICL_DEF); -void unary(Home,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); +void unary(Home,const IntVarArgs&,const IntVarArgs&,const IntVarArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void unary(Home,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,IntConLevel=ICL_DEF); +void unary(Home,const TaskTypeArgs&,const IntVarArgs&,const IntArgs&,const BoolVarArgs&,IntConLevel=ICL_DEF); void unshare(Home,BoolVarArgs&,IntConLevel=ICL_DEF); void unshare(Home,IntVarArgs&,IntConLevel=ICL_DEF); void weights(Home,IntSharedArray,IntSharedArray,SetVar,IntVar); diff --git a/packages/myddas/CMakeLists.txt b/packages/myddas/CMakeLists.txt index a34bb908b..10e8e17fc 100644 --- a/packages/myddas/CMakeLists.txt +++ b/packages/myddas/CMakeLists.txt @@ -1,36 +1,73 @@ + +set( MYDDAS_SOURCES + myddas_mysql.c + myddas_odbc.c + myddas_util.c + myddas_initialization.c + myddas_shared.c + myddas_statistics.c + myddas_top_level.c + myddas_wkb2prolog.c ) + +set( MYDDAS_PROLOG + pl/myddas.ypp + pl/myddas_assert_predicates.ypp + pl/myddas_mysql.ypp + pl/myddas_top_level.ypp + pl/myddas_errors.ypp + pl/myddas_prolog2sql.ypp + pl/myddas_util_predicates.ypp + pl/myddas_prolog2sql_optimizer.ypp ) + +function(cpp_compile filename) + get_filename_component(base ${filename} NAME_WE) + set(base_abs ${CMAKE_CURRENT_BINARY_DIR}/${base}) + set(output ${base_abs}.yap) + add_custom_command( + OUTPUT ${output} + COMMAND ${CMAKE_C_COMPILER} -E ${CMAKE_C_FLAGS} -P -E -w -o ${CMAKE_CURRENT_BINARY_DIR} ${filename}) + set_source_files_properties(${output} PROPERTIES GENERATED TRUE) +endfunction() + +foreach(file ${MYDDAS_PROLOG}) + cpp_compile(GENERATED_SOURCES ${file}) +endforeach() + +source_group("" FILES ${MYDDAS_PROLOG}) +source_group(generated FILES ${GENERATED_SOURCES}) + macro_optional_find_package(ODBC ON) -if (ODBC_FOUND) - macro_log_feature (ODBC_FOUND "ODBC" - "Use ODBC Data-Base Interface " - "http://www.odbc.org" FALSE) - add_definitions (-DMYDDAS_ODBC=1) - set (EXTRALIBS ${EXTRALIBS} ${ODBC_LIBRARY}) - if (APPLE) - set (EXTRALIBS ${EXTRALIBS} "-framework CoreFoundation") - endif (APPLE) -endif (ODBC_FOUND) - macro_optional_find_package(MySQL ON) -if (MYSQL_FOUND) - macro_log_feature (MYSQL_FOUND "MySQL" - "Use MYSQL Data-Base Interface " - "http://www.odbc.org" FALSE) - add_definitions (-DMYDDAS_MYSQL=1) -endif (MYSQL_FOUND) -option (WITH_MYDDAS - "enable the MYDDAS library" ON) -if (WITH_MYDDAS) +if (ODBC_FOUND OR MYSQL_FOUND) + add_library (myddas SHARED ${MYDDAS_SOURCES}) + target_link_libraries(myddas libYap) + if (ODBC_FOUND) + # ODBC_INCLUDE_DIRECTORIES, where to find sql.h + # ODBC_LIBRARIES, the libraries to link against to use ODBC + # ODBC_FOUND. If false, you cannot build anything that requires MySQL. + macro_log_feature (ODBC_FOUND "ODBC" + "Use ODBC Data-Base Interface " + "http://www.unixodbc.org" FALSE) + add_definitions (-DMYDDAS_ODBC=1) + target_link_libraries(myddas ${ODBC_LIBRARIES}) + include_directories (${ODBC_INCLUDE_DIRECTORIES}) + endif (ODBC_FOUND) + if (MYSQL_FOUND) + # MYSQL_INCLUDE_DIR - where to find mysql.h, etc. + # MYSQL_LIBRARIES - List of libraries when using MySQL. + # MYSQL_FOUND - True if MySQL found. + macro_log_feature (MYSQL_FOUND "MySQL" + "Use MYSQL Data-Base Interface " + "http://www.mysql.org" FALSE) add_definitions (-DMYDDAS_MYSQL=1) + target_link_libraries(myddas ${MYSQL_LIBRARIES}) + include_directories (${MYSQL_INCLUDE_DIR}) endif (MYSQL_FOUND) - if (MYSQL_FOUND OR ODBC_FOUND) - set (EXTRALIBS ${EXTRALIBS} myddas) - else (MYSQL_FOUND OR ODBC_FOUND) - message(SEND_ERROR "MYDDAS needs either MYSQL or ODBC none where found") - endif (MYSQL_FOUND OR ODBC_FOUND) -endif (WITH_MYDDAS) + add_custom_target (plmyddas ALL DEPENDS ${GENERATED_SOURCES} ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +endif (ODBC_FOUND OR MYSQL_FOUND) cmake_dependent_option (WITH_MYDDAS_Stats "enable the MYDDAS library statistics support" OFF diff --git a/packages/python/CMakeLists.txt b/packages/python/CMakeLists.txt index c7498c21e..25c50f1d8 100644 --- a/packages/python/CMakeLists.txt +++ b/packages/python/CMakeLists.txt @@ -1,4 +1,8 @@ #CHECK: PythonLibs + +set (PYTHON_SOURCES + python.c) + macro_optional_find_package(PythonInterp ON) macro_optional_find_package (PythonLibs ON) macro_log_feature (PYTHONLIBS_FOUND "Python" @@ -30,5 +34,21 @@ if (PYTHONLIBS_FOUND) # PYTHONLIBS_FOUND - have the Python l # first to get the currently active Python version by default with a consistent # version of PYTHON_LIBRARIES. + add_library (python SHARED ${PYTHON_SOURCES}) + + target_link_libraries(python libYap ${PYTHON_LIBRARIES}) + + set_target_properties (python PROPERTIES PREFIX "") + + include_directories (${PYTHON_INCLUDE_DIRS}) + install(TARGETS python + LIBRARY DESTINATION ${dlls} + ) + + install(FILES python.pl + DESTINATION ${libpl} + ) + + endif (PYTHONLIBS_FOUND) diff --git a/packages/python/python.pl b/packages/python/python.pl index 2270db882..2f08bb643 100644 --- a/packages/python/python.pl +++ b/packages/python/python.pl @@ -83,7 +83,7 @@ fetch_module(M:E, M1, E1, MRef) :- % % extend the module as much as we can. % -module_extend(M0, M:E, MF, EF, MRef0, MRef) :- +module_extend(M0, M:E, MF, EF, _MRef0, MRef) :- atom(M), atom_concat([M0,'.',M], MM), python_import(MM, MRef1), !, @@ -118,7 +118,7 @@ python_class(Obj) :- process_obj(Obj, _, S, Obj, NS, Dict) :- python_callable(Obj), !, python_check_args(S, NS, Dict). -process_obj(Obj, _, S, Obj, NS, Dict) :- +process_obj(Obj, _, S, FObj, NS, Dict) :- python_class(Obj), descend_object(Obj:'__init__', FObj, _, _), python_check_args(S, NS, Dict). @@ -133,7 +133,7 @@ python_eval_term([H|T], [NH|NT]) :- !, python_eval_term(T, NT). python_eval_term(N, N) :- atomic(N), !. python_eval_term(Exp, O) :- - descend_exp(Exp, Obj, Old, S), !, + descend_exp(Exp, Obj, _Old, S), !, (functor(S, _, 0) -> O = Obj ; @@ -185,7 +185,7 @@ match_from_anames([_|ArgNames], K, VA, [V|Defaults], [V|NDefaults]) :- fetch_args(FRef, Args, Kwd, Defaults) :- FRef = '__obj__'(_), !, - python_mref_cache('inspect', M), + %python_mref_cache('inspect', M), python_obj_cache(inspect:getargspec(_), F), python_apply(F, getargspec(FRef), {}, ExtraArgs), ExtraArgs=t(Args, _, Kwd, Defaults). diff --git a/packages/raptor b/packages/raptor index e75f61fe1..c488f2493 160000 --- a/packages/raptor +++ b/packages/raptor @@ -1 +1 @@ -Subproject commit e75f61fe11da02633e61501dae21122b9adad687 +Subproject commit c488f2493012e8e3b83bbcd4db020a3db5b96062 diff --git a/packages/real b/packages/real index 54d9b5d24..e0a566b31 160000 --- a/packages/real +++ b/packages/real @@ -1 +1 @@ -Subproject commit 54d9b5d24c60b1be4dc6c1167a59ef46a0f79ac8 +Subproject commit e0a566b31a14f28a49fe112f6e56bbd58a12ccd4 diff --git a/packages/yap-lbfgs/yap_lbfgs.c b/packages/yap-lbfgs/yap_lbfgs.c index 1e847f4a2..0c8e1ebc8 100644 --- a/packages/yap-lbfgs/yap_lbfgs.c +++ b/packages/yap-lbfgs/yap_lbfgs.c @@ -69,7 +69,7 @@ static lbfgsfloatval_t evaluate( optimizer_status=OPTIMIZER_STATUS_RUNNING; if (result==FALSE) { - printf("ERROR: Calling the evaluate call back function in YAP.\n"); + printf("ERROR: the evaluate call failed in YAP.\n"); // Goal did not succeed return FALSE; } @@ -127,7 +127,7 @@ static int progress( call = YAP_GetFromSlot( s1 ); if (result==FALSE) { - printf("ERROR: Calling the progress call back function in YAP.\n"); + printf("ERROR: the progress call failed in YAP.\n"); // Goal did not succeed return FALSE; }