From 8664e4f1dae5dac6d0f29b351bb8de6d98c9563e Mon Sep 17 00:00:00 2001 From: alexey Date: Thu, 11 Dec 2025 02:05:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BE=D0=B1=D1=85=D0=BE=D0=B4=D0=B8=D0=BC=D1=8B?= =?UTF-8?q?=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8=20=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vector.c | 68 ++++++++++++++++++++++++++++++++++++++++----------- vector_test.c | 55 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 14 deletions(-) diff --git a/vector.c b/vector.c index bfbea79..765942b 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(v->maxsz * ITEMSZ); + memcpy(v->data, arr, arrsz * ITEMSZ); } void @@ -43,17 +46,14 @@ 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 @@ -61,49 +61,89 @@ vector_resize(ivector *v, int n) { assert(v); - // + if(n > (int)v->maxsz) { + size_t newsize = v->maxsz; + while ((int)newsize < n) { + newsize *= VECTOR_GROW_FACTOR; + } + v->data = xrealloc(v->data, newsize * ITEMSZ); + memset(v->data + v->n, 0, (n - v->n) * ITEMSZ); + v->maxsz = newsize; + } + + if (n < (int)v->n) { + } else if (n > (int)v->n) { + memset(v->data + v->n, 0, (n -v->n) * ITEMSZ); + } + v->n = n; + } 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) { + v->maxsz *= VECTOR_GROW_FACTOR; + v->data = xrealloc(v->data, v->maxsz * ITEMSZ); + } + + 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) { + v->maxsz *= VECTOR_GROW_FACTOR; + v->data = xrealloc(v->data, v->maxsz * ITEMSZ); + } + + 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..f1c9622 100644 --- a/vector_test.c +++ b/vector_test.c @@ -5,6 +5,59 @@ #include "macro.h" #include "munit/munit.h" + +static MunitResult +test_vector_insert(const MunitParameter params[], void * data) +{ + ivector v; + vector_init(&v); + + vector_push(&v, 1); + vector_push(&v, 2); + vector_push(&v, 3); + vector_push(&v, 4); + + vector_insert(&v, 2, 99); + + int *p = vector_data(&v); + + munit_assert_int(p[0], ==, 1); + munit_assert_int(p[1], ==, 2); + munit_assert_int(p[2], ==, 99); + munit_assert_int(p[3], ==, 3); + munit_assert_int(p[4], ==, 4); + munit_assert_size(vector_len(&v), ==, 5); + + vector_free(&v); + return MUNIT_OK; +} + +static MunitResult +test_vector_del(const MunitParameter params[], void * data) +{ + ivector v; + vector_init(&v); + + vector_push(&v, 1); + vector_push(&v, 2); + vector_push(&v, 3); + vector_push(&v, 4); + vector_push(&v, 5); + + vector_del(&v, 2); + + int *p = vector_data(&v); + + munit_assert_int(p[0], ==, 1); + munit_assert_int(p[1], ==, 2); + munit_assert_int(p[2], ==, 4); + munit_assert_int(p[3], ==, 5); + munit_assert_size(vector_len(&v), ==, 4); + + vector_free(&v); + return MUNIT_OK; +} + static MunitResult test_vector_len(const MunitParameter params[], void * data) { @@ -173,6 +226,8 @@ static MunitTest test_suite_tests[] = { 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 } };