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

fingers over xor_gaussian.h

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2022-11-10 12:47:50 -08:00
parent bf39b2b103
commit 130432370f
1 changed files with 39 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/sat/smt/xor_gaussian.h
View file

@ -145,7 +145,7 @@ namespace xr {
bool m_rhs = false; bool m_rhs = false;
bool_var_vector m_clash_vars; bool_var_vector m_clash_vars;
bool m_detached = false; bool m_detached = false;
bool_var_vector m_vars; bool_var_vector m_vars; // inherit from bool_var_vector?
xor_clause() = default; xor_clause() = default;
xor_clause(const xor_clause& c) = default; xor_clause(const xor_clause& c) = default;
@ -155,24 +155,21 @@ namespace xr {
xor_clause& operator=(const xor_clause& c) = default; xor_clause& operator=(const xor_clause& c) = default;
explicit xor_clause(const unsigned_vector& cl, const bool _rhs, const bool_var_vector& _clash_vars) : m_rhs(_rhs), m_clash_vars(_clash_vars) { explicit xor_clause(const unsigned_vector& cl, bool _rhs, bool_var_vector const& _clash_vars) : m_rhs(_rhs), m_clash_vars(_clash_vars) {
for (unsigned i = 0; i < cl.size(); i++) { for (auto v : cl)
m_vars.push_back(cl[i]); m_vars.push_back(v);
}
} }
template<typename T> template<typename T>
explicit xor_clause(const T& cl, const bool _rhs, const bool_var_vector& _clash_vars) : m_rhs(_rhs), m_clash_vars(_clash_vars) { explicit xor_clause(const T& cl, bool _rhs, bool_var_vector const& _clash_vars) : m_rhs(_rhs), m_clash_vars(_clash_vars) {
for (unsigned i = 0; i < cl.size(); i++) { for (auto const& l : cl)
m_vars.push_back(cl[i].var()); m_vars.push_back(l.var());
}
} }
explicit xor_clause(const bool_var_vector& cl, const bool _rhs, const unsigned clash_var) : m_rhs(_rhs) { explicit xor_clause(const bool_var_vector& cl, const bool _rhs, unsigned clash_var) : m_rhs(_rhs) {
m_clash_vars.push_back(clash_var); m_clash_vars.push_back(clash_var);
for (unsigned i = 0; i < cl.size(); i++) { for (auto v : cl)
m_vars.push_back(cl[i]); m_vars.push_back(v);
}
} }
unsigned_vector::const_iterator begin() const { unsigned_vector::const_iterator begin() const {
@ -192,16 +189,13 @@ namespace xr {
} }
bool operator<(const xor_clause& other) const { bool operator<(const xor_clause& other) const {
unsigned i = 0; for (unsigned i = 0; i < other.size() && i < size(); ++i)
while(i < other.size() && i < size()) {
if (other[i] != m_vars[i]) if (other[i] != m_vars[i])
return m_vars[i] < other[i]; return m_vars[i] < other[i];
i++;
}
if (other.size() != size()) { if (other.size() != size())
return size() < other.size(); return size() < other.size();
}
return false; return false;
} }
@ -240,9 +234,8 @@ namespace xr {
// add all elements in other.m_clash_vars that are not yet in m_clash_vars: // add all elements in other.m_clash_vars that are not yet in m_clash_vars:
void merge_clash(const xor_clause& other, visit_helper& visited) { void merge_clash(const xor_clause& other, visit_helper& visited) {
visited.init_visited(m_clash_vars.size()); visited.init_visited(m_clash_vars.size());
for (const bool_var& v: m_clash_vars) { for (const bool_var& v: m_clash_vars)
visited.mark_visited(v); visited.mark_visited(v);
}
for (const auto& v: other.m_clash_vars) { for (const auto& v: other.m_clash_vars) {
if (!visited.is_visited(v)) { if (!visited.is_visited(v)) {
@ -263,9 +256,8 @@ namespace xr {
os << " = " << std::boolalpha << thisXor.m_rhs << std::noboolalpha; os << " = " << std::boolalpha << thisXor.m_rhs << std::noboolalpha;
os << " -- clash: "; os << " -- clash: ";
for (const auto& c: thisXor.m_clash_vars) { for (const auto& c: thisXor.m_clash_vars)
os << c + 1 << ", "; os << c + 1 << ", ";
}
return os; return os;
} }
@ -289,29 +281,27 @@ namespace xr {
PackedRow() = delete; PackedRow() = delete;
// NSB review: why not mp[i] = b.mp[i]?
PackedRow& operator=(const PackedRow& b) { PackedRow& operator=(const PackedRow& b) {
//start from -1, because that's wher RHS is //start from -1, because that's where RHS is
for (int i = -1; i < size; i++) { for (int i = -1; i < size; i++)
*(mp + i) = *(b.mp + i); *(mp + i) = *(b.mp + i);
}
return *this; return *this;
} }
PackedRow& operator^=(const PackedRow& b) { PackedRow& operator^=(const PackedRow& b) {
//start from -1, because that's wher RHS is //start from -1, because that's where RHS is
for (int i = -1; i < size; i++) { for (int i = -1; i < size; i++)
*(mp + i) ^= *(b.mp + i); *(mp + i) ^= *(b.mp + i);
}
return *this; return *this;
} }
void set_and(const PackedRow& a, const PackedRow& b) { void set_and(const PackedRow& a, const PackedRow& b) {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++)
*(mp + i) = *(a.mp + i) & *(b.mp + i); *(mp + i) = *(a.mp + i) & *(b.mp + i);
} }
}
unsigned set_and_until_popcnt_atleast2(const PackedRow& a, const PackedRow& b) { unsigned set_and_until_popcnt_atleast2(const PackedRow& a, const PackedRow& b) {
unsigned pop = 0; unsigned pop = 0;
@ -325,10 +315,9 @@ namespace xr {
void xor_in(const PackedRow& b) { void xor_in(const PackedRow& b) {
rhs_internal ^= b.rhs_internal; rhs_internal ^= b.rhs_internal;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++)
*(mp + i) ^= *(b.mp + i); *(mp + i) ^= *(b.mp + i);
} }
}
inline const int64_t& rhs() const { inline const int64_t& rhs() const {
return rhs_internal; return rhs_internal;
@ -339,9 +328,8 @@ namespace xr {
} }
inline bool isZero() const { inline bool isZero() const {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++)
if (mp[i]) return false; if (mp[i]) return false;
}
return true; return true;
} }
@ -429,17 +417,17 @@ namespace xr {
unsigned popcnt() const { unsigned popcnt() const {
unsigned ret = 0; unsigned ret = 0;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++)
ret += get_num_1bits((uint64_t)mp[i]); ret += get_num_1bits((uint64_t)mp[i]);
}
return ret; return ret;
} }
}; };
class PackedMatrix { class PackedMatrix {
public: public:
PackedMatrix() : mp(nullptr), numRows(0), numCols(0) { } PackedMatrix() { }
// NSB: rewview - are special memory allocations required?
~PackedMatrix() { ~PackedMatrix() {
#ifdef _WIN32 #ifdef _WIN32
_aligned_free((void*)mp); _aligned_free((void*)mp);
@ -547,9 +535,9 @@ namespace xr {
private: private:
int64_t *mp; int64_t* mp = nullptr;
int numRows; int numRows = 0;
int numCols; int numCols = 0;
}; };
class EGaussian { class EGaussian {
@ -690,9 +678,8 @@ namespace xr {
return 0; return 0;
unsigned pop = 0; unsigned pop = 0;
for (const auto& row: mat) { for (const auto& row: mat)
pop += row.popcnt(); pop += row.popcnt();
}
return (double)pop/(double)(num_rows*num_cols); return (double)pop/(double)(num_rows*num_cols);
} }