From: Gereon Kremer Date: Tue, 6 Jul 2021 23:01:13 +0000 (+0200) Subject: Integrate Lazard into CAD module (#6812) X-Git-Tag: cvc5-1.0.0~1521 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=468ba87a10e3f3fadf7c48a0b3923ecc489616ad;p=cvc5.git Integrate Lazard into CAD module (#6812) This PR adds two new command line options that govern how the CAD module does projection and lifting, allowing to use the new Lazard evaluation. By default, we use McCallum with regular lifting which does not require CoCoA. Additionally, this PR adds a bunch of unit tests for the CAD module. --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3246df654..811f1c5ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1207,6 +1207,9 @@ endif() if(USE_POLY) target_link_libraries(cvc5 PRIVATE Polyxx) endif() +if(USE_COCOA) + target_link_libraries(cvc5 PRIVATE CoCoA) +endif() target_link_libraries(cvc5 PRIVATE SymFPU) diff --git a/src/options/arith_options.toml b/src/options/arith_options.toml index 472657274..43614fd60 100644 --- a/src/options/arith_options.toml +++ b/src/options/arith_options.toml @@ -511,8 +511,8 @@ name = "Arithmetic Theory" long = "nl-rlv=MODE" type = "NlRlvMode" default = "NONE" - help = "choose mode for using relevance of assertoins in non-linear arithmetic" - help_mode = "Modes for using relevance of assertoins in non-linear arithmetic." + help = "choose mode for using relevance of assertions in non-linear arithmetic" + help_mode = "Modes for using relevance of assertions in non-linear arithmetic." [[option.mode.NONE]] name = "none" help = "Do not use relevance." @@ -547,6 +547,39 @@ name = "Arithmetic Theory" default = "false" help = "whether to use the linear model as initial guess for the cylindrical algebraic decomposition solver" +[[option]] + name = "nlCadProjection" + category = "expert" + long = "nl-cad-proj=MODE" + type = "NlCadProjectionMode" + default = "MCCALLUM" + help = "choose the CAD projection operator" + help_mode = "Modes for the CAD projection operator in non-linear arithmetic." +[[option.mode.MCCALLUM]] + name = "mccallum" + help = "McCallum's projection operator." +[[option.mode.LAZARD]] + name = "lazard" + help = "Lazard's projection operator." +[[option.mode.LAZARDMOD]] + name = "lazard-mod" + help = "A modification of Lazard's projection operator." + +[[option]] + name = "nlCadLifting" + category = "expert" + long = "nl-cad-lift=MODE" + type = "NlCadLiftingMode" + default = "REGULAR" + help = "choose the CAD lifting mode" + help_mode = "Modes for the CAD lifting in non-linear arithmetic." +[[option.mode.REGULAR]] + name = "regular" + help = "Regular lifting." +[[option.mode.LAZARD]] + name = "lazard" + help = "Lazard's lifting scheme." + [[option]] name = "nlICP" category = "regular" diff --git a/src/theory/arith/nl/cad/cdcac.cpp b/src/theory/arith/nl/cad/cdcac.cpp index 0bd0095bb..57010d1a1 100644 --- a/src/theory/arith/nl/cad/cdcac.cpp +++ b/src/theory/arith/nl/cad/cdcac.cpp @@ -102,6 +102,16 @@ const std::vector& CDCAC::getVariableOrdering() const std::vector CDCAC::getUnsatIntervals(std::size_t cur_variable) { std::vector res; + LazardEvaluation le; + if (options::nlCadLifting() == options::NlCadLiftingMode::LAZARD) + { + for (size_t vid = 0; vid < cur_variable; ++vid) + { + const auto& val = d_assignment.get(d_variableOrdering[vid]); + le.add(d_variableOrdering[vid], val); + } + le.addFreeVariable(d_variableOrdering[cur_variable]); + } for (const auto& c : d_constraints.getConstraints()) { const poly::Polynomial& p = std::get<0>(c); @@ -116,7 +126,21 @@ std::vector CDCAC::getUnsatIntervals(std::size_t cur_variable) Trace("cdcac") << "Infeasible intervals for " << p << " " << sc << " 0 over " << d_assignment << std::endl; - auto intervals = infeasible_regions(p, d_assignment, sc); + std::vector intervals; + if (options::nlCadLifting() == options::NlCadLiftingMode::LAZARD) + { + intervals = le.infeasibleRegions(p, sc); + if (Trace.isOn("cdcac")) + { + auto reference = poly::infeasible_regions(p, d_assignment, sc); + Trace("cdcac") << "Lazard: " << intervals << std::endl; + Trace("cdcac") << "Regular: " << reference << std::endl; + } + } + else + { + intervals = poly::infeasible_regions(p, d_assignment, sc); + } for (const auto& i : intervals) { Trace("cdcac") << "-> " << i << std::endl; @@ -281,7 +305,19 @@ PolyVector CDCAC::requiredCoefficients(const poly::Polynomial& p) << requiredCoefficientsOriginal(p, d_assignment) << std::endl; } - return requiredCoefficientsOriginal(p, d_assignment); + switch (options::nlCadProjection()) + { + case options::NlCadProjectionMode::MCCALLUM: + return requiredCoefficientsOriginal(p, d_assignment); + case options::NlCadProjectionMode::LAZARD: + return requiredCoefficientsLazard(p, d_assignment); + case options::NlCadProjectionMode::LAZARDMOD: + return requiredCoefficientsLazardModified( + p, d_assignment, d_constraints.varMapper()); + default: + Assert(false); + return requiredCoefficientsOriginal(p, d_assignment); + } } PolyVector CDCAC::constructCharacterization(std::vector& intervals) diff --git a/src/theory/arith/nl/cad/projections.cpp b/src/theory/arith/nl/cad/projections.cpp index 6d86b8104..896d8da89 100644 --- a/src/theory/arith/nl/cad/projections.cpp +++ b/src/theory/arith/nl/cad/projections.cpp @@ -77,7 +77,7 @@ void PolyVector::pushDownPolys(PolyVector& down, poly::Variable var) erase(it, end()); } -PolyVector projection_mccallum(const std::vector& polys) +PolyVector projectionMcCallum(const std::vector& polys) { PolyVector res; diff --git a/test/unit/theory/CMakeLists.txt b/test/unit/theory/CMakeLists.txt index 12663838d..2af747fd5 100644 --- a/test/unit/theory/CMakeLists.txt +++ b/test/unit/theory/CMakeLists.txt @@ -22,6 +22,7 @@ cvc5_add_unit_test_white(sequences_rewriter_white theory) cvc5_add_unit_test_white(strings_rewriter_white theory) cvc5_add_unit_test_white(theory_arith_pow2_white theory) cvc5_add_unit_test_white(theory_arith_white theory) +cvc5_add_unit_test_white(theory_arith_cad_white theory) cvc5_add_unit_test_white(theory_bags_normal_form_white theory) cvc5_add_unit_test_white(theory_bags_rewriter_white theory) cvc5_add_unit_test_white(theory_bags_type_rules_white theory) diff --git a/test/unit/theory/theory_arith_cad_white.cpp b/test/unit/theory/theory_arith_cad_white.cpp new file mode 100644 index 000000000..d7580a9cd --- /dev/null +++ b/test/unit/theory/theory_arith_cad_white.cpp @@ -0,0 +1,404 @@ +/****************************************************************************** + * Top contributors (to current version): + * Gereon Kremer + * + * This file is part of the cvc5 project. + * + * Copyright (c) 2009-2021 by the authors listed in the file AUTHORS + * in the top-level source directory and their institutional affiliations. + * All rights reserved. See the file COPYING in the top-level source + * directory for licensing information. + * **************************************************************************** + * + * Unit tests for the CAD module for nonlinear arithmetic. + */ + +#ifdef CVC5_USE_POLY + +#include + +#include +#include +#include + +#include "test_smt.h" +#include "theory/arith/nl/cad/cdcac.h" +#include "theory/arith/nl/cad/lazard_evaluation.h" +#include "theory/arith/nl/cad/projections.h" +#include "theory/arith/nl/cad_solver.h" +#include "theory/arith/nl/nl_lemma_utils.h" +#include "theory/arith/nl/poly_conversion.h" +#include "theory/arith/theory_arith.h" +#include "theory/quantifiers/extended_rewrite.h" +#include "theory/theory.h" +#include "theory/theory_engine.h" +#include "util/poly_util.h" + +namespace cvc5::test { + +using namespace cvc5; +using namespace cvc5::theory; +using namespace cvc5::theory::arith; +using namespace cvc5::theory::arith::nl; + +NodeManager* nodeManager; +class TestTheoryWhiteArithCAD : public TestSmt +{ + protected: + void SetUp() override + { + TestSmt::SetUp(); + d_realType.reset(new TypeNode(d_nodeManager->realType())); + d_intType.reset(new TypeNode(d_nodeManager->integerType())); + Trace.on("cad-check"); + nodeManager = d_nodeManager.get(); + } + + Node dummy(int i) const { return d_nodeManager->mkConst(Rational(i)); } + + Theory::Effort d_level = Theory::EFFORT_FULL; + std::unique_ptr d_realType; + std::unique_ptr d_intType; + const Rational d_zero = 0; + const Rational d_one = 1; +}; + +poly::AlgebraicNumber get_ran(std::initializer_list init, + int lower, + int upper) +{ + return poly::AlgebraicNumber(poly::UPolynomial(init), + poly::DyadicInterval(lower, upper)); +} + +Node operator==(const Node& a, const Node& b) +{ + return nodeManager->mkNode(Kind::EQUAL, a, b); +} +Node operator>=(const Node& a, const Node& b) +{ + return nodeManager->mkNode(Kind::GEQ, a, b); +} +Node operator+(const Node& a, const Node& b) +{ + return nodeManager->mkNode(Kind::PLUS, a, b); +} +Node operator*(const Node& a, const Node& b) +{ + return nodeManager->mkNode(Kind::NONLINEAR_MULT, a, b); +} +Node operator!(const Node& a) { return nodeManager->mkNode(Kind::NOT, a); } +Node make_real_variable(const std::string& s) +{ + return nodeManager->mkSkolem( + s, nodeManager->realType(), "", NodeManager::SKOLEM_EXACT_NAME); +} +Node make_int_variable(const std::string& s) +{ + return nodeManager->mkSkolem( + s, nodeManager->integerType(), "", NodeManager::SKOLEM_EXACT_NAME); +} + +TEST_F(TestTheoryWhiteArithCAD, test_univariate_isolation) +{ + poly::UPolynomial poly({-2, 2, 3, -3, -1, 1}); + auto roots = poly::isolate_real_roots(poly); + + EXPECT_TRUE(roots.size() == 4); + EXPECT_TRUE(roots[0] == get_ran({-2, 0, 1}, -2, -1)); + EXPECT_TRUE(roots[1] == poly::Integer(-1)); + EXPECT_TRUE(roots[2] == poly::Integer(1)); + EXPECT_TRUE(roots[3] == get_ran({-2, 0, 1}, 1, 2)); +} + +TEST_F(TestTheoryWhiteArithCAD, test_multivariate_isolation) +{ + poly::Variable x("x"); + poly::Variable y("y"); + poly::Variable z("z"); + + poly::Assignment a; + a.set(x, get_ran({-2, 0, 1}, 1, 2)); + a.set(y, get_ran({-2, 0, 0, 0, 1}, 1, 2)); + + poly::Polynomial poly = (y * y + x) - z; + + auto roots = poly::isolate_real_roots(poly, a); + + EXPECT_TRUE(roots.size() == 1); + EXPECT_TRUE(roots[0] == get_ran({-8, 0, 1}, 2, 3)); +} + +TEST_F(TestTheoryWhiteArithCAD, test_univariate_factorization) +{ + poly::UPolynomial poly({-24, 44, -18, -1, 1, -3, 1}); + + auto factors = square_free_factors(poly); + std::sort(factors.begin(), factors.end()); + EXPECT_EQ(factors[0], poly::UPolynomial({-1, 1})); + EXPECT_EQ(factors[1], poly::UPolynomial({-24, -4, -2, -1, 1})); +} + +TEST_F(TestTheoryWhiteArithCAD, test_projection) +{ + // Gereon's thesis, Ex 5.1 + poly::Variable x("x"); + poly::Variable y("y"); + + poly::Polynomial p = (y + 1) * (y + 1) - x * x * x + 3 * x - 2; + poly::Polynomial q = (x + 1) * y - 3; + + auto res = cad::projectionMcCallum({p, q}); + std::sort(res.begin(), res.end()); + EXPECT_EQ(res[0], x - 1); + EXPECT_EQ(res[1], x + 1); + EXPECT_EQ(res[2], x + 2); + EXPECT_EQ(res[3], x * x * x - 3 * x + 1); + EXPECT_EQ(res[4], + x * x * x * x * x + 2 * x * x * x * x - 2 * x * x * x - 5 * x * x + - 7 * x - 14); +} + +poly::Polynomial up_to_poly(const poly::UPolynomial& p, poly::Variable var) +{ + poly::Polynomial res; + poly::Polynomial mult = 1; + for (const auto& coeff : coefficients(p)) + { + if (!is_zero(coeff)) + { + res += mult * coeff; + } + mult *= var; + } + return res; +} + +TEST_F(TestTheoryWhiteArithCAD, lazard_simp) +{ + Node a = d_nodeManager->mkVar(*d_realType); + Node c = d_nodeManager->mkVar(*d_realType); + Node orig = d_nodeManager->mkAnd(std::vector{ + d_nodeManager->mkNode(Kind::EQUAL, a, d_nodeManager->mkConst(d_zero)), + d_nodeManager->mkNode( + Kind::EQUAL, + d_nodeManager->mkNode( + Kind::PLUS, + d_nodeManager->mkNode(Kind::NONLINEAR_MULT, a, c), + d_nodeManager->mkConst(d_one)), + d_nodeManager->mkConst(d_zero))}); + + { + Node rewritten = Rewriter::rewrite(orig); + EXPECT_NE(rewritten, d_nodeManager->mkConst(false)); + } + { + quantifiers::ExtendedRewriter extrew; + Node rewritten = extrew.extendedRewrite(orig); + EXPECT_EQ(rewritten, d_nodeManager->mkConst(false)); + } +} + +#ifdef CVC5_USE_COCOA +TEST_F(TestTheoryWhiteArithCAD, lazard_eval) +{ + poly::Variable x("x"); + poly::Variable y("y"); + poly::Variable z("z"); + poly::Variable f("f"); + poly::AlgebraicNumber ax = get_ran({-2, 0, 1}, 1, 2); + poly::AlgebraicNumber ay = get_ran({-2, 0, 0, 0, 1}, 1, 2); + poly::AlgebraicNumber az = get_ran({-3, 0, 1}, 1, 2); + + cad::LazardEvaluation lazard; + lazard.add(x, ax); + lazard.add(y, ay); + lazard.add(z, az); + + poly::Polynomial q = (x * x - 2) * (y * y * y * y - 2) * z * f; + lazard.addFreeVariable(f); + auto qred = lazard.reducePolynomial(q); + EXPECT_EQ(qred, std::vector{f}); +} +#endif + +TEST_F(TestTheoryWhiteArithCAD, test_cdcac_1) +{ + cad::CDCAC cac(nullptr, nullptr, {}); + poly::Variable x = cac.getConstraints().varMapper()(make_real_variable("x")); + poly::Variable y = cac.getConstraints().varMapper()(make_real_variable("y")); + + cac.getConstraints().addConstraint( + 4 * y - x * x + 4, poly::SignCondition::LT, dummy(1)); + cac.getConstraints().addConstraint( + 4 * y - 4 + (x - 1) * (x - 1), poly::SignCondition::GT, dummy(2)); + cac.getConstraints().addConstraint( + 4 * y - x - 2, poly::SignCondition::GT, dummy(3)); + + cac.computeVariableOrdering(); + + auto cover = cac.getUnsatCover(); + EXPECT_TRUE(cover.empty()); + std::cout << "SAT: " << cac.getModel() << std::endl; +} + +TEST_F(TestTheoryWhiteArithCAD, test_cdcac_2) +{ + cad::CDCAC cac(nullptr, nullptr, {}); + poly::Variable x = cac.getConstraints().varMapper()(make_real_variable("x")); + poly::Variable y = cac.getConstraints().varMapper()(make_real_variable("y")); + + cac.getConstraints().addConstraint(y - pow(-x - 3, 11) + pow(-x - 3, 10) + 1, + poly::SignCondition::GT, + dummy(1)); + cac.getConstraints().addConstraint( + 2 * y - x + 2, poly::SignCondition::LT, dummy(2)); + cac.getConstraints().addConstraint( + 2 * y - 1 + x * x, poly::SignCondition::GT, dummy(3)); + cac.getConstraints().addConstraint( + 3 * y + x + 2, poly::SignCondition::LT, dummy(4)); + cac.getConstraints().addConstraint( + y * y * y - pow(x - 2, 11) + pow(x - 2, 10) + 1, + poly::SignCondition::GT, + dummy(5)); + + cac.computeVariableOrdering(); + + auto cover = cac.getUnsatCover(); + EXPECT_TRUE(!cover.empty()); + auto nodes = cad::collectConstraints(cover); + std::vector ref{dummy(1), dummy(2), dummy(3), dummy(4), dummy(5)}; + EXPECT_EQ(nodes, ref); +} + +TEST_F(TestTheoryWhiteArithCAD, test_cdcac_3) +{ + cad::CDCAC cac(nullptr, nullptr, {}); + poly::Variable x = cac.getConstraints().varMapper()(make_real_variable("x")); + poly::Variable y = cac.getConstraints().varMapper()(make_real_variable("y")); + poly::Variable z = cac.getConstraints().varMapper()(make_real_variable("z")); + + cac.getConstraints().addConstraint( + x * x + y * y + z * z - 1, poly::SignCondition::LT, dummy(1)); + cac.getConstraints().addConstraint( + 4 * x * x + (2 * y - 3) * (2 * y - 3) + 4 * z * z - 4, + poly::SignCondition::LT, + dummy(2)); + + cac.computeVariableOrdering(); + + auto cover = cac.getUnsatCover(); + EXPECT_TRUE(cover.empty()); + std::cout << "SAT: " << cac.getModel() << std::endl; +} + +TEST_F(TestTheoryWhiteArithCAD, test_cdcac_4) +{ + cad::CDCAC cac(nullptr, nullptr, {}); + poly::Variable x = cac.getConstraints().varMapper()(make_real_variable("x")); + poly::Variable y = cac.getConstraints().varMapper()(make_real_variable("y")); + poly::Variable z = cac.getConstraints().varMapper()(make_real_variable("z")); + + cac.getConstraints().addConstraint( + -z * z + y * y + x * x - 25, poly::SignCondition::GT, dummy(1)); + cac.getConstraints().addConstraint( + (y - x - 6) * z * z - 9 * y * y + x * x - 1, + poly::SignCondition::GT, + dummy(2)); + cac.getConstraints().addConstraint( + y * y - 100, poly::SignCondition::LT, dummy(3)); + + cac.computeVariableOrdering(); + + auto cover = cac.getUnsatCover(); + EXPECT_TRUE(cover.empty()); + std::cout << "SAT: " << cac.getModel() << std::endl; +} + +void test_delta(const std::vector& a) +{ + cad::CDCAC cac(nullptr, nullptr, {}); + cac.reset(); + for (const Node& n : a) + { + cac.getConstraints().addConstraint(n); + } + cac.computeVariableOrdering(); + + // Do full theory check here + + auto covering = cac.getUnsatCover(); + if (covering.empty()) + { + std::cout << "SAT: " << cac.getModel() << std::endl; + } + else + { + auto mis = cad::collectConstraints(covering); + std::cout << "Collected MIS: " << mis << std::endl; + Assert(!mis.empty()) << "Infeasible subset can not be empty"; + Node lem = NodeManager::currentNM()->mkAnd(mis).negate(); + Notice() << "UNSAT with MIS: " << lem << std::endl; + } +} + +TEST_F(TestTheoryWhiteArithCAD, test_delta_one) +{ + std::vector a; + Node zero = d_nodeManager->mkConst(Rational(0)); + Node one = d_nodeManager->mkConst(Rational(1)); + Node mone = d_nodeManager->mkConst(Rational(-1)); + Node fifth = d_nodeManager->mkConst(Rational(1, 2)); + Node g = make_real_variable("g"); + Node l = make_real_variable("l"); + Node q = make_real_variable("q"); + Node s = make_real_variable("s"); + Node u = make_real_variable("u"); + + a.emplace_back(l == mone); + a.emplace_back(!(g * s == zero)); + a.emplace_back(q * s == zero); + a.emplace_back(u == zero); + a.emplace_back(q == (one + (fifth * g * s))); + a.emplace_back(l == u + q * s + (fifth * g * s * s)); + + test_delta(a); +} + +TEST_F(TestTheoryWhiteArithCAD, test_delta_two) +{ + std::vector a; + Node zero = d_nodeManager->mkConst(Rational(0)); + Node one = d_nodeManager->mkConst(Rational(1)); + Node mone = d_nodeManager->mkConst(Rational(-1)); + Node fifth = d_nodeManager->mkConst(Rational(1, 2)); + Node g = make_real_variable("g"); + Node l = make_real_variable("l"); + Node q = make_real_variable("q"); + Node s = make_real_variable("s"); + Node u = make_real_variable("u"); + + a.emplace_back(l == mone); + a.emplace_back(!(g * s == zero)); + a.emplace_back(u == zero); + a.emplace_back(q * s == zero); + a.emplace_back(q == (one + (fifth * g * s))); + a.emplace_back(l == u + q * s + (fifth * g * s * s)); + + test_delta(a); +} + +TEST_F(TestTheoryWhiteArithCAD, test_ran_conversion) +{ + RealAlgebraicNumber ran( + std::vector({-2, 0, 1}), Rational(1, 3), Rational(7, 3)); + { + Node x = make_real_variable("x"); + Node n = nl::ran_to_node(ran, x); + RealAlgebraicNumber back = nl::node_to_ran(n, x); + EXPECT_TRUE(ran == back); + } +} +} // namespace cvc5::test + +#endif