diff --git a/vector.c b/vector.c index bfbea79..676188e 100644 --- a/vector.c +++ b/vector.c @@ -25,7 +25,10 @@ void vector_initdata(ivector *v, int *arr, size_t arrsz) { assert(v && arrsz); - // + v->n = arrsz; + v->maxsz = (arrsz > VECTOR_START_SIZE) ? arrsz : VECTOR_START_SIZE; + v->data = xmalloc(ITEMSZ * v->maxsz); + memcpy(v->data, arr, arrsz * ITEMSZ); } void @@ -43,67 +46,94 @@ size_t vector_len(const ivector *v) { assert(v); - - // - return 0; + return v->n; } int * vector_data(const ivector *v) { assert(v); - // - return NULL; + return v->data; } void vector_resize(ivector *v, int n) { assert(v); - - // + if (n <= v->maxsz) { + if (n > v->n) { + memset(v->data + v->n, 0, (n - v->n) * ITEMSZ); + } + v->n = n; + } else { + size_t new_max = v->maxsz; + while (new_max < n) { + new_max *= VECTOR_GROW_FACTOR; + } + v->data = xrealloc(v->data, new_max * ITEMSZ); + if (n > v->n) { + memset(v->data + v->n, 0, (n - v->n) * ITEMSZ); + } + v->n = n; + v->maxsz = new_max; + } } void vector_set(ivector *v, size_t idx, int val) { assert(v && idx < v->n); - // + v->data[idx] = val; } int vector_get(const ivector *v, size_t idx) { assert(v && idx < v->n); - // - return 0; + return v->data[idx]; } void vector_push(ivector *v, int val) { assert(v); - // + if (v->n == v->maxsz) { + vector_resize(v, v->n + 1); + v->data[v->n - 1] = val; + } else { + v->data[v->n++] = val; + } } void vector_pop(ivector *v) { assert(v); - // + if (v->n > 0){ + v->n--; + } } void vector_insert(ivector *v, size_t idx, int val) { assert(v && v->n >= idx); - // + if (v->n == v->maxsz) { + size_t new_max = v->maxsz * VECTOR_GROW_FACTOR; + v->data = xrealloc(v->data, new_max * ITEMSZ); + v->maxsz = new_max; + } + memmove(v->data + idx + 1, v->data + idx, (v->n - idx) * ITEMSZ); + v->data[idx] = val; + v->n++; } void vector_del(ivector *v, size_t idx) { - // + assert(v && idx < v->n); + memmove(v->data + idx, v->data + idx + 1, (v->n - idx - 1) * ITEMSZ); + v->n--; } void diff --git a/vector_test.c b/vector_test.c index e77cff4..ac4bbdd 100644 --- a/vector_test.c +++ b/vector_test.c @@ -162,6 +162,63 @@ test_vector_push_pop(const MunitParameter params[], void * data) return MUNIT_OK; } +static MunitResult +test_vector_insert(const MunitParameter params[], void* data) { + ivector v; + vector_init(&v); + + // Вставка в пустой вектор + vector_insert(&v, 0, 1); + munit_assert_size(vector_len(&v), ==, 1); + munit_assert_int(vector_get(&v, 0), ==, 1); + + // Вставка в начало + vector_insert(&v, 0, 2); + munit_assert_size(vector_len(&v), ==, 2); + munit_assert_int(vector_get(&v, 0), ==, 2); + munit_assert_int(vector_get(&v, 1), ==, 1); + + // Вставка в конец + vector_insert(&v, 2, 3); + munit_assert_size(vector_len(&v), ==, 3); + munit_assert_int(vector_get(&v, 2), ==, 3); + + // Вставка в середину + vector_insert(&v, 1, 4); + munit_assert_size(vector_len(&v), ==, 4); + munit_assert_int(vector_get(&v, 1), ==, 4); + munit_assert_int(vector_get(&v, 2), ==, 1); + + vector_free(&v); + return MUNIT_OK; +} + +static MunitResult +test_vector_del(const MunitParameter params[], void* data) { + ivector v; + int init[] = {1, 2, 3, 4, 5}; + vector_initdata(&v, init, ARRSZ(init)); + + // Удаление из начала + vector_del(&v, 0); + munit_assert_size(vector_len(&v), ==, 4); + munit_assert_int(vector_get(&v, 0), ==, 2); + + // Удаление из конца + vector_del(&v, 3); + munit_assert_size(vector_len(&v), ==, 3); + munit_assert_int(vector_get(&v, 2), ==, 4); + + // Удаление из середины + vector_del(&v, 1); + munit_assert_size(vector_len(&v), ==, 2); + munit_assert_int(vector_get(&v, 0), ==, 2); + munit_assert_int(vector_get(&v, 1), ==, 4); + + vector_free(&v); + return MUNIT_OK; +} + #define TEST_ITEM(func) {#func, func, NULL, NULL, MUNIT_TEST_OPTION_NONE } static MunitTest test_suite_tests[] = { @@ -172,7 +229,8 @@ static MunitTest test_suite_tests[] = { TEST_ITEM(test_vector_resize), TEST_ITEM(test_vector_set_get), TEST_ITEM(test_vector_push_pop), - + TEST_ITEM(test_vector_insert), + TEST_ITEM(test_vector_del), { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL } };