diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml index ad654bda8..43df42b60 100644 --- a/scripts/nightly.yaml +++ b/scripts/nightly.yaml @@ -166,9 +166,7 @@ stages: displayName: 'NuGet Pack Symbols' inputs: command: custom - arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x64.nuspec -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' - packDestination: $(Build.ArtifactStagingDirectory) - verbosityPack: detailed + arguments: 'pack $(Agent.TempDirectory)\package\out\Microsoft.Z3.x64.nuspec -OutputDirectory $(Build.ArtifactStagingDirectory) -Verbosity detailed -SymbolPackageFormat snupkg -BasePath $(Agent.TempDirectory)\package\out' - job: Python displayName: "Python packaging" diff --git a/src/math/lp/nla_core.cpp b/src/math/lp/nla_core.cpp index 529972cf7..9e790d7f7 100644 --- a/src/math/lp/nla_core.cpp +++ b/src/math/lp/nla_core.cpp @@ -1478,16 +1478,15 @@ lbool core::check(vector& l_vec) { if (l_vec.empty() && !done() && need_run_horner()) m_horner.horner_lemmas(); - if (l_vec.empty() && !done() && need_run_grobner()) { + if (l_vec.empty() && !done() && need_run_grobner()) run_grobner(); - } if (l_vec.empty() && !done()) m_basics.basic_lemma(true); if (l_vec.empty() && !done()) m_basics.basic_lemma(false); - + if (l_vec.empty() && !done()) m_order.order_lemma(); diff --git a/src/math/lp/nla_order_lemmas.cpp b/src/math/lp/nla_order_lemmas.cpp index 8862891d4..a7910601f 100644 --- a/src/math/lp/nla_order_lemmas.cpp +++ b/src/math/lp/nla_order_lemmas.cpp @@ -66,7 +66,8 @@ void order::order_lemma_on_binomial(const monic& ac) { order_lemma_on_binomial_sign(ac, ac.vars()[k], ac.vars()[!k], gt? 1: -1); order_lemma_on_factor_binomial_explore(ac, k); k = !k; - } while (k); + } + while (k); } @@ -101,9 +102,8 @@ void order::order_lemma_on_factor_binomial_explore(const monic& ac, bool k) { continue; TRACE("nla_solver", tout << "bd = " << pp_mon_with_vars(_(), bd);); order_lemma_on_factor_binomial_rm(ac, k, bd); - if (done()) { + if (done()) break; - } } }