dm1sh/QRCodeLibrary
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added ceil_div function tests, resizing and annotated errors for BitArray

Browse Source
This commit is contained in:
Dmitriy Shishkov 2021-12-11 23:19:04 +03:00
parent 304185d1a2
commit f9e5717913
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
QRCodeLibrary/BitArray.cpp
View File

@ -6,6 +6,8 @@
bool BitArray::get(unsigned index) const
{
if (index >= size) throw std::out_of_range("No such element in array");
return (v[index / 8] >> (8 - 1 - index % 8)) & 1;
}
@ -21,6 +23,8 @@ BitArray::operator std::string() const
void BitArray::set(unsigned index, bool val)
{
if (index >= size) throw std::out_of_range("No such element in array");
if (val)
v[index / 8] |= 1 << (8 - 1 - index % 8);
else
@ -29,8 +33,12 @@ void BitArray::set(unsigned index, bool val)
unsigned BitArray::set(unsigned index, int32_t val, unsigned size)
{
if (index >= this->size) throw std::out_of_range("No such element in array");
unsigned shift = index % 8, written = 0;
size = std::min(size, this->size - index);
if (size > this->size - index) throw std::out_of_range("Number of bits to write from this index is more than BitArray capability");
index /= 8;
while (written < size) {
@ -48,3 +56,10 @@ unsigned BitArray::set(unsigned index, int32_t val, unsigned size)
return written;
}
void BitArray::resize(unsigned new_size)
{
v.resize(ceil_div(new_size, 8));
size = new_size;
}

2
QRCodeLibrary/BitArray.hpp
View File

@ -22,5 +22,7 @@ public:
bool get(unsigned index) const;
void set(unsigned index, bool val);
unsigned set(unsigned index, int32_t val, unsigned size);
void resize(unsigned new_size);
};

6
tests/BitArray_test.cpp
View File

@ -5,6 +5,12 @@
#include "../QRCodeLibrary/BitArray.hpp"
TEST(CeilDivTests, DividesCeilingResult) {
EXPECT_EQ(ceil_div(1, 3), 1);
EXPECT_EQ(ceil_div(4, 2), 2);
EXPECT_EQ(ceil_div(5, 2), 3);
}
class BitArrayTests: public ::testing::Test {
public:
BitArrayTests() : ::testing::Test(), a1(15) {};