3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-08 10:25:18 +00:00

remove the line with clang-format off

This commit is contained in:
Lev Nachmanson 2023-07-10 12:05:59 -07:00
parent 56b5492752
commit e091a2e775
107 changed files with 11 additions and 126 deletions

View file

@ -19,7 +19,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -18,7 +18,6 @@ Revision History:
--*/
// clang-format off
#include <string>
#include "math/lp/static_matrix.h"
namespace lp {

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include "math/lp/numeric_pair.h"
#include "math/lp/core_solver_pretty_printer_def.h"
template lp::core_solver_pretty_printer<lp::mpq, lp::mpq>::core_solver_pretty_printer(const lp::lp_core_solver_base<lp::mpq, lp::mpq> &, std::ostream & out);

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <limits>
#include <string>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <limits>

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#pragma once
#include <functional>
#include "math/lp/nex.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lp_settings.h"

View file

@ -18,7 +18,6 @@
replaced rooted_mons.h and rooted_mon, rooted_mon_tabled
--*/
// clang-format off
#include "math/lp/emonics.h"
#include "math/lp/nla_defs.h"

View file

@ -18,7 +18,6 @@
to replace rooted_mons.h and rooted_mon, rooted_mon_tabled
--*/
// clang-format off
#pragma once
#include "math/lp/lp_utils.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lp_utils.h"
#include "util/map.h"

View file

@ -18,7 +18,6 @@
--*/
// clang-format off
#pragma once
#include "util/rational.h"
#include "math/lp/monic.h"

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#include "math/lp/factorization_factory_imp.h"
#include "math/lp/nla_core.h"
namespace nla {

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#pragma once
#include "math/lp/factorization.h"
namespace nla {

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <functional>
namespace lp {

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#include "math/lp/gomory.h"
#include "math/lp/int_solver.h"
#include "math/lp/lar_solver.h"

View file

@ -15,7 +15,6 @@ Author:
Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lar_term.h"
#include "math/lp/lia_move.h"

View file

@ -26,7 +26,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/numeric_pair.h"
#include "util/ext_gcd.h"

View file

@ -9,7 +9,6 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#include "math/lp/int_solver.h"
#include "math/lp/lar_solver.h"
#include "math/lp/hnf_cutter.h"

View file

@ -14,7 +14,6 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "math/lp/lar_term.h"

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#include "math/lp/horner.h"
#include "math/lp/nla_core.h"

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#pragma once
#include "math/lp/nla_common.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lp_settings.h"
#include "math/lp/lar_constraints.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
namespace lp {

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include "util/vector.h"
#include "math/lp/indexed_vector_def.h"
namespace lp {

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -15,7 +15,6 @@
Revision History:
--*/
// clang-format off
#include "math/lp/int_solver.h"
#include "math/lp/lar_solver.h"
#include "math/lp/int_branch.h"

View file

@ -15,7 +15,6 @@ Author:
Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lar_solver.h"

View file

@ -15,7 +15,6 @@ Author:
Revision History:
--*/
// clang-format off
#include "math/lp/int_solver.h"
#include "math/lp/lar_solver.h"

View file

@ -19,7 +19,6 @@ Author:
Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lia_move.h"

View file

@ -45,7 +45,6 @@ Accumulative:
--*/
// clang-format off
#include "math/lp/int_solver.h"
#include "math/lp/lar_solver.h"

View file

@ -24,7 +24,6 @@ Author:
Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lia_move.h"

View file

@ -2,7 +2,6 @@
Copyright (c) 2017 Microsoft Corporation
Author: Lev Nachmanson
*/
// clang-format off
#include "math/lp/int_solver.h"
#include "math/lp/lar_solver.h"
#include "math/lp/lp_utils.h"
@ -138,8 +137,7 @@ namespace lp {
try_patch_column(v, c.var(), delta_plus);
}
}
// clang-format off
bool int_solver::patcher::try_patch_column(unsigned v, unsigned j, mpq const& delta) {
const auto & A = lra.A_r();
if (delta < 0) {

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lp_settings.h"
#include "math/lp/static_matrix.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <utility>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include <utility>
#include <memory>
#include <string>

View file

@ -5,7 +5,6 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "util/vector.h"
#include <string>
@ -17,7 +16,6 @@ Author:
#include "math/lp/stacked_vector.h"
#include "util/stacked_value.h"
namespace lp {
// clang-format off
class lar_core_solver {
vector<std::pair<mpq, unsigned>> m_infeasible_linear_combination;
int m_infeasible_sum_sign; // todo: get rid of this field

View file

@ -9,7 +9,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <string>

View file

@ -2,7 +2,6 @@
Copyright (c) 2017 Microsoft Corporation
Author: Nikolaj Bjorner, Lev Nachmanson
*/
// clang-format off
#include "math/lp/lar_solver.h"
#include "smt/params/smt_params_helper.hpp"
@ -696,7 +695,6 @@ namespace lp {
}
}
void lar_solver::detect_rows_with_changed_bounds_for_column(unsigned j) {
if (m_mpq_lar_core_solver.m_r_heading[j] >= 0)
insert_row_with_changed_bounds(m_mpq_lar_core_solver.m_r_heading[j]);
else
@ -1753,8 +1751,7 @@ namespace lp {
}
// clang-format off
void lar_solver::update_column_type_and_bound_check_on_equal(unsigned j,
lconstraint_kind kind,
const mpq& right_side,
const mpq& right_side,
constraint_index constr_index,
unsigned& equal_to_j) {
update_column_type_and_bound(j, kind, right_side, constr_index);
@ -1897,8 +1894,7 @@ namespace lp {
}
// clang-format off
void lar_solver::update_bound_with_no_ub_lb(var_index j, lconstraint_kind kind, const mpq& right_side, constraint_index ci) {
lp_assert(column_has_lower_bound(j) && !column_has_upper_bound(j));
lp_assert(m_mpq_lar_core_solver.m_column_types[j] == column_type::lower_bound);
lp_assert(m_mpq_lar_core_solver.m_column_types[j] == column_type::lower_bound);
mpq y_of_bound(0);
switch (kind) {
@ -1946,8 +1942,7 @@ namespace lp {
}
// clang-format off
void lar_solver::update_bound_with_ub_no_lb(var_index j, lconstraint_kind kind, const mpq& right_side, constraint_index ci) {
lp_assert(!column_has_lower_bound(j) && column_has_upper_bound(j));
lp_assert(m_mpq_lar_core_solver.m_column_types[j] == column_type::upper_bound);
lp_assert(m_mpq_lar_core_solver.m_column_types[j] == column_type::upper_bound);
mpq y_of_bound(0);
switch (kind) {
case LT:
@ -2033,8 +2028,7 @@ namespace lp {
}
// clang-format off
bool lar_solver::column_corresponds_to_term(unsigned j) const {
return tv::is_term(m_var_register.local_to_external(j));
}
}
var_index lar_solver::to_column(unsigned ext_j) const {
return m_var_register.external_to_local(ext_j);

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#pragma once
#include <algorithm>
#include <functional>

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#pragma once
#include "math/lp/indexed_vector.h"
#include "util/map.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
namespace lp {
enum class lia_move {

View file

@ -7,7 +7,6 @@ Author:
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "util/inf_rational.h"

View file

@ -4,7 +4,6 @@
Nikolaj Bjorner (nbjorner)
Lev Nachmanson (levnach)
*/
//clang-format off
#pragma once
#include <utility>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include <utility>
#include <memory>
#include <string>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <set>
#include "util/vector.h"
@ -291,8 +290,8 @@ public:
X bound_span(unsigned j) const {
return m_upper_bounds[j] - m_lower_bounds[j];
}
std::string column_name(unsigned column) const;
// clang-format on
std::string column_name(unsigned column) const;
bool make_column_feasible(unsigned j, numeric_pair<mpq> & delta) {
bool ret = false;
@ -303,7 +302,7 @@ public:
lp_assert(m_lower_bounds[j] == m_upper_bounds[j]);
if (x != m_lower_bounds[j]) {
delta = m_lower_bounds[j] - x;
ret = true;;
ret = true;
}
break;
case column_type::boxed:

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <set>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include <utility>
#include <memory>
#include <string>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/core_solver_pretty_printer.h"
#include "math/lp/lp_core_solver_base.h"
@ -159,8 +158,7 @@ namespace lp {
}
return r;
}
// clang-format off
int find_beneficial_entering_in_row_tableau_rows_bland_mode(int i, T &a_ent) {
int find_beneficial_entering_in_row_tableau_rows_bland_mode(int i, T &a_ent) {
int j = -1;
unsigned bj = this->m_basis[i];
bool bj_needs_to_grow = needs_to_grow(bj);
@ -183,8 +181,7 @@ namespace lp {
m_inf_row_index_for_tableau = i;
return j;
}
//clang-format off
int find_beneficial_entering_tableau_rows(int i, T &a_ent) {
int find_beneficial_entering_tableau_rows(int i, T &a_ent) {
if (m_bland_mode_tableau)
return find_beneficial_entering_in_row_tableau_rows_bland_mode(i, a_ent);
// a short row produces short infeasibility explanation and benefits at

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <list>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
// this is a part of lp_primal_core_solver that deals with the tableau

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include <memory>
#include "util/vector.h"
#include "smt/params/smt_params_helper.hpp"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <cmath>

View file

@ -17,11 +17,9 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <sstream>
// clang-format off
#include <limits.h>
#include "util/debug.h"
namespace nla {

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <string>
#include "math/lp/numeric_pair.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include "math/lp/lp_settings.h"
#include "math/lp/matrix_def.h"
#include "math/lp/static_matrix.h"

View file

@ -6,7 +6,6 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "math/lp/numeric_pair.h"
#include "util/vector.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <cmath>

View file

@ -6,7 +6,6 @@
Lev Nachmanson (levnach)
--*/
// clang-format off
#include "math/lp/monomial_bounds.h"
#include "math/lp/nla_core.h"

View file

@ -6,7 +6,6 @@
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "math/lp/nla_common.h"

View file

@ -4,7 +4,6 @@
Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include <initializer_list>

View file

@ -4,7 +4,6 @@
Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#include "util/lbool.h"
#include "math/lp/nex_creator.h"
#include <map>

View file

@ -5,7 +5,6 @@
Lev Nachmanson (levnach)
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include <map>
#include <set>

View file

@ -6,7 +6,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "math/lp/nla_basics_lemmas.h"
#include "math/lp/nla_core.h"

View file

@ -6,7 +6,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "math/lp/monic.h"
#include "math/lp/factorization.h"

View file

@ -6,7 +6,6 @@
Lev Nachmanson (levnach)
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "math/lp/nla_common.h"
#include "math/lp/nla_core.h"

View file

@ -6,7 +6,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "util/rational.h"
#include "math/lp/nla_defs.h"

View file

@ -10,7 +10,6 @@ Author:
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "util/uint_set.h"
#include "math/lp/nla_core.h"
#include "math/lp/factorization_factory_imp.h"

View file

@ -10,7 +10,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "math/lp/factorization.h"
#include "math/lp/lp_types.h"

View file

@ -8,7 +8,6 @@
--*/
// clang-format off
#pragma once
#include "math/lp/lp_types.h"
#include "math/lp/column_info.h"

View file

@ -14,7 +14,6 @@ Description:
Check divisions
--*/
// clang-format off
#include "math/lp/nla_core.h"
namespace nla {

View file

@ -13,7 +13,6 @@ Description:
Check division constraints.
--*/
// clang-format off
#include "math/lp/nla_types.h"

View file

@ -10,7 +10,6 @@ Author:
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "util/uint_set.h"
#include "math/lp/nla_core.h"
#include "math/lp/factorization_factory_imp.h"

View file

@ -6,7 +6,6 @@
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "math/lp/nla_common.h"

View file

@ -6,7 +6,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "util/dependency.h"
#include "util/region.h"

View file

@ -5,7 +5,6 @@
Lev Nachmanson (levnach)
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "math/lp/nla_basics_lemmas.h"
#include "math/lp/nla_core.h"
namespace nla {

View file

@ -5,7 +5,6 @@
Lev Nachmanson (levnach)
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
namespace nla {
class core;

View file

@ -5,7 +5,6 @@
Nikolaj Bjorner (nbjorner)
Lev Nachmanson (levnach)
--*/
// clang-format off
#include "math/lp/nla_order_lemmas.h"
#include "math/lp/nla_core.h"

View file

@ -6,7 +6,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "math/lp/factorization.h"
#include "math/lp/nla_common.h"

View file

@ -74,7 +74,6 @@ am().set(yval, am_value(y));
am().set(rval, am_value(r));
--*/
// clang-format off
#include "math/lp/nla_core.h"
namespace nla {

View file

@ -13,7 +13,6 @@ Description:
Refines bounds on powers.
--*/
// clang-format off
#include "math/lp/nla_types.h"

View file

@ -6,7 +6,6 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
namespace nla {

View file

@ -5,7 +5,6 @@
Lev Nachmanson (levnach)
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "math/lp/nla_solver.h"
#include <map>
#include "math/lp/monic.h"

View file

@ -6,7 +6,6 @@ Author:
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "util/vector.h"
#include "math/lp/lp_settings.h"

View file

@ -6,7 +6,6 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#include "math/lp/nla_tangent_lemmas.h"
#include "math/lp/nla_core.h"

View file

@ -5,7 +5,6 @@
Lev Nachmanson (levnach)
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "util/rational.h"
#include "math/lp/factorization.h"

View file

@ -13,7 +13,6 @@ Description:
Types used for nla solver.
--*/
// clang-format off
#pragma once

View file

@ -17,7 +17,6 @@
--*/
// clang-format off
#pragma once
#define lp_for_z3
#include <string>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include <memory>
#include "util/vector.h"
#include "math/lp/permutation_matrix_def.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"
#include <algorithm>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -17,6 +17,5 @@ Revision History:
--*/
// clang-format off
#include "math/lp/random_updater_def.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <set>

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/random_updater.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"

View file

@ -17,7 +17,6 @@ Revision History:
--*/
// clang-format off
#include <memory>
#include "util/vector.h"
#include <set>

View file

@ -6,7 +6,6 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "util/vector.h"

Some files were not shown because too many files have changed in this diff Show more