Added further functions for data manipulation and optimized the ones already in place

include/readbop.h

@@ -57,8 +57,12 @@
 		int arr2csv(const char* arr, size_t rows, size_t row_length, size_t cols, const type_t *types, char **headers, char **output);
 		int print_data(const char *ptr, type_t t);
 
-	ssize_t get_col_offset(char **headers, const type_t *types, size_t cols, const char* target);
-	ssize_t* get_col_offsets(char **headers, const type_t *types, size_t cols, char **targets, size_t n);
+		ssize_t get_col_index(char **headers, size_t cols, const char* target);
+		ssize_t* get_col_indexes(char **headers, size_t cols, char **targets, size_t n);
+		ssize_t get_col_offset_i(const type_t *types, size_t cols, ssize_t index);
+		ssize_t* get_col_offsets_i(const type_t *types, size_t cols, const ssize_t* indexes, size_t n);
+		ssize_t get_col_offset(char **headers, const type_t *types, size_t cols, const char* target);
+		ssize_t* get_col_offsets(char **headers, const type_t *types, size_t cols, char **targets, size_t n);
 
 
 		//Tested only with Bebop 2 files

src/readbop.c.in

@@ -1140,6 +1140,86 @@ int print_data(const char *ptr, type_t t) {
 	return 0;
 }
 
+ssize_t get_col_index(char **headers, size_t cols, const char* target) {
+	for(ssize_t i = 0; i < cols; ++i)
+		if(strcmp(headers[i], target) == 0)
+			return i;
+
+	return -1;
+}
+
+ssize_t* get_col_indexes(char **headers, size_t cols, char **targets, size_t n) {
+	ssize_t *indexes;
+	if((indexes = malloc(n*sizeof(ssize_t))) == NULL)
+		set_error_null(ALLOC);
+
+	for(size_t i = 0; i < n; ++i)
+		indexes[i] = -1;
+
+	size_t cnt = 0;
+	for(size_t i = 0; i < cols; ++i) {
+		for(size_t j = 0; j < n; ++j) {
+			if(indexes[j] < 0 && strcmp(headers[i], targets[j]) == 0) {
+				++cnt;
+				indexes[j] = i;
+			}
+		}
+
+		if(cnt == n)
+			return indexes;
+	}
+
+	return indexes;
+}
+
+ssize_t get_col_offset_i(const type_t *types, size_t cols, ssize_t index) {
+	if(index < 0)
+		return -1;
+
+	size_t offset = 0;
+	for(size_t i = 0; i < index; ++i)
+		offset += type_sizes[types[i]];
+	return offset;
+}
+
+ssize_t* get_col_offsets_i(const type_t *types, size_t cols, const ssize_t* indexes, size_t n) {
+	ssize_t *offsets;
+	if((offsets = malloc(n*sizeof(ssize_t))) == NULL)
+		set_error_null(ALLOC);
+
+	ssize_t max = -2;
+	for(size_t i = 0; i < n; ++i)
+		if(indexes[i] > max)
+			max = indexes[i];
+	++max;
+
+	if(max < 0) {
+		for(size_t i = 0; i < n; ++i)
+			offsets[i] = -1;
+		return offsets;
+	}
+
+	size_t *cummul;
+	if((cummul = calloc(max, sizeof(size_t))) == NULL) {
+		free(offsets);
+        set_error_null(ALLOC);
+	}
+
+	for(size_t i = 1; i < max; ++i)
+		cummul[i] = cummul[i-1] + type_sizes[types[i-1]];
+
+	for(size_t i = 0; i < n; ++i) {
+		if(indexes[i] < 0)
+			offsets[i] = -1;
+		else
+			offsets[i] = cummul[indexes[i]];
+	}
+
+	free(cummul);
+
+	return offsets;
+}
+
 ssize_t get_col_offset(char **headers, const type_t *types, size_t cols, const char* target) {
 	size_t offset = 0;
 	for(size_t i = 0; i < cols; ++i) {
@@ -1152,45 +1232,29 @@ ssize_t get_col_offset(char **headers, const type_t *types, size_t cols, const c
 }
 
 ssize_t* get_col_offsets(char **headers, const type_t *types, size_t cols, char **targets, size_t n) {
-	uint8_t *found;
-	if((found = calloc(n, sizeof(uint8_t))) == NULL)
-		set_error_null(ALLOC);
-
 	ssize_t *offsets;
-	if((offsets = malloc(n*sizeof(size_t))) == NULL) {
-		free(found);
+	if((offsets = malloc(n*sizeof(ssize_t))) == NULL)
 		set_error_null(ALLOC);
-	}
 
 	for(size_t i = 0; i < n; ++i)
 		offsets[i] = -1;
 
+	size_t cnt = 0;
 	size_t current_offset = 0;
 	for(size_t i = 0; i < cols; ++i) {
 		for(size_t j = 0; j < n; ++j) {
-			if(!found[j] && strcmp(headers[i], targets[j]) == 0) {
-				found[j] = 1;
+			if(offsets[j] < 0 && strcmp(headers[i], targets[j]) == 0) {
+				++cnt;
 				offsets[j] = current_offset;
 			}
 		}
 
-		uint8_t stop = 1;
-		for(size_t j = 0; j < n; ++j) {
-			if(!found[j]) {
-				stop = 0;
-				break;
-			}
-		}
-
-		if(stop) {
-			free(found);
+		if(cnt == n)
 			return offsets;
-		}
 
 		current_offset += type_sizes[types[i]];
 	}
 
-	free(found);
 	return offsets;
 }