3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-22 13:53:39 +00:00

try to fix build

This commit is contained in:
Jakob Rath 2022-09-21 13:48:49 +02:00
parent b43971bb4a
commit 2f65ce1026
5 changed files with 8 additions and 7 deletions

View file

@ -51,7 +51,8 @@ def init_project_def():
add_lib('mbp', ['model', 'simplex'], 'qe/mbp') add_lib('mbp', ['model', 'simplex'], 'qe/mbp')
add_lib('qe_lite', ['tactic', 'mbp'], 'qe/lite') add_lib('qe_lite', ['tactic', 'mbp'], 'qe/lite')
add_lib('bigfix',['util'], 'math/bigfix') add_lib('bigfix',['util'], 'math/bigfix')
add_lib('polysat', ['bigfix','util','dd','simplex','interval'],'math/polysat') add_lib('polysat_univariate_solver', ['util', 'solver'], 'math/polysat/univariate')
add_lib('polysat', ['bigfix','util','dd','simplex','interval','polysat_univariate_solver'], 'math/polysat')
add_lib('solver_assertions', ['pattern','smt_params','cmd_context','qe_lite'], 'solver/assertions') add_lib('solver_assertions', ['pattern','smt_params','cmd_context','qe_lite'], 'solver/assertions')
add_lib('sat_smt', ['sat', 'euf', 'tactic', 'solver', 'smt_params', 'bit_blaster', 'fpa', 'mbp', 'normal_forms', 'lp', 'pattern', 'qe_lite', 'polysat'], 'sat/smt') add_lib('sat_smt', ['sat', 'euf', 'tactic', 'solver', 'smt_params', 'bit_blaster', 'fpa', 'mbp', 'normal_forms', 'lp', 'pattern', 'qe_lite', 'polysat'], 'sat/smt')
add_lib('sat_tactic', ['tactic', 'sat', 'solver', 'sat_smt'], 'sat/tactic') add_lib('sat_tactic', ['tactic', 'sat', 'solver', 'sat_smt'], 'sat/tactic')

View file

@ -41,8 +41,6 @@ add_subdirectory(math/hilbert)
add_subdirectory(math/simplex) add_subdirectory(math/simplex)
add_subdirectory(math/interval) add_subdirectory(math/interval)
add_subdirectory(math/bigfix) add_subdirectory(math/bigfix)
add_subdirectory(math/polysat)
add_subdirectory(math/polysat/univariate)
add_subdirectory(math/automata) add_subdirectory(math/automata)
add_subdirectory(math/realclosure) add_subdirectory(math/realclosure)
add_subdirectory(math/subpaving) add_subdirectory(math/subpaving)
@ -65,6 +63,8 @@ add_subdirectory(math/subpaving/tactic)
add_subdirectory(tactic/aig) add_subdirectory(tactic/aig)
add_subdirectory(tactic/arith) add_subdirectory(tactic/arith)
add_subdirectory(solver) add_subdirectory(solver)
add_subdirectory(math/polysat/univariate)
add_subdirectory(math/polysat)
add_subdirectory(cmd_context) add_subdirectory(cmd_context)
add_subdirectory(cmd_context/extra_cmds) add_subdirectory(cmd_context/extra_cmds)
add_subdirectory(parsers/smt2) add_subdirectory(parsers/smt2)

View file

@ -30,6 +30,7 @@ z3_add_component(polysat
simplex simplex
interval interval
bigfix bigfix
polysat_univariate_solver
PYG_FILES PYG_FILES
polysat_params.pyg polysat_params.pyg
) )

View file

@ -1,4 +1,7 @@
z3_add_component(polysat_univariate_solver z3_add_component(polysat_univariate_solver
SOURCES SOURCES
univariate_solver.cpp univariate_solver.cpp
COMPONENT_DEPENDENCIES
util
solver
) )

View file

@ -17,8 +17,6 @@ Author:
--*/ --*/
#include "math/polysat/univariate/univariate_solver.h" #include "math/polysat/univariate/univariate_solver.h"
#include "math/polysat/log.h"
#include "sat/sat_solver/inc_sat_solver.h"
#include "solver/solver.h" #include "solver/solver.h"
#include "util/util.h" #include "util/util.h"
#include "ast/ast.h" #include "ast/ast.h"
@ -55,9 +53,7 @@ namespace polysat {
~univariate_bitblast_solver() override = default; ~univariate_bitblast_solver() override = default;
void push() override { void push() override {
// LOG("univariate push...");
s->push(); s->push();
// LOG("univariate push done");
} }
void pop(unsigned n) override { void pop(unsigned n) override {