mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

na

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-03-24 12:45:16 -07:00
parent a4f668eef0
commit a557913307
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/math/polynomial/algebraic_numbers.cpp
View file

@ -1789,7 +1789,7 @@ namespace algebraic_numbers {
tout << "\ncell_a->m_minimal: " << cell_a->m_minimal << "\n";
tout << "b: "; upm().display(tout, cell_b->m_p_sz, cell_b->m_p); tout << "\n"; bqim().display(tout, cell_b->m_interval);
tout << "\ncell_b->m_minimal: " << cell_b->m_minimal << "\n";);
if (cell_a->m_minimal && cell_b->m_minimal) {
// Minimal polynomial special case.
// This branch is only executed when polynomial
@ -1831,7 +1831,6 @@ namespace algebraic_numbers {
m_compare_refine += a_m - target_m;
COMPARE_INTERVAL();
}
if (target_m > m_min_magnitude) {
int num_refinements = target_m - m_min_magnitude;
for (int i = 0; i < num_refinements; i++) {
@ -1868,8 +1867,14 @@ namespace algebraic_numbers {
unsigned V1 = upm().sign_variations_at(seq, a_lower);
unsigned V2 = upm().sign_variations_at(seq, a_upper);
int V = V1 - V2;
TRACE("algebraic", tout << "comparing using sturm\n"; display_interval(tout, a); tout << "\n"; display_interval(tout, b); tout << "\n";
tout << "V: " << V << " V1 " << V1 << " V2 " << V2 << " sign_lower(a): " << sign_lower(cell_a) << ", sign_lower(b): " << sign_lower(cell_b) << "\n";);
TRACE("algebraic", tout << "comparing using sturm\n";
display_interval(tout, a) << "\n";
display_interval(tout, b) << "\n";
tout << "V: " << V << " V1 " << V1 << " V2 " << V2
<< ", sign_lower(a): " << sign_lower(cell_a)
<< ", sign_lower(b): " << sign_lower(cell_b) << "\n";
/*upm().display(tout << "sequence: ", seq);*/
);
if (V == 0)
return sign_zero;
if ((V < 0) == (sign_lower(cell_b) < 0))

3
src/test/algebraic.cpp
View file

@ -614,9 +614,10 @@ static void tst_sturm() {
am.display_interval(std::cout << "c:", c) << "\n";
am.display_root(std::cout << "c:", c) << "\n";
std::cout << "c < a " << am.lt(c, a) << " (expecting 0)\n";
std::cout << "b < a " << am.lt(b, a) << "\n";
std::cout << "c < b " << am.lt(c, b) << "\n";
std::cout << "c < a " << am.lt(c, a) << "\n";
// it should not be the case that b < a == 0, c < b == 0 and c < a == 1.
}