Compare commits

1 Commits

Author SHA1 Message Date
alexey
8664e4f1da Дописал необходимые функции и добавил тесты 2025-12-11 02:05:47 +03:00
2 changed files with 109 additions and 14 deletions

View File

@@ -25,7 +25,10 @@ void
vector_initdata(ivector *v, int *arr, size_t arrsz)
{
assert(v && arrsz);
// <YOURCODE>
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);
// <YOURCODE>
return 0;
return v->n;
}
int *
vector_data(const ivector *v)
{
assert(v);
// <YOURCODE>
return NULL;
return v->data;
}
void
@@ -61,49 +61,89 @@ vector_resize(ivector *v, int n)
{
assert(v);
// <YOURCODE>
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);
// <YOURCODE>
v->data[idx] = val;
}
int
vector_get(const ivector *v, size_t idx)
{
assert(v && idx < v->n);
// <YOURCODE>
return 0;
return v->data[idx];
}
void
vector_push(ivector *v, int val)
{
assert(v);
// <YOURCODE>
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);
// <YOURCODE>
if (v->n > 0) {
v->n--;
}
}
void
vector_insert(ivector *v, size_t idx, int val)
{
assert(v && v->n >= idx);
// <YOURCODE>
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)
{
// <YOURCODE>
assert(v && idx < v-> n);
memmove(v->data +idx,
v->data +idx +1,
(v->n - idx - 1) * ITEMSZ);
v->n--;
}
void

View File

@@ -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 }
};