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

set clang format off for lp files (#6795)

* adding // clang-format off

* set clang-format off at the beginning of  lp files

* set clang-format off

* remove dead code
This commit is contained in:
Lev Nachmanson 2023-07-03 17:35:16 -07:00 committed by GitHub
parent 47fc0cf75c
commit 5ed2a82893
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 103 additions and 10 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -18,6 +18,7 @@
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,6 +18,7 @@
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,6 +17,7 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "math/lp/lp_utils.h"
#include "util/map.h"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -5,6 +5,7 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "util/vector.h"
#include <string>
@ -16,7 +17,7 @@ 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,6 +9,7 @@ Revision History:
--*/
// clang-format off
#pragma once
#include <string>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -159,7 +159,7 @@ namespace lp {
}
return r;
}
// clang-format on
// clang-format off
int find_beneficial_entering_in_row_tableau_rows_bland_mode(int i, T &a_ent) {
int j = -1;
unsigned bj = this->m_basis[i];

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -10,6 +10,7 @@ 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,6 +6,7 @@
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "math/lp/nla_common.h"

View file

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

View file

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

View file

@ -5,6 +5,7 @@
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,6 +6,7 @@
Nikolaj Bjorner (nbjorner)
--*/
// clang-format off
#pragma once
#include "math/lp/factorization.h"
#include "math/lp/nla_common.h"

View file

@ -74,6 +74,7 @@ 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,6 +13,7 @@ Description:
Refines bounds on powers.
--*/
// clang-format off
#include "math/lp/nla_types.h"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -17,6 +17,7 @@ Revision History:
--*/
// clang-format off
#include <memory>
#include "util/vector.h"
#include <set>
@ -29,7 +30,6 @@ namespace lp {
template std::set<std::pair<unsigned, unsigned>> lp::static_matrix<lp::mpq, lp::mpq>::get_domain();
template std::set<std::pair<unsigned, unsigned>> lp::static_matrix<lp::mpq, lp::numeric_pair<lp::mpq> >::get_domain();
template void static_matrix<mpq, mpq>::add_column_to_vector(mpq const&, unsigned int, mpq*) const;
template void static_matrix<mpq, mpq>::add_columns_at_the_end(unsigned int);
template bool static_matrix<mpq, mpq>::is_correct() const;
template mpq static_matrix<mpq, mpq>::get_balance() const;

View file

@ -6,6 +6,7 @@ Author:
Lev Nachmanson (levnach)
--*/
// clang-format off
#pragma once
#include "util/vector.h"
@ -126,7 +127,6 @@ public:
unsigned lowest_row_in_column(unsigned col);
void add_columns_at_the_end(unsigned delta);
void add_new_element(unsigned i, unsigned j, const T & v);
void add_row() {m_rows.push_back(row_strip<T>());}

View file

@ -17,6 +17,7 @@ Revision History:
--*/
// clang-format off
#pragma once
#include "util/vector.h"
@ -124,11 +125,6 @@ template <typename T, typename X> unsigned static_matrix<T, X>::lowest_row_in_co
return ret;
}
template <typename T, typename X> void static_matrix<T, X>::add_columns_at_the_end(unsigned delta) {
for (unsigned i = 0; i < delta; i++)
add_column();
}
template <typename T, typename X> void static_matrix<T, X>::forget_last_columns(unsigned how_many_to_forget) {
lp_assert(m_columns.size() >= how_many_to_forget);
unsigned j = column_count() - 1;

View file

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

View file

@ -18,6 +18,7 @@ Revision History:
TBD use indexed_uint_set from src/util/uint_set.h,
--*/
// clang-format off
#pragma once
#include "util/vector.h"
#include <ostream>

View file

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

View file

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

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