Lev
|
a82316a172
|
rebase with z3prover
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
3cf0eae5e1
|
work on vars_equivalence
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
4c4f70f4bb
|
work on vars_equivalence
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
d301a9c403
|
rebase with z3prover
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
4ca0ca3ce8
|
basic case proportionality
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
5344dedf42
|
going over the binary factor for basic lemmas
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
318b505a2e
|
comments are added in nla_solver
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
96aaa8638e
|
rename niil to nla
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
56ae577c97
|
rename the files
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
103808094a
|
clear the model in lar_solver::get_model()
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
c09c944922
|
rebase with upstream
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
11d37d97a1
|
branch of an int inf base if the row is not a gomory target
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
0be5fc5693
|
revert to a previous state: avoid adding branches for free vars when creating a gomory cut
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev
|
822b0c1d5c
|
in get_modele do not return values for terms
Signed-off-by: Lev <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
2b18627fa1
|
fix assertions (#83)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
d913a55dfb
|
reset m_explanation (#82)
* reset m_explanation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* streamline handling of m_explanation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
9b5996fcd5
|
clear lemma in int_solver before the first push_back
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
064cf9e983
|
allow gomory cut for a row with free non-basic vars
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
de4a2b3ea7
|
compiles and runs, need to restore niil_solver.cpp later
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
0d9aff9834
|
added bounds (#81)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
420895f303
|
in the middle on niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
0644194fc9
|
work on lemma from product to factors, and some renaming
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
18714ce020
|
improve printing
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
08c9953a36
|
implement the case of small factor in basic proportional
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
ee6e21c614
|
work on niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
e3ff457af5
|
work on niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
efee734ec9
|
return one of the conjuncions for basic proportionality case
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
dd0c8e4f6b
|
remove an inifinite loop in basic_proportionality
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
64ecefdf07
|
tinker with bound atom (#80)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
89d086fff0
|
add a case to basic zero scenario
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
029a486884
|
improve printing
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
d935bdb6c4
|
create a lemma for basic proportional case
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
633265cc6a
|
merging Nikolaj's changes
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
e16d8118ac
|
going over niil_solver (#79)
* change conflict to th_axiom
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* going over niil_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
a9a45b7b47
|
change conflict to th_axiom (#78)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
3138c929ee
|
niil_solver basic case progress
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
3fb361c886
|
niil_solver basic case progress
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
1fce8ee0b1
|
niil_solver basic case progress
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
c1b976fbf4
|
niil_solver basic case progress
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
10871ad76e
|
towards basic newtral check
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
08d891891e
|
handle unsorted monomials
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
237db5cb3d
|
niil_solver basic case zero
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
eca5ddaa04
|
base case zero in niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
d8f5ec3b52
|
basic case - zero for niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
95ffc029d4
|
rename var_info to var_lists in niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
93ec6360bd
|
map vars to constraints
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Nikolaj Bjorner
|
88ea90fbb9
|
handle output from niil_solver (#77)
* handle output from niil_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* add proper equality handling
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
49ae42cebd
|
produce the first lemma in niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
0911fc2bda
|
use explanation.h for conflict explanations everywhere
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|
Lev Nachmanson
|
fd0f6bcbf9
|
about to create a lemma in niil_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
|
2020-01-28 10:04:21 -08:00 |
|