From b217dfc7e7bd7beb73c8cc23ad82383309ceb697 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 18 Jul 2019 15:21:56 +0200 Subject: Implement Coin-OR CBC polyhedron saturation operator --- .../hu.bme.mit.inf.dslreasoner.ilp.cbc/.classpath | 15 ++ .../hu.bme.mit.inf.dslreasoner.ilp.cbc/.gitignore | 2 + .../hu.bme.mit.inf.dslreasoner.ilp.cbc/.project | 28 +++ .../META-INF/MANIFEST.MF | 10 + .../build.properties | 4 + .../cpp/CMakeLists.txt | 23 ++ .../cpp/viatracbc.cpp | 261 +++++++++++++++++++++ .../cpp/viatracbc.hpp | 16 ++ .../lib/libviatracbc.so | Bin 0 -> 38248 bytes .../mit/inf/dslreasoner/ilp/cbc/CbcException.java | 30 +++ .../bme/mit/inf/dslreasoner/ilp/cbc/CbcResult.java | 54 +++++ .../bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java | 71 ++++++ 12 files changed, 514 insertions(+) create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.classpath create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.gitignore create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.project create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/META-INF/MANIFEST.MF create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/build.properties create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp create mode 100755 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcException.java create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcResult.java create mode 100644 Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java (limited to 'Solvers/ILP-Solver') diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.classpath b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.classpath new file mode 100644 index 00000000..e19039ae --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.classpath @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.gitignore b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.gitignore new file mode 100644 index 00000000..0cc6a59e --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.gitignore @@ -0,0 +1,2 @@ +/bin/ +/cpp/build/ diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.project b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.project new file mode 100644 index 00000000..6c32e464 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/.project @@ -0,0 +1,28 @@ + + + hu.bme.mit.inf.dslreasoner.ilp.cbc + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/META-INF/MANIFEST.MF b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/META-INF/MANIFEST.MF new file mode 100644 index 00000000..04478746 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/META-INF/MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Cbc +Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.ilp.cbc +Bundle-Version: 1.0.0.qualifier +Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.ilp.cbc +Export-Package: hu.bme.mit.inf.dslreasoner.ilp.cbc +Bundle-NativeCode: libviatracbc.so; + osname=Linux; + processor=x86_64 diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/build.properties b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/build.properties new file mode 100644 index 00000000..34d2e4d2 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt new file mode 100644 index 00000000..5dbcb071 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt @@ -0,0 +1,23 @@ +cmake_minimum_required(VERSION 3.14.5) +project(hu.bme.mit.inf.dslreasoner.ilp.cbc) + +set(CMAKE_CXX_STANDARD 17) + +find_package(JNI REQUIRED) +find_package(PkgConfig REQUIRED) + +pkg_check_modules(CBC REQUIRED cbc) + +add_library(viatracbc SHARED viatracbc.cpp) + +target_link_libraries(viatracbc + ${JAVA_JVM_LIBRARY} + ${CBC_LIBRARIES}) +target_include_directories(viatracbc + PUBLIC ${JNI_INCLUDE_DIRS} + PRIVATE ${CBC_INCLUDE_DIRS}) + +set(VIATRACBC_NATIVES_DIR ${CMAKE_SOURCE_DIR}/../lib) +add_custom_command(TARGET viatracbc POST_BUILD + COMMAND ${CMAKE_COMMAND} -E make_directory ${VIATRACBC_NATIVES_DIR} + COMMAND ${CMAKE_COMMAND} -E copy $ ${VIATRACBC_NATIVES_DIR}) diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp new file mode 100644 index 00000000..49994244 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp @@ -0,0 +1,261 @@ + +#include +#include +#include +#include + +#include + +#include "CbcBranchDefaultDecision.hpp" +#include "CbcCompareDefault.hpp" +#include "CbcHeuristic.hpp" +#include "CbcHeuristicLocal.hpp" +#include "CbcModel.hpp" +#include "CglClique.hpp" +#include "CglFlowCover.hpp" +#include "CglGomory.hpp" +#include "CglKnapsackCover.hpp" +#include "CglMixedIntegerRounding.hpp" +#include "CglOddHole.hpp" +#include "CglProbing.hpp" +#include "CoinModel.hpp" +#include "OsiClpSolverInterface.hpp" + +#include "viatracbc.hpp" + +static const char *const kCbcExceptionClassName = "hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcException"; +static const char *const kRuntimeExceptionClassName = "java/lang/RuntimeException"; + +static const jint kCbcSolutionBounded = 0; +static const jint kCbcSolutionUnbounded = 1; +static const jint kCbcUnsat = 2; +static const jint kCbcAbandoned = 3; +static const jint kCbcTimeout = 4; +static const jint kCbcError = 5; + +static CoinModel CreateModel(JNIEnv *env, jdoubleArray columnLowerBoundsArray, + jdoubleArray columnUpperBoundsArray, jintArray rowStartsArray, jintArray columnIndicesArray, + jdoubleArray entriedArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, + jdoubleArray objectiveArray); +static void CreateModelColumns(JNIEnv *env, jdoubleArray columnLowerBoundsArray, + jdoubleArray columnUpperBoundsArray, jdoubleArray objectiveArray, CoinModel &build); +static void CreateModelRows(JNIEnv *env, jintArray rowStartsArray, jintArray columnIndicesArray, + jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, + CoinModel &build); +static jint SolveModel(CoinModel &build, jdouble timeoutSeconds, jboolean silent, jdouble &value); +static void ThrowException(JNIEnv *env, const char *message); + +template < + typename Array, + typename Element, + Element *(JNIEnv::*GetElementsPtr)(Array, jboolean *), + void (JNIEnv::*ReleaseElementsPtr)(Array, Element *, jint) +> +class PinnedArray { +public: + PinnedArray(JNIEnv *env, Array array) + : env_{env}, array_{array}, elements_{(env->*GetElementsPtr)(array, nullptr)} { + if (elements_ == nullptr) { + throw std::runtime_error("Failed to pin array elements"); + } + } + PinnedArray(const PinnedArray &) = delete; + PinnedArray(PinnedArray &&) = delete; + PinnedArray &operator=(const PinnedArray &) = delete; + PinnedArray &operator=(PinnedArray &&) = delete; + ~PinnedArray() { + (env_->*ReleaseElementsPtr)(array_, elements_, 0); + } + + operator Element *() { return elements_; } + operator const Element *() const { return elements_; } + +private: + JNIEnv *env_; + Array array_; + Element *elements_; +}; + +using PinnedIntArray = PinnedArray; +using PinnedDoubleArray = PinnedArray; + +jint Java_hu_bme_mit_inf_dslreasoner_ilp_cbc_CbcSolver_solveIlpProblem( + JNIEnv *env, jclass klazz, jdoubleArray columnLowerBoundsArray, jdoubleArray columnUpperBoundsArray, + jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriesArray, + jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, jdoubleArray objectiveArray, + jdoubleArray outputArray, jdouble timeoutSeconds, jboolean silent) { + try { + auto build = CreateModel(env, columnLowerBoundsArray, columnUpperBoundsArray, + rowStartsArray, columnIndicesArray, entriesArray, rowLowerBoundsArray, rowUpperBoundsArray, + objectiveArray); + double value; + jint result = SolveModel(build, timeoutSeconds, silent, value); + if (result == kCbcSolutionBounded) { + PinnedDoubleArray output{env, outputArray}; + *output = value; + } + return result; + } catch (const std::exception &e) { + ThrowException(env, e.what()); + } catch (...) { + ThrowException(env, "Unknown solver error"); + } + return kCbcError; +} + +CoinModel CreateModel(JNIEnv *env, jdoubleArray columnLowerBoundsArray, + jdoubleArray columnUpperBoundsArray, jintArray rowStartsArray, jintArray columnIndicesArray, + jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, + jdoubleArray objectiveArray) { + CoinModel build; + CreateModelColumns(env, columnLowerBoundsArray, columnUpperBoundsArray, objectiveArray, build); + CreateModelRows(env, rowStartsArray, columnIndicesArray, entriesArray, rowLowerBoundsArray, + rowUpperBoundsArray, build); + return build; +} + +void CreateModelColumns(JNIEnv *env, jdoubleArray columnLowerBoundsArray, + jdoubleArray columnUpperBoundsArray, jdoubleArray objectiveArray, CoinModel &build) { + int numColumns = env->GetArrayLength(columnLowerBoundsArray); + PinnedDoubleArray columnLowerBounds{env, columnLowerBoundsArray}; + PinnedDoubleArray columnUpperBounds{env, columnUpperBoundsArray}; + PinnedDoubleArray objective{env, objectiveArray}; + for (int i = 0; i < numColumns; i++) { + build.setColumnBounds(i, columnLowerBounds[i], columnUpperBounds[i]); + build.setObjective(i, objective[i]); + build.setInteger(i); + } +} + +void CreateModelRows(JNIEnv *env, jintArray rowStartsArray, jintArray columnIndicesArray, + jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, + CoinModel &build) { + int numRows = env->GetArrayLength(rowLowerBoundsArray); + PinnedIntArray rowStarts{env, rowStartsArray}; + PinnedIntArray columnIndices{env, columnIndicesArray}; + PinnedDoubleArray entries{env, entriesArray}; + PinnedDoubleArray rowLowerBounds{env, rowLowerBoundsArray}; + PinnedDoubleArray rowUpperBounds{env, rowUpperBoundsArray}; + for (int i = 0; i < numRows; i++) { + int rowStart = rowStarts[i]; + int numbersInRow = rowStarts[i + 1] - rowStart; + build.addRow(numbersInRow, &columnIndices[rowStart], &entries[rowStart], + rowLowerBounds[i], rowUpperBounds[i]); + } +} + +jint SolveModel(CoinModel &build, jdouble timeoutSeconds, jboolean silent, jdouble &value) { + OsiClpSolverInterface solver; + solver.loadFromCoinModel(build); + CbcModel model{solver}; + + model.setDblParam(CbcModel::CbcMaximumSeconds, timeoutSeconds); + if (silent == JNI_FALSE) { + model.messageHandler()->setLogLevel(2); + model.solver()->messageHandler()->setLogLevel(1); + } else { + model.solver()->setHintParam(OsiDoReducePrint, true, OsiHintTry); + model.messageHandler()->setLogLevel(0); + model.solver()->messageHandler()->setLogLevel(0); + } + + // Cut generators and heuristics are used according to + // https://github.com/coin-or/Cbc/blob/6b977b6707f1755520c64fea57b95891c1f3ddc0/Cbc/examples/sample2.cpp + + CglProbing probing; + probing.setUsingObjective(true); + probing.setMaxPass(1); + probing.setMaxPassRoot(5); + probing.setMaxProbe(10); + probing.setMaxProbeRoot(1000); + probing.setMaxLook(50); + probing.setMaxLookRoot(500); + probing.setMaxElements(200); + probing.setRowCuts(3); + model.addCutGenerator(&probing, -1, "Probing"); + + CglGomory gomory; + gomory.setLimit(300); + model.addCutGenerator(&gomory, -1, "Gomory"); + + CglKnapsackCover knapsackCover; + model.addCutGenerator(&knapsackCover, -1, "KnapsackCover"); + + CglClique clique; + clique.setStarCliqueReport(false); + clique.setRowCliqueReport(false); + model.addCutGenerator(&clique, -1, "Clique"); + + CglFlowCover flowCover; + model.addCutGenerator(&flowCover, -1, "FlowCover"); + + CglMixedIntegerRounding mixedIntegerRounding; + model.addCutGenerator(&mixedIntegerRounding, -1, "MixedIntegerRounding"); + + OsiClpSolverInterface *osiClp = dynamic_cast(model.solver()); + if (osiClp != nullptr) { + osiClp->setSpecialOptions(128); + osiClp->setupForRepeatedUse(0, 0); + } + + CbcRounding rounding; + model.addHeuristic(&rounding); + + CbcHeuristicLocal localHeuristic; + model.addHeuristic(&localHeuristic); + + CbcBranchDefaultDecision branchDecision; + model.setBranchingMethod(&branchDecision); + + CbcCompareDefault nodeComparison; + model.setNodeComparison(nodeComparison); + + model.initialSolve(); + + if (model.isInitialSolveProvenPrimalInfeasible()) { + return kCbcUnsat; + } + if (model.isInitialSolveAbandoned()) { + return kCbcTimeout; + } + + model.setMinimumDrop(CoinMin(1.0, fabs(model.getMinimizationObjValue()) * 1.0e-3 + 1.0e-4)); + model.setMaximumCutPassesAtRoot(-100); + model.setNumberStrong(10); + model.solver()->setIntParam(OsiMaxNumIterationHotStart, 100); + + model.branchAndBound(); + + if (model.isProvenInfeasible()) { + return kCbcUnsat; + } + if (model.isProvenDualInfeasible()) { + return kCbcSolutionUnbounded; + } + if (model.isProvenOptimal()) { + value = model.getMinimizationObjValue(); + return kCbcSolutionBounded; + } + if (model.maximumSecondsReached()) { + return kCbcTimeout; + } + return kCbcAbandoned; +} + +void ThrowException(JNIEnv *env, const char *message) { + jclass exceptionClass = env->FindClass(kCbcExceptionClassName); + if (exceptionClass == nullptr) { + std::cerr << "WARNING: " << kCbcExceptionClassName << " class was not found" << std::endl; + exceptionClass = env->FindClass(kRuntimeExceptionClassName); + if (exceptionClass == nullptr) { + std::cerr << "FATAL: " << kRuntimeExceptionClassName << " class was not found" << std::endl; + std::cerr << "FATAL: " << message << std::endl; + std::exit(EXIT_FAILURE); + } + } + if (env->ThrowNew(exceptionClass, message) < 0) { + std::cerr << "FATAL: Could not throw java exception" << std::endl; + std::cerr << "FATAL: " << message << std::endl; + std::exit(EXIT_FAILURE); + } +} diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp new file mode 100644 index 00000000..c65f71e3 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp @@ -0,0 +1,16 @@ +#ifndef HU_BME_MIT_INF_DSLREASONER_ILP_CBC_ +#define HU_BME_MIT_INF_DSLREASONER_ILP_CBC_ + +#include + +extern "C" { + +JNIEXPORT jint JNICALL Java_hu_bme_mit_inf_dslreasoner_ilp_cbc_CbcSolver_solveIlpProblem( + JNIEnv *env, jclass klazz, jdoubleArray columnLowerBoundsArray, jdoubleArray columnUpperBoundsArray, + jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriesArray, + jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, jdoubleArray objectiveArray, + jdoubleArray outputArray, jdouble timeoutSeconds, jboolean silent); + +} + +#endif // HU_BME_MIT_INF_DSLREASONER_ILP_CBC_ diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so new file mode 100755 index 00000000..21fd2ff2 Binary files /dev/null and b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so differ diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcException.java b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcException.java new file mode 100644 index 00000000..26846958 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcException.java @@ -0,0 +1,30 @@ +package hu.bme.mit.inf.dslreasoner.ilp.cbc; + +public class CbcException extends RuntimeException { + + /** + * + */ + private static final long serialVersionUID = 2691773509078511887L; + + public CbcException() { + super(); + } + + public CbcException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { + super(message, cause, enableSuppression, writableStackTrace); + } + + public CbcException(String message, Throwable cause) { + super(message, cause); + } + + public CbcException(String message) { + super(message); + } + + public CbcException(Throwable cause) { + super(cause); + } + +} diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcResult.java b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcResult.java new file mode 100644 index 00000000..dae3a447 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcResult.java @@ -0,0 +1,54 @@ +package hu.bme.mit.inf.dslreasoner.ilp.cbc; + +public abstract class CbcResult { + public static final CbcResult SOLUTION_UNBOUNDED = new CbcResult() { + }; + + public static final CbcResult UNSAT = new CbcResult() { + }; + + public static final CbcResult ABANDONED = new CbcResult() { + }; + + public static final CbcResult TIMEOUT = new CbcResult() { + }; + + private CbcResult() { + } + + public static class SolutionBounded extends CbcResult { + public final double value; + + public SolutionBounded(double value) { + this.value = value; + } + + public double getValue() { + return value; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + long temp; + temp = Double.doubleToLongBits(value); + result = prime * result + (int) (temp ^ (temp >>> 32)); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + SolutionBounded other = (SolutionBounded) obj; + if (Double.doubleToLongBits(value) != Double.doubleToLongBits(other.value)) + return false; + return true; + } + } +} diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java new file mode 100644 index 00000000..39b9d537 --- /dev/null +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java @@ -0,0 +1,71 @@ +package hu.bme.mit.inf.dslreasoner.ilp.cbc; + +public class CbcSolver { + private static int CBC_SOLUTION_BOUNDED = 0; + private static int CBC_SOLUTION_UNBOUNDED = 1; + private static int CBC_UNSAT = 2; + private static int CBC_ABANDONED = 3; + private static int CBC_TIMEOUT = 4; + private static int CBC_ERROR = 5; + + private static boolean nativesLoaded = false; + + private CbcSolver() { + throw new IllegalStateException("This is a static utility class and should not be instantiated directly."); + } + + public static CbcResult solve(double[] columnLowerBounds, double[] columnUpperBounds, int[] rowStarts, + int[] columnIndices, double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, + double[] objective, double timeoutSeconds, boolean silent) { + loadNatives(); + validate(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, entries, rowLowerBounds, + rowUpperBounds, objective); + double[] output = new double[1]; + int result = solveIlpProblem(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, entries, + rowLowerBounds, rowUpperBounds, objective, output, timeoutSeconds, silent); + if (result == CBC_SOLUTION_BOUNDED) { + return new CbcResult.SolutionBounded(output[0]); + } else if (result == CBC_SOLUTION_UNBOUNDED) { + return CbcResult.SOLUTION_UNBOUNDED; + } else if (result == CBC_UNSAT) { + return CbcResult.UNSAT; + } else if (result == CBC_ABANDONED) { + return CbcResult.ABANDONED; + } else if (result == CBC_TIMEOUT) { + return CbcResult.TIMEOUT; + } else if (result == CBC_ERROR) { + throw new CbcException("Solver signalled error, but no exception was thrown"); + } else { + throw new CbcException("Unknown return value: " + result); + } + } + + private static void loadNatives() { + if (!nativesLoaded) { + synchronized (CbcSolver.class) { + System.loadLibrary("viatracbc"); + nativesLoaded = true; + } + } + } + + private static void validate(double[] columnLowerBounds, double[] columnUpperBounds, int[] rowStarts, + int[] columnIndices, double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, + double[] objective) { + int numColumns = columnLowerBounds.length; + if (columnUpperBounds.length != numColumns) { + throw new CbcException("Lengths of columnLowerBounds and columnUpperBounds must match"); + } + if (objective.length != numColumns) { + throw new CbcException("Lengths of columnLowerBounds and objective must match"); + } + int numRows = rowLowerBounds.length; + if (rowUpperBounds.length != numRows) { + throw new CbcException("Lengths of rowLowerBounds and rowUpperBounds must match"); + } + } + + private static native int solveIlpProblem(double[] columnLowerBounds, double[] columnUpperBounds, int[] rowStarts, + int[] columnIndices, double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, double[] objective, + double[] output, double timeoutSeconds, boolean silent); +} -- cgit v1.2.3-54-g00ecf From b4bf8d387e430600790f6b30d9e88ec785148cd7 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Mon, 29 Jul 2019 14:21:36 +0200 Subject: Make CbcPolyhedronSolver more robust --- .../cpp/viatracbc.cpp | 54 +++++--- .../cpp/viatracbc.hpp | 2 +- .../lib/libviatracbc.so | Bin 38248 -> 33944 bytes .../bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java | 8 +- .../cardinality/CbcPolyhedronSolver.xtend | 154 +++++++++++++-------- .../cardinality/CbcPolyhedronSolverTest.xtend | 14 +- .../tests/cardinality/PolyhedronSolverTest.xtend | 107 ++++++++++++-- 7 files changed, 240 insertions(+), 99 deletions(-) (limited to 'Solvers/ILP-Solver') diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp index 49994244..ffd35759 100644 --- a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp @@ -36,9 +36,10 @@ static const jint kCbcError = 5; static CoinModel CreateModel(JNIEnv *env, jdoubleArray columnLowerBoundsArray, jdoubleArray columnUpperBoundsArray, jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriedArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, - jdoubleArray objectiveArray); + jdoubleArray objectiveArray, jboolean lpRelaxation); static void CreateModelColumns(JNIEnv *env, jdoubleArray columnLowerBoundsArray, - jdoubleArray columnUpperBoundsArray, jdoubleArray objectiveArray, CoinModel &build); + jdoubleArray columnUpperBoundsArray, jdoubleArray objectiveArray, jboolean lpRelaxation, + CoinModel &build); static void CreateModelRows(JNIEnv *env, jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, CoinModel &build); @@ -83,11 +84,11 @@ jint Java_hu_bme_mit_inf_dslreasoner_ilp_cbc_CbcSolver_solveIlpProblem( JNIEnv *env, jclass klazz, jdoubleArray columnLowerBoundsArray, jdoubleArray columnUpperBoundsArray, jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, jdoubleArray objectiveArray, - jdoubleArray outputArray, jdouble timeoutSeconds, jboolean silent) { + jdoubleArray outputArray, jboolean lpRelaxation, jdouble timeoutSeconds, jboolean silent) { try { auto build = CreateModel(env, columnLowerBoundsArray, columnUpperBoundsArray, rowStartsArray, columnIndicesArray, entriesArray, rowLowerBoundsArray, rowUpperBoundsArray, - objectiveArray); + objectiveArray, lpRelaxation); double value; jint result = SolveModel(build, timeoutSeconds, silent, value); if (result == kCbcSolutionBounded) { @@ -106,16 +107,18 @@ jint Java_hu_bme_mit_inf_dslreasoner_ilp_cbc_CbcSolver_solveIlpProblem( CoinModel CreateModel(JNIEnv *env, jdoubleArray columnLowerBoundsArray, jdoubleArray columnUpperBoundsArray, jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, - jdoubleArray objectiveArray) { + jdoubleArray objectiveArray, jboolean lpRelaxation) { CoinModel build; - CreateModelColumns(env, columnLowerBoundsArray, columnUpperBoundsArray, objectiveArray, build); + CreateModelColumns(env, columnLowerBoundsArray, columnUpperBoundsArray, objectiveArray, + lpRelaxation, build); CreateModelRows(env, rowStartsArray, columnIndicesArray, entriesArray, rowLowerBoundsArray, rowUpperBoundsArray, build); return build; } void CreateModelColumns(JNIEnv *env, jdoubleArray columnLowerBoundsArray, - jdoubleArray columnUpperBoundsArray, jdoubleArray objectiveArray, CoinModel &build) { + jdoubleArray columnUpperBoundsArray, jdoubleArray objectiveArray, jboolean lpRelaxation, + CoinModel &build) { int numColumns = env->GetArrayLength(columnLowerBoundsArray); PinnedDoubleArray columnLowerBounds{env, columnLowerBoundsArray}; PinnedDoubleArray columnUpperBounds{env, columnUpperBoundsArray}; @@ -123,7 +126,9 @@ void CreateModelColumns(JNIEnv *env, jdoubleArray columnLowerBoundsArray, for (int i = 0; i < numColumns; i++) { build.setColumnBounds(i, columnLowerBounds[i], columnUpperBounds[i]); build.setObjective(i, objective[i]); - build.setInteger(i); + if (!lpRelaxation) { + build.setInteger(i); + } } } @@ -215,6 +220,9 @@ jint SolveModel(CoinModel &build, jdouble timeoutSeconds, jboolean silent, jdoub if (model.isInitialSolveProvenPrimalInfeasible()) { return kCbcUnsat; } + if (model.isInitialSolveProvenDualInfeasible()) { + return kCbcSolutionUnbounded; + } if (model.isInitialSolveAbandoned()) { return kCbcTimeout; } @@ -226,20 +234,26 @@ jint SolveModel(CoinModel &build, jdouble timeoutSeconds, jboolean silent, jdoub model.branchAndBound(); - if (model.isProvenInfeasible()) { - return kCbcUnsat; - } - if (model.isProvenDualInfeasible()) { - return kCbcSolutionUnbounded; - } - if (model.isProvenOptimal()) { - value = model.getMinimizationObjValue(); - return kCbcSolutionBounded; - } - if (model.maximumSecondsReached()) { + switch (model.status()) { + case 0: + if (model.isProvenInfeasible()) { + return kCbcUnsat; + } + if (model.isProvenDualInfeasible()) { + return kCbcSolutionUnbounded; + } + if (model.isProvenOptimal()) { + value = model.getMinimizationObjValue(); + return kCbcSolutionBounded; + } + throw std::runtime_error("CBC status is 0, but no solution is found"); + case 1: return kCbcTimeout; + case 2: + return kCbcAbandoned; + default: + throw std::runtime_error("Unknown CBC status"); } - return kCbcAbandoned; } void ThrowException(JNIEnv *env, const char *message) { diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp index c65f71e3..12198c8b 100644 --- a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.hpp @@ -9,7 +9,7 @@ JNIEXPORT jint JNICALL Java_hu_bme_mit_inf_dslreasoner_ilp_cbc_CbcSolver_solveIl JNIEnv *env, jclass klazz, jdoubleArray columnLowerBoundsArray, jdoubleArray columnUpperBoundsArray, jintArray rowStartsArray, jintArray columnIndicesArray, jdoubleArray entriesArray, jdoubleArray rowLowerBoundsArray, jdoubleArray rowUpperBoundsArray, jdoubleArray objectiveArray, - jdoubleArray outputArray, jdouble timeoutSeconds, jboolean silent); + jdoubleArray outputArray, jboolean lpRelaxation, jdouble timeoutSeconds, jboolean silent); } diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so index 21fd2ff2..4eae7de6 100755 Binary files a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so and b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so differ diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java index 39b9d537..085d4448 100644 --- a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/src/hu/bme/mit/inf/dslreasoner/ilp/cbc/CbcSolver.java @@ -15,14 +15,14 @@ public class CbcSolver { } public static CbcResult solve(double[] columnLowerBounds, double[] columnUpperBounds, int[] rowStarts, - int[] columnIndices, double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, - double[] objective, double timeoutSeconds, boolean silent) { + int[] columnIndices, double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, double[] objective, + boolean lpRelaxation, double timeoutSeconds, boolean silent) { loadNatives(); validate(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, entries, rowLowerBounds, rowUpperBounds, objective); double[] output = new double[1]; int result = solveIlpProblem(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, entries, - rowLowerBounds, rowUpperBounds, objective, output, timeoutSeconds, silent); + rowLowerBounds, rowUpperBounds, objective, output, lpRelaxation, timeoutSeconds, silent); if (result == CBC_SOLUTION_BOUNDED) { return new CbcResult.SolutionBounded(output[0]); } else if (result == CBC_SOLUTION_UNBOUNDED) { @@ -67,5 +67,5 @@ public class CbcSolver { private static native int solveIlpProblem(double[] columnLowerBounds, double[] columnUpperBounds, int[] rowStarts, int[] columnIndices, double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, double[] objective, - double[] output, double timeoutSeconds, boolean silent); + double[] output, boolean lpRelaxation, double timeoutSeconds, boolean silent); } diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/CbcPolyhedronSolver.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/CbcPolyhedronSolver.xtend index 7753e68e..4bd46fbf 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/CbcPolyhedronSolver.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/CbcPolyhedronSolver.xtend @@ -1,27 +1,32 @@ package hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality +import com.google.common.collect.ImmutableList import com.google.common.collect.ImmutableMap import hu.bme.mit.inf.dslreasoner.ilp.cbc.CbcResult import hu.bme.mit.inf.dslreasoner.ilp.cbc.CbcSolver +import java.util.HashSet import java.util.List import java.util.Map +import java.util.Set import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor @FinalFieldsConstructor class CbcPolyhedronSolver implements PolyhedronSolver { + val boolean lpRelaxation val double timeoutSeconds val boolean silent new() { - this(10, true) + this(false, -1, true) } override createSaturationOperator(Polyhedron polyhedron) { - new CbcSaturationOperator(polyhedron, timeoutSeconds, silent) + new CbcSaturationOperator(polyhedron, lpRelaxation, timeoutSeconds, silent) } } class CbcSaturationOperator extends AbstractPolyhedronSaturationOperator { + val boolean lpRelaxation val double timeoutSeconds val boolean silent val double[] columnLowerBounds @@ -29,8 +34,9 @@ class CbcSaturationOperator extends AbstractPolyhedronSaturationOperator { val double[] objective val Map dimensionsToIndicesMap - new(Polyhedron polyhedron, double timeoutSeconds, boolean silent) { + new(Polyhedron polyhedron, boolean lpRelaxation, double timeoutSeconds, boolean silent) { super(polyhedron) + this.lpRelaxation = lpRelaxation this.timeoutSeconds = timeoutSeconds this.silent = silent val numDimensions = polyhedron.dimensions.size @@ -56,6 +62,12 @@ class CbcSaturationOperator extends AbstractPolyhedronSaturationOperator { rowStarts.set(numConstraints, numEntries) val columnIndices = newIntArrayOfSize(numEntries) val entries = newDoubleArrayOfSize(numEntries) + val unconstrainedDimensions = new HashSet + for (dimension : polyhedron.dimensions) { + if (dimension.lowerBound === null && dimension.upperBound === null) { + unconstrainedDimensions += dimension + } + } var int index = 0 for (var int i = 0; i < numConstraints; i++) { rowStarts.set(i, index) @@ -69,6 +81,7 @@ class CbcSaturationOperator extends AbstractPolyhedronSaturationOperator { val dimension = polyhedron.dimensions.get(j) val coefficient = constraint.coefficients.get(dimension) if (coefficient !== null && coefficient != 0) { + unconstrainedDimensions -= dimension columnIndices.set(index, j) entries.set(index, coefficient) index++ @@ -79,71 +92,94 @@ class CbcSaturationOperator extends AbstractPolyhedronSaturationOperator { throw new AssertionError("Last entry does not equal the number of entries in the constraint matrix") } for (expressionToSaturate : polyhedron.expressionsToSaturate) { - for (var int j = 0; j < numDimensions; j++) { - objective.set(j, 0) + val result = saturate(expressionToSaturate, rowStarts, columnIndices, entries, rowLowerBounds, + rowUpperBounds, unconstrainedDimensions, constraints) + if (result != PolyhedronSaturationResult.SATURATED) { + return result } - switch (expressionToSaturate) { - Dimension: { - val j = getIndex(expressionToSaturate) - objective.set(j, 1) + } + PolyhedronSaturationResult.SATURATED + } + + protected def saturate(LinearBoundedExpression expressionToSaturate, int[] rowStarts, int[] columnIndices, + double[] entries, double[] rowLowerBounds, double[] rowUpperBounds, Set unconstrainedDimensions, + ImmutableList constraints) { + val numDimensions = objective.size + for (var int j = 0; j < numDimensions; j++) { + objective.set(j, 0) + } + switch (expressionToSaturate) { + Dimension: { + // CBC will return nonsensical results or call free() with invalid arguments if + // it is passed a fully unconstrained (-Inf lower and +Int upper bound, no inequalities) variable + // in the objective function. + if (unconstrainedDimensions.contains(expressionToSaturate)) { + return PolyhedronSaturationResult.SATURATED } - LinearConstraint: { - for (pair : expressionToSaturate.coefficients.entrySet) { - val j = getIndex(pair.key) - objective.set(j, pair.value) + val j = getIndex(expressionToSaturate) + objective.set(j, 1) + } + LinearConstraint: { + for (pair : expressionToSaturate.coefficients.entrySet) { + val dimension = pair.key + // We also have to check for unconstrained dimensions here to avoid crashing. + if (unconstrainedDimensions.contains(dimension)) { + expressionToSaturate.lowerBound = null + expressionToSaturate.upperBound = null + return PolyhedronSaturationResult.SATURATED } + val j = getIndex(dimension) + objective.set(j, pair.value) } - default: - throw new IllegalArgumentException("Unknown expression: " + expressionToSaturate) } - val minimizationResult = CbcSolver.solve(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, - entries, rowLowerBounds, rowUpperBounds, objective, timeoutSeconds, silent) - switch (minimizationResult) { - CbcResult.SolutionBounded: { - val value = Math.floor(minimizationResult.value) - expressionToSaturate.lowerBound = value as int - setBound(expressionToSaturate, constraints, value, columnLowerBounds, rowLowerBounds) - } - case CbcResult.SOLUTION_UNBOUNDED: { - expressionToSaturate.lowerBound = null - setBound(expressionToSaturate, constraints, Double.NEGATIVE_INFINITY, columnLowerBounds, - rowLowerBounds) - } - case CbcResult.UNSAT: - return PolyhedronSaturationResult.EMPTY - case CbcResult.ABANDONED, - case CbcResult.TIMEOUT: - return PolyhedronSaturationResult.UNKNOWN - default: - throw new RuntimeException("Unknown CbcResult: " + minimizationResult) + default: + throw new IllegalArgumentException("Unknown expression: " + expressionToSaturate) + } + val minimizationResult = CbcSolver.solve(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, + entries, rowLowerBounds, rowUpperBounds, objective, lpRelaxation, timeoutSeconds, silent) + switch (minimizationResult) { + CbcResult.SolutionBounded: { + val value = Math.floor(minimizationResult.value) + expressionToSaturate.lowerBound = value as int + setBound(expressionToSaturate, constraints, value, columnLowerBounds, rowLowerBounds) } - for (var int j = 0; j < numDimensions; j++) { - val objectiveCoefficient = objective.get(j) - objective.set(j, -objectiveCoefficient) + case CbcResult.SOLUTION_UNBOUNDED: { + expressionToSaturate.lowerBound = null + setBound(expressionToSaturate, constraints, Double.NEGATIVE_INFINITY, columnLowerBounds, rowLowerBounds) } - val maximizationResult = CbcSolver.solve(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, - entries, rowLowerBounds, rowUpperBounds, objective, timeoutSeconds, silent) - switch (maximizationResult) { - CbcResult.SolutionBounded: { - val value = Math.ceil(-maximizationResult.value) - expressionToSaturate.upperBound = value as int - setBound(expressionToSaturate, constraints, value, columnUpperBounds, rowUpperBounds) - } - case CbcResult.SOLUTION_UNBOUNDED: { - expressionToSaturate.upperBound = null - setBound(expressionToSaturate, constraints, Double.POSITIVE_INFINITY, columnUpperBounds, - rowUpperBounds) - } - case CbcResult.UNSAT: - throw new RuntimeException("Minimization was SAT, but maximization is UNSAT") - case CbcResult.ABANDONED, - case CbcResult.TIMEOUT: - return PolyhedronSaturationResult.UNKNOWN - default: - throw new RuntimeException("Unknown CbcResult: " + maximizationResult) + case CbcResult.UNSAT: + return PolyhedronSaturationResult.EMPTY + case CbcResult.ABANDONED, + case CbcResult.TIMEOUT: + return PolyhedronSaturationResult.UNKNOWN + default: + throw new RuntimeException("Unknown CbcResult: " + minimizationResult) + } + for (var int j = 0; j < numDimensions; j++) { + val objectiveCoefficient = objective.get(j) + objective.set(j, -objectiveCoefficient) + } + val maximizationResult = CbcSolver.solve(columnLowerBounds, columnUpperBounds, rowStarts, columnIndices, + entries, rowLowerBounds, rowUpperBounds, objective, lpRelaxation, timeoutSeconds, silent) + switch (maximizationResult) { + CbcResult.SolutionBounded: { + val value = Math.ceil(-maximizationResult.value) + expressionToSaturate.upperBound = value as int + setBound(expressionToSaturate, constraints, value, columnUpperBounds, rowUpperBounds) } + case CbcResult.SOLUTION_UNBOUNDED: { + expressionToSaturate.upperBound = null + setBound(expressionToSaturate, constraints, Double.POSITIVE_INFINITY, columnUpperBounds, rowUpperBounds) + } + case CbcResult.UNSAT: + throw new RuntimeException("Minimization was SAT, but maximization is UNSAT") + case CbcResult.ABANDONED, + case CbcResult.TIMEOUT: + return PolyhedronSaturationResult.UNKNOWN + default: + throw new RuntimeException("Unknown CbcResult: " + maximizationResult) } - PolyhedronSaturationResult.SATURATED + return PolyhedronSaturationResult.SATURATED } private def toDouble(Integer nullableInt, double defaultValue) { diff --git a/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/CbcPolyhedronSolverTest.xtend b/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/CbcPolyhedronSolverTest.xtend index a51aa082..b22e2a20 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/CbcPolyhedronSolverTest.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/CbcPolyhedronSolverTest.xtend @@ -7,11 +7,19 @@ import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Polyhedr import org.junit.Test import static org.junit.Assert.* +import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearConstraint class CbcPolyhedronSolverTest extends IntegerPolyhedronSolverTest { override protected createSolver() { - new CbcPolyhedronSolver(10, true) + new CbcPolyhedronSolver(false, 10, true) + } +} + +class RelaxedCbcPolyhedronSolverTest extends RelaxedPolyhedronSolverTest { + + override protected createSolver() { + new CbcPolyhedronSolver(true, 10, true) } } @@ -19,9 +27,9 @@ class CbcPolyhedronSolverTimeoutTest { @Test def void timeoutTest() { - val solver = new CbcPolyhedronSolver(0, true) + val solver = new CbcPolyhedronSolver(false, 0, true) val x = new Dimension("x", 0, 1) - val polyhedron = new Polyhedron(#[x], #[], #[x]) + val polyhedron = new Polyhedron(#[x], #[new LinearConstraint(#{x -> 1}, null, 0)], #[x]) val operator = solver.createSaturationOperator(polyhedron) try { val result = operator.saturate diff --git a/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/PolyhedronSolverTest.xtend b/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/PolyhedronSolverTest.xtend index 1b2dcb00..47534618 100644 --- a/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/PolyhedronSolverTest.xtend +++ b/Tests/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.tests/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/tests/cardinality/PolyhedronSolverTest.xtend @@ -80,26 +80,52 @@ abstract class PolyhedronSolverTest { @Test def void singleDimensionUnboundedFromAboveTest() { - val x = new Dimension("x", 0, null) + val x = new Dimension("x", -2, null) createSaturationOperator(new Polyhedron(#[x], #[], #[x])) val result = saturate() assertEquals(PolyhedronSaturationResult.SATURATED, result) - assertEquals(0, x.lowerBound) + assertEquals(-2, x.lowerBound) assertEquals(null, x.upperBound) } @Test def void singleDimensionUnboundedFromBelowTest() { - val x = new Dimension("x", null, 0) + val x = new Dimension("x", null, 2) createSaturationOperator(new Polyhedron(#[x], #[], #[x])) val result = saturate() assertEquals(PolyhedronSaturationResult.SATURATED, result) assertEquals(null, x.lowerBound) - assertEquals(0, x.upperBound) + assertEquals(2, x.upperBound) + } + + @Test + def void singleDimensionUnboundedTest() { + val x = new Dimension("x", null, null) + createSaturationOperator(new Polyhedron(#[x], #[], #[x])) + + val result = saturate() + + assertEquals(PolyhedronSaturationResult.SATURATED, result) + assertEquals(null, x.lowerBound) + assertEquals(null, x.upperBound) + } + + @Test + def void singleDimensionUnboundedObjectiveTest() { + val x = new Dimension("x", null, null) + val y = new Dimension("y", 0, 1) + val objective = new LinearConstraint(#{x -> 1, y -> 1}, null, null) + createSaturationOperator(new Polyhedron(#[x, y], #[], #[objective])) + + val result = saturate() + + assertEquals(PolyhedronSaturationResult.SATURATED, result) + assertEquals(null, objective.lowerBound) + assertEquals(null, objective.upperBound) } @Test @@ -174,6 +200,25 @@ abstract class PolyhedronSolverTest { assertEquals(PolyhedronSaturationResult.EMPTY, result) } + + @Test + def void unboundedRelaxationWithIntegerSolutionTest() { + val x = new Dimension("x", 1, 3) + val y = new Dimension("y", null, null) + createSaturationOperator(new Polyhedron( + #[x, y], + #[new LinearConstraint(#{x -> 2}, 2, 6)], + #[x, y] + )) + + val result = saturate() + + assertEquals(PolyhedronSaturationResult.SATURATED, result) + assertEquals(1, x.lowerBound) + assertEquals(3, x.upperBound) + assertEquals(null, y.lowerBound) + assertEquals(null, y.upperBound) + } protected def createSaturationOperator(Polyhedron polyhedron) { destroyOperatorIfExists() @@ -228,7 +273,7 @@ abstract class IntegerPolyhedronSolverTest extends PolyhedronSolverTest { @Test def void unboundedRelaxationWithNoIntegerSolutionTest() { val x = new Dimension("x", 0, 1) - val y = new Dimension("y", 0, null) + val y = new Dimension("y", null, null) createSaturationOperator(new Polyhedron( #[x, y], #[new LinearConstraint(#{x -> 2}, 1, 1)], @@ -282,21 +327,59 @@ abstract class RelaxedPolyhedronSolverTest extends PolyhedronSolverTest { } @Test - def void unboundedRelaxationWithNoIntegerSolutionTest() { - val x = new Dimension("x", 0, 1) - val y = new Dimension("y", 0, null) + def void unboundedRelaxationWithNoIntegerSolutionUnconstrainedVariableTest() { + val x = new Dimension("x", 1, 2) + val y = new Dimension("y", null, null) createSaturationOperator(new Polyhedron( #[x, y], - #[new LinearConstraint(#{x -> 2}, 1, 1)], + #[new LinearConstraint(#{x -> 2}, 3, 3)], #[x, y] )) val result = saturate() assertEquals(PolyhedronSaturationResult.SATURATED, result) - assertEquals(0, x.lowerBound) - assertEquals(1, x.upperBound) - assertEquals(0, y.lowerBound) + assertEquals(1, x.lowerBound) + assertEquals(2, x.upperBound) + assertEquals(null, y.lowerBound) assertEquals(null, y.upperBound) } + + @Test + def void unboundedRelaxationWithNoIntegerSolutionConstrainedVariableTest() { + val x = new Dimension("x", 1, 2) + val y = new Dimension("y", null, null) + createSaturationOperator(new Polyhedron( + #[x, y], + #[new LinearConstraint(#{x -> 2}, 3, 3), new LinearConstraint(#{y -> 1}, null, 1)], + #[x, y] + )) + + val result = saturate() + + assertEquals(PolyhedronSaturationResult.SATURATED, result) + assertEquals(1, x.lowerBound) + assertEquals(2, x.upperBound) + assertEquals(null, y.lowerBound) + assertEquals(1, y.upperBound) + } + + @Test + def void unboundedRelaxationWithNoIntegerSolutionBoundedVariableTest() { + val x = new Dimension("x", 1, 2) + val y = new Dimension("y", null, 1) + createSaturationOperator(new Polyhedron( + #[x, y], + #[new LinearConstraint(#{x -> 2}, 3, 3)], + #[x, y] + )) + + val result = saturate() + + assertEquals(PolyhedronSaturationResult.SATURATED, result) + assertEquals(1, x.lowerBound) + assertEquals(2, x.upperBound) + assertEquals(null, y.lowerBound) + assertEquals(1, y.upperBound) + } } -- cgit v1.2.3-54-g00ecf From 83f8384f66ddb1d86567c928bdb102174c70cba0 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Mon, 29 Jul 2019 15:36:28 +0200 Subject: Fix CBC timeout --- .../cpp/viatracbc.cpp | 4 +++- .../lib/libviatracbc.so | Bin 33944 -> 33944 bytes .../cardinality/PolyhedronScopePropagator.xtend | 2 +- .../reasoner/ViatraReasonerConfiguration.xtend | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) (limited to 'Solvers/ILP-Solver') diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp index ffd35759..34cab1dd 100644 --- a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/viatracbc.cpp @@ -154,7 +154,9 @@ jint SolveModel(CoinModel &build, jdouble timeoutSeconds, jboolean silent, jdoub solver.loadFromCoinModel(build); CbcModel model{solver}; - model.setDblParam(CbcModel::CbcMaximumSeconds, timeoutSeconds); + if (timeoutSeconds >= 0) { + model.setDblParam(CbcModel::CbcMaximumSeconds, timeoutSeconds); + } if (silent == JNI_FALSE) { model.messageHandler()->setLogLevel(2); model.solver()->messageHandler()->setLogLevel(1); diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so index 4eae7de6..96289216 100755 Binary files a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so and b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/lib/libviatracbc.so differ diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend index 3fd50071..a3977653 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/src/hu/bme/mit/inf/dslreasoner/viatrasolver/logic2viatra/cardinality/PolyhedronScopePropagator.xtend @@ -63,6 +63,7 @@ class PolyhedronScopePropagator extends ScopePropagator { populatePolyhedronFromScope() // println(polyhedron) val result = operator.saturate() +// println(polyhedron) if (result == PolyhedronSaturationResult.EMPTY) { throw new IllegalStateException("Scope bounds cannot be satisfied") } else { @@ -71,7 +72,6 @@ class PolyhedronScopePropagator extends ScopePropagator { super.propagateAllScopeConstraints() } } -// println(polyhedron) } def resetBounds() { diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend index 3c9ef74c..7a3a2d67 100644 --- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend +++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner/src/hu/bme/mit/inf/dslreasoner/viatrasolver/reasoner/ViatraReasonerConfiguration.xtend @@ -51,7 +51,7 @@ class ViatraReasonerConfiguration extends LogicSolverConfiguration { */ public var SearchSpaceConstraint searchSpaceConstraints = new SearchSpaceConstraint - public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.PolyhedralRelations + public var ScopePropagatorStrategy scopePropagatorStrategy = ScopePropagatorStrategy.PolyhedralTypeHierarchy public var List costObjectives = newArrayList } -- cgit v1.2.3-54-g00ecf From 51f3e80dabc0c500cf9154a25a7d4a1c55760707 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 1 Aug 2019 00:58:50 +0200 Subject: Build Cbc wrapper under Ubuntu 18.04 --- .../ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Solvers/ILP-Solver') diff --git a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt index 5dbcb071..6169ae8f 100644 --- a/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt +++ b/Solvers/ILP-Solver/hu.bme.mit.inf.dslreasoner.ilp.cbc/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.14.5) +cmake_minimum_required(VERSION 3.10.2) project(hu.bme.mit.inf.dslreasoner.ilp.cbc) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 14) find_package(JNI REQUIRED) find_package(PkgConfig REQUIRED) -- cgit v1.2.3-54-g00ecf