summaryrefslogtreecommitdiff
path: root/libs/ezsat/ezsat.cc
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2013-11-25 15:10:32 +0100
committerClifford Wolf <clifford@clifford.at>2013-11-25 15:10:32 +0100
commit11e811858913cb2d03249d0a7239da10f4af5a7c (patch)
tree2dd3d2c4f4c675b2b9617443f2377d2e85025668 /libs/ezsat/ezsat.cc
parent8c3f4b395712419f786b2d2bb013d94b7c09986a (diff)
Added ezsat vec_const() api
Diffstat (limited to 'libs/ezsat/ezsat.cc')
-rw-r--r--libs/ezsat/ezsat.cc32
1 files changed, 20 insertions, 12 deletions
diff --git a/libs/ezsat/ezsat.cc b/libs/ezsat/ezsat.cc
index 27e74e01..dccc0055 100644
--- a/libs/ezsat/ezsat.cc
+++ b/libs/ezsat/ezsat.cc
@@ -651,34 +651,42 @@ bool ezSAT::solver(const std::vector<int> &modelExpressions, std::vector<bool> &
return false;
}
-std::vector<int> ezSAT::vec_const_signed(int64_t value, int bits)
+std::vector<int> ezSAT::vec_const(const std::vector<bool> &bits)
{
std::vector<int> vec;
- for (int i = 0; i < bits; i++)
+ for (auto bit : bits)
+ vec.push_back(bit ? TRUE : FALSE);
+ return vec;
+}
+
+std::vector<int> ezSAT::vec_const_signed(int64_t value, int numBits)
+{
+ std::vector<int> vec;
+ for (int i = 0; i < numBits; i++)
vec.push_back(((value >> i) & 1) != 0 ? TRUE : FALSE);
return vec;
}
-std::vector<int> ezSAT::vec_const_unsigned(uint64_t value, int bits)
+std::vector<int> ezSAT::vec_const_unsigned(uint64_t value, int numBits)
{
std::vector<int> vec;
- for (int i = 0; i < bits; i++)
+ for (int i = 0; i < numBits; i++)
vec.push_back(((value >> i) & 1) != 0 ? TRUE : FALSE);
return vec;
}
-std::vector<int> ezSAT::vec_var(int bits)
+std::vector<int> ezSAT::vec_var(int numBits)
{
std::vector<int> vec;
- for (int i = 0; i < bits; i++)
+ for (int i = 0; i < numBits; i++)
vec.push_back(literal());
return vec;
}
-std::vector<int> ezSAT::vec_var(std::string name, int bits)
+std::vector<int> ezSAT::vec_var(std::string name, int numBits)
{
std::vector<int> vec;
- for (int i = 0; i < bits; i++)
+ for (int i = 0; i < numBits; i++)
vec.push_back(VAR(name + "[" + std::to_string(i) + "]"));
return vec;
}
@@ -782,21 +790,21 @@ static void halfadder(ezSAT *that, int a, int b, int &y, int &x)
x = new_x, y = new_y;
}
-std::vector<int> ezSAT::vec_count(const std::vector<int> &vec, int bits, bool clip)
+std::vector<int> ezSAT::vec_count(const std::vector<int> &vec, int numBits, bool clip)
{
- std::vector<int> sum = vec_const_unsigned(0, bits);
+ std::vector<int> sum = vec_const_unsigned(0, numBits);
std::vector<int> carry_vector;
for (auto bit : vec) {
int carry = bit;
- for (int i = 0; i < bits; i++)
+ for (int i = 0; i < numBits; i++)
halfadder(this, carry, sum[i], carry, sum[i]);
carry_vector.push_back(carry);
}
if (clip) {
int overflow = vec_reduce_or(carry_vector);
- sum = vec_ite(overflow, vec_const_unsigned(~0, bits), sum);
+ sum = vec_ite(overflow, vec_const_unsigned(~0, numBits), sum);
}
#if 0