added resize and _increment_capacity

This commit is contained in:
hugogogo
2022-06-09 14:14:13 +02:00
parent b385f6220a
commit 8326f7f283
3 changed files with 348 additions and 135 deletions

View File

@@ -16,6 +16,9 @@ int main() {
/*
TEST(vector::vector (constructor))
{
// title
TITLE(cplusplus.com reference :)
// constructors used in the same order as described above:
std::vector<int> first; // empty vector of ints
std::vector<int> second (4,100); // four ints with value 100
@@ -36,6 +39,9 @@ int main() {
TEST(vector::=operator)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> foo (3,0);
std::vector<int> bar (5,0);
@@ -50,6 +56,9 @@ int main() {
TEST(vector::begin)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector;
for (int i=1; i<=5; i++) myvector.push_back(i);
@@ -63,6 +72,9 @@ int main() {
TEST(vector::end)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector;
for (int i=1; i<=5; i++) myvector.push_back(i);
@@ -76,6 +88,9 @@ int main() {
TEST(vector::rbegin)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector (5); // 5 default-constructed ints
int i=0;
@@ -94,6 +109,9 @@ int main() {
TEST(vector::rend)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector (5); // 5 default-constructed ints
std::vector<int>::reverse_iterator rit = myvector.rbegin();
@@ -112,6 +130,9 @@ int main() {
TEST(vector::size)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myints;
std::cout << "0. size: " << myints.size() << '\n';
@@ -129,6 +150,9 @@ int main() {
TEST(vector::max_size)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector;
// set some content in the vector:
@@ -139,11 +163,15 @@ int main() {
std::cout << "max_size: " << myvector.max_size() << "\n";
}
TESTEND
*/
TEST(vector::resize)
{
std::vector<int> myvector;
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
// set some initial content:
for (int i = 1; i < 10; i++) myvector.push_back(i);
@@ -156,13 +184,94 @@ int main() {
for (unsigned int i = 0; i < myvector.size(); i++)
std::cout << ' ' << myvector[i];
std::cout << '\n';
// title
TITLE(test size and capacity 1 :)
ft::vector<int> vector2;
std::cout << "size: " << vector2.size() << " - capacity: " << vector2.capacity() << "\n\n";
std::cout << "assign(10, 1)\n";
vector2.assign(10, 1);
for (unsigned int i = 0; i < vector2.size(); i++)
std::cout << "[" << i << "]" << vector2[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector2.size() << " - capacity: " << vector2.capacity() << "\n\n";
std::cout << "resize(15)\n";
vector2.resize(15);
for (unsigned int i = 0; i < vector2.size(); i++)
std::cout << "[" << i << "]" << vector2[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector2.size() << " - capacity: " << vector2.capacity() << "\n\n";
std::cout << "resize(10)\n";
vector2.resize(10);
for (unsigned int i = 0; i < vector2.size(); i++)
std::cout << "[" << i << "]" << vector2[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector2.size() << " - capacity: " << vector2.capacity() << "\n\n";
std::cout << "resize(19)\n";
vector2.resize(19);
for (unsigned int i = 0; i < vector2.size(); i++)
std::cout << "[" << i << "]" << vector2[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector2.size() << " - capacity: " << vector2.capacity() << "\n\n";
std::cout << "resize(20)\n";
vector2.resize(20);
for (unsigned int i = 0; i < vector2.size(); i++)
std::cout << "[" << i << "]" << vector2[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector2.size() << " - capacity: " << vector2.capacity() << "\n\n";
std::cout << "resize(21)\n";
vector2.resize(21);
for (unsigned int i = 0; i < vector2.size(); i++)
std::cout << "[" << i << "]" << vector2[i] << " ";
std::cout << "\n";
// title
TITLE(test size and capacity 2 :)
ft::vector<int> vector3;
std::cout << "size: " << vector3.size() << " - capacity: " << vector3.capacity() << "\n\n";
std::cout << "assign(10, 1)\n";
vector3.assign(10, 1);
for (unsigned int i = 0; i < vector3.size(); i++)
std::cout << "[" << i << "]" << vector3[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector3.size() << " - capacity: " << vector3.capacity() << "\n\n";
std::cout << "resize(21)\n";
vector3.resize(21);
for (unsigned int i = 0; i < vector3.size(); i++)
std::cout << "[" << i << "]" << vector3[i] << " ";
std::cout << "\n";
std::cout << "\nsize: " << vector3.size() << " - capacity: " << vector3.capacity() << "\n\n";
}
TESTEND
TEST(vector::capacity)
{
std::vector<int> myvector;
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
// set some content in the vector:
for (int i=0; i<100; i++) myvector.push_back(i);
@@ -176,8 +285,11 @@ int main() {
TEST(vector::empty)
{
std::vector<int> myvector;
int sum (0);
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
int sum (0);
for (int i=1;i<=10;i++) myvector.push_back(i);
@@ -194,9 +306,12 @@ int main() {
TEST(vector::reserve)
{
std::vector<int>::size_type sz;
// title
TITLE(cplusplus.com reference :)
ft::vector<int>::size_type sz;
ft::vector<int> foo;
std::vector<int> foo;
sz = foo.capacity();
std::cout << "making foo grow:\n";
for (int i=0; i<100; ++i) {
@@ -207,7 +322,8 @@ int main() {
}
}
std::vector<int> bar;
ft::vector<int> bar;
sz = bar.capacity();
bar.reserve(100); // this is the only difference with foo above
std::cout << "making bar grow:\n";
@@ -224,9 +340,11 @@ int main() {
TEST(vector::operator[])
{
std::vector<int> myvector (10); // 10 zero-initialized elements
// title
TITLE(cplusplus.com reference :)
std::vector<int>::size_type sz = myvector.size();
ft::vector<int> myvector (10); // 10 zero-initialized elements
ft::vector<int>::size_type sz = myvector.size();
// assign some values:
for (unsigned i=0; i<sz; i++) myvector[i]=i;
@@ -250,7 +368,10 @@ int main() {
TEST(vector::at)
{
std::vector<int> myvector (10); // 10 zero-initialized ints
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector (10); // 10 zero-initialized ints
// assign some values:
for (unsigned i=0; i<myvector.size(); i++)
@@ -266,7 +387,10 @@ int main() {
TEST(vector::front)
{
std::vector<int> myvector;
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
myvector.push_back(78);
myvector.push_back(16);
@@ -282,7 +406,10 @@ int main() {
TEST(vector::back)
{
std::vector<int> myvector;
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
myvector.push_back(78);
myvector.push_back(16);
@@ -290,11 +417,35 @@ int main() {
// now front equals 78, and back 16
myvector.front() -= myvector.back();
std::cout << "myvector.front() is now " << myvector.front() << '\n';
// title
TITLE(test with negatives :)
myvector.push_back(236);
myvector.push_back(8973);
myvector.front() -= myvector.back();
std::cout << "myvector.front() is now " << myvector.front() << '\n';
// title
TITLE(test with char :)
ft::vector<char> letters;
letters.push_back('o');
letters.push_back('m');
letters.push_back('g');
letters.push_back('w');
letters.push_back('t');
letters.push_back('f');
if (!letters.empty()) {
std::cout << "The first character is '" << letters.front() << "'.\n";
}
}
TESTEND
*/
TEST(vector::assign)
{
@@ -387,9 +538,11 @@ int main() {
TEST(vector::push_back)
{
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
// first test
int myint[] = {12434, -2432, 12, 5345, 23, 0, -4, 387, 8432, -934723, 1};
int size = sizeof(myint) / sizeof(myint[0]);
for (int i = 0; i < size; i++)
@@ -403,7 +556,10 @@ int main() {
std::cout << "[" << std::setw(2) << i << "] " << myvector[i] << "\n";
std::cout << " -> size : " << myvector.size() << " , capacity :" << myvector.capacity() << "\n";
// second test
// title
TITLE(big push back :)
for (int i = 0; i < 72363; i++)
{
myvector.push_back(9);
@@ -414,11 +570,15 @@ int main() {
}
TESTEND
/*
TEST(vector::pop_back)
{
std::vector<int> myvector;
// title
TITLE(cplusplus.com reference :)
ft::vector<int> myvector;
int sum (0);
myvector.push_back (100);
myvector.push_back (200);
myvector.push_back (300);
@@ -430,11 +590,23 @@ int main() {
}
std::cout << "The elements of myvector add up to " << sum << '\n';
// title
TITLE(check state :)
std::cout << "size : " << myvector.size() << '\n';
std::cout << "capacity : " << myvector.capacity() << '\n';
}
TESTEND
/*
TEST(vector::insert)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector (3,100);
std::vector<int>::iterator it;
@@ -461,6 +633,9 @@ int main() {
TEST(vector::erase)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector;
// set some values (from 1 to 10)
@@ -481,6 +656,9 @@ int main() {
TEST(vector::swap)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> foo (3,100); // three ints with a value of 100
std::vector<int> bar (5,200); // five ints with a value of 200
@@ -500,6 +678,9 @@ int main() {
TEST(vector::clear)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector;
myvector.push_back (100);
myvector.push_back (200);
@@ -523,6 +704,9 @@ int main() {
TEST(vector::get_allocator)
{
// title
TITLE(cplusplus.com reference :)
std::vector<int> myvector;
int * p;
unsigned int i;