Fixed ft_vecgrow, Added ft_vecinsert

8 files changed, 147 insertions, 12 deletions

diff --git a/include/libft_vec.h b/include/libft_vec.h
index f9199ba..c4e3e22 100644
--- a/include/libft_vec.h
+++ b/include/libft_vec.h
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 18:57:16 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 22:53:33 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 11:00:57 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -43,5 +43,6 @@ t_ftvec			*ft_vecpush(t_ftvec *vec, void *pushed);
 void			ft_vecpop(t_ftvec *vec, void (*del)(void *elem));
 void			ft_veciter(t_ftvec *vec, void (*f)(void *elem));
 void			ft_vecremove(t_ftvec *vec, size_t i, void (*del)(void *elem));
+t_ftvec			*ft_vecinsert(t_ftvec *vec, size_t i, void *elem);
 
 #endif
diff --git a/src/vec/ft_vecgrow.c b/src/vec/ft_vecgrow.c
index bb8b8c7..2213c88 100644
--- a/src/vec/ft_vecgrow.c
+++ b/src/vec/ft_vecgrow.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:13:07 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 21:15:20 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 10:43:01 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -35,7 +35,7 @@ t_ftvec		*ft_vecgrow(t_ftvec *vec)
 		new_capacity = vec->capacity * FT_VEC_GROWTH_FACTOR;
 	if ((new_data = (void**)malloc(sizeof(void*) * new_capacity)) == NULL)
 		return (NULL);
-	ft_memcpy(new_data, vec->data, vec->size);
+	ft_memcpy(new_data, vec->data, vec->size * sizeof(void*));
 	free(vec->data);
 	vec->data = new_data;
 	vec->capacity = new_capacity;
diff --git a/src/vec/ft_vecinsert.c b/src/vec/ft_vecinsert.c
new file mode 100644
index 0000000..1682daa
--- /dev/null
+++ b/src/vec/ft_vecinsert.c
@@ -0,0 +1,36 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   ft_vecinsert.c                                     :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/02 10:46:59 by charles           #+#    #+#             */
+/*   Updated: 2020/04/02 11:04:19 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_vec.h"
+
+/*
+** \brief       Insert element in vector
+** \param vec   Vector where element is inserted
+** \param i     Index where element should be inserted,
+**              bound checking is performed
+** \param elem  Element to insert
+** \return      Passed vector or NULL on error
+*/
+
+t_ftvec	*ft_vecinsert(t_ftvec *vec, size_t i, void *elem)
+{
+	if (i > vec->size)
+		return (NULL);
+	if (vec->capacity <= vec->size)
+		if (ft_vecgrow(vec) == NULL)
+			return (NULL);
+	ft_memmove(vec->data + i + 1, vec->data + i,
+				(vec->size - i) * sizeof(void*));
+	vec->data[i] = elem;
+	vec->size++;
+	return (vec);
+}
diff --git a/src/vec/ft_vecpush.c b/src/vec/ft_vecpush.c
index fc903ef..026ae3d 100644
--- a/src/vec/ft_vecpush.c
+++ b/src/vec/ft_vecpush.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:22:20 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 20:20:06 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 10:51:38 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/test/src/main.c b/test/src/main.c
index 8884f81..ad5c9e8 100644
--- a/test/src/main.c
+++ b/test/src/main.c
@@ -77,6 +77,7 @@ static void run_all_test(void)
 	RUN_TEST_GROUP(ft_vecpop);
 	RUN_TEST_GROUP(ft_vecpush);
 	RUN_TEST_GROUP(ft_vecremove);
+	RUN_TEST_GROUP(ft_vecinsert);
 }
 
 int main(int argc, const char **argv)
diff --git a/test/src/runner/test_runner_vec.c b/test/src/runner/test_runner_vec.c
index e0d3008..e084742 100644
--- a/test/src/runner/test_runner_vec.c
+++ b/test/src/runner/test_runner_vec.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:55:53 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 22:49:28 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 11:01:36 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -48,3 +48,7 @@ TEST_GROUP_RUNNER(ft_vecremove)
 	RUN_TEST_CASE(ft_vecremove, basic);
 }
 
+TEST_GROUP_RUNNER(ft_vecinsert)
+{
+	RUN_TEST_CASE(ft_vecinsert, basic);
+}
diff --git a/test/src/vec/test_ft_vecgrow.c b/test/src/vec/test_ft_vecgrow.c
index 0b40390..8a80c7e 100644
--- a/test/src/vec/test_ft_vecgrow.c
+++ b/test/src/vec/test_ft_vecgrow.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/01 19:41:59 by charles           #+#    #+#             */
-/*   Updated: 2020/04/01 21:17:13 by charles          ###   ########.fr       */
+/*   Updated: 2020/04/02 10:41:28 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,24 +24,51 @@ TEST(ft_vecgrow, basic)
 {
 	t_ftvec *vec = ft_vecnew(1);
 	TEST_ASSERT_NOT_NULL(vec);
+	vec->size = 1;
+	vec->data[0] = (void*)(0xfefefefeUL << 32);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(2, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(1, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	vec->size = 2;
+	vec->data[1] = (void*)(0xfafafafaUL << 32);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(3, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(2, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	vec->size = 3;
+	vec->data[2] = (void*)(0xfbfbfbfbUL << 32);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(4, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(6, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(9, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
+
 	TEST_ASSERT_NOT_NULL(ft_vecgrow(vec));
 	TEST_ASSERT_EQUAL(13, vec->capacity);
-	TEST_ASSERT_EQUAL(0, vec->size);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64(0xfefefefeUL << 32, vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64(0xfafafafaUL << 32, vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64(0xfbfbfbfbUL << 32, vec->data[2]);
 
 	ft_vecdestroy(vec, NULL);
 }
diff --git a/test/src/vec/test_ft_vecinsert.c b/test/src/vec/test_ft_vecinsert.c
new file mode 100644
index 0000000..9b89813
--- /dev/null
+++ b/test/src/vec/test_ft_vecinsert.c
@@ -0,0 +1,66 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   test_ft_vecinsert.c                                :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2020/04/01 22:48:58 by charles           #+#    #+#             */
+/*   Updated: 2020/04/02 11:05:14 by charles          ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "libft_test.h"
+
+TEST_GROUP(ft_vecinsert);
+
+TEST_SETUP(ft_vecinsert)
+{}
+
+TEST_TEAR_DOWN(ft_vecinsert)
+{}
+
+TEST(ft_vecinsert, basic)
+{
+	t_ftvec *vec;
+
+	vec = ft_vecnew(2);
+	vec->data[0] = (void*)(1UL << 32);
+	vec->data[1] = (void*)(2UL << 32);
+	vec->size = 2;
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, 0, (void*)(0xfefefefeUL << 32)));
+	TEST_ASSERT_EQUAL(3, vec->capacity);
+	TEST_ASSERT_EQUAL(3, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(2UL << 32), vec->data[2]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, 1, (void*)(0xfafafafaUL << 32)));
+	TEST_ASSERT_EQUAL(4, vec->capacity);
+	TEST_ASSERT_EQUAL(4, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfafafafaUL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[2]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(2UL << 32), vec->data[3]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, 2, (void*)(0xfbfbfbfbUL << 32)));
+	TEST_ASSERT_EQUAL(6, vec->capacity);
+	TEST_ASSERT_EQUAL(5, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfafafafaUL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfbfbfbfbUL << 32), vec->data[2]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[3]);
+
+	TEST_ASSERT_NOT_NULL(ft_vecinsert(vec, vec->size, (void*)(0xfcUL << 31)));
+	TEST_ASSERT_EQUAL(6, vec->capacity);
+	TEST_ASSERT_EQUAL(6, vec->size);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfefefefeUL << 32), vec->data[0]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfafafafaUL << 32), vec->data[1]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfbfbfbfbUL << 32), vec->data[2]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(1UL << 32), vec->data[3]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(2UL << 32), vec->data[4]);
+	TEST_ASSERT_EQUAL_HEX64((void*)(0xfcUL << 31), vec->data[5]);
+
+	ft_vecdestroy(vec, NULL);
+}