Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-22 15:37:59 +00:00
Code Issues Projects Releases Wiki Activity

move manual tests to unit tests: checkpoint

Browse source
This commit is contained in:
John Kerl 2015-09-11 17:59:04 -04:00
parent 60d5b0b18d
commit 484b2deea0
4 changed files with 52 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
c/Makefile
View file

@ -64,6 +64,7 @@ containers/hss.c \
containers/lhmsi.c \
containers/lhms2v.c \
containers/lhmslv.c \
containers/top_keeper.c \
containers/dheap.c \
input/file_reader_mmap.c input/file_reader_stdio.c \
input/lrec_reader_mmap_csvlite.c input/lrec_reader_stdio_csvlite.c \

72
c/containers/test_multiple_containers.c
View file

@ -8,8 +8,8 @@
#include "containers/lhmsi.h"
#include "containers/lhms2v.h"
#include "containers/lhmslv.h"
#include "containers/dheap.h"
#include "containers/top_keeper.h"
#include "containers/dheap.h"
#ifdef __TEST_MAPS_AND_SETS_MAIN__
int tests_run = 0;
@ -383,43 +383,47 @@ static char* test_percentile_keeper() {
// ----------------------------------------------------------------
static char* test_top_keeper() {
mu_assert_lf(0 == 0);
int capacity = 3;
top_keeper_t* ptop_keeper = top_keeper_alloc(capacity);
mu_assert_lf(ptop_keeper->size == 0);
top_keeper_add(ptop_keeper, 5.0, NULL);
top_keeper_print(ptop_keeper);
mu_assert_lf(ptop_keeper->size == 1);
mu_assert_lf(ptop_keeper->top_values[0] == 5.0);
top_keeper_add(ptop_keeper, 6.0, NULL);
top_keeper_print(ptop_keeper);
mu_assert_lf(ptop_keeper->size == 2);
mu_assert_lf(ptop_keeper->top_values[0] == 6.0);
mu_assert_lf(ptop_keeper->top_values[1] == 5.0);
top_keeper_add(ptop_keeper, 4.0, NULL);
top_keeper_print(ptop_keeper);
mu_assert_lf(ptop_keeper->size == 3);
mu_assert_lf(ptop_keeper->top_values[0] == 6.0);
mu_assert_lf(ptop_keeper->top_values[1] == 5.0);
mu_assert_lf(ptop_keeper->top_values[2] == 4.0);
top_keeper_add(ptop_keeper, 2.0, NULL);
top_keeper_print(ptop_keeper);
mu_assert_lf(ptop_keeper->size == 3);
mu_assert_lf(ptop_keeper->top_values[0] == 6.0);
mu_assert_lf(ptop_keeper->top_values[1] == 5.0);
mu_assert_lf(ptop_keeper->top_values[2] == 4.0);
top_keeper_add(ptop_keeper, 7.0, NULL);
top_keeper_print(ptop_keeper);
mu_assert_lf(ptop_keeper->size == 3);
mu_assert_lf(ptop_keeper->top_values[0] == 7.0);
mu_assert_lf(ptop_keeper->top_values[1] == 6.0);
mu_assert_lf(ptop_keeper->top_values[2] == 5.0);
top_keeper_free(ptop_keeper);
return NULL;
}
//void top_keeper_dump(top_keeper_t* ptop_keeper) {
// for (int i = 0; i < ptop_keeper->size; i++)
// printf("[%02d] %.8lf\n", i, ptop_keeper->top_values[i]);
// for (int i = ptop_keeper->size; i < ptop_keeper->capacity; i++)
// printf("[%02d] ---\n", i);
//}
// int capacity = 5;
// char buffer[1024];
// if (argc == 2)
// (void)sscanf(argv[1], "%d", &capacity);
// top_keeper_t* ptop_keeper = top_keeper_alloc(capacity);
// char* line;
// while ((line = fgets(buffer, sizeof(buffer), stdin)) != NULL) {
// int len = strlen(line);
// if (len >= 1) // xxx write and use a chomp()
// if (line[len-1] == '\n')
// line[len-1] = 0;
// if (streq(line, "")) {
// //top_keeper_dump(ptop_keeper);
// printf("\n");
// } else {
// double v;
// if (!mlr_try_double_from_string(line, &v)) {
// top_keeper_add(ptop_keeper, v, NULL);
// top_keeper_dump(ptop_keeper);
// printf("\n");
// } else {
// printf("meh? >>%s<<\n", line);
// }
// }
// }
// ----------------------------------------------------------------
static char* test_dheap() {
mu_assert_lf(0 == 0);

10
c/containers/top_keeper.c
View file

@ -1,3 +1,4 @@
#include <stdio.h>
#include <string.h>
#include "lib/mlrutil.h"
#include "containers/top_keeper.h"
@ -76,3 +77,12 @@ void top_keeper_add(top_keeper_t* ptop_keeper, double value, lrec_t* prec) {
ptop_keeper->top_precords[destidx] = prec; // xxx copy?? xxx free on shift-off?!?
}
}
// ----------------------------------------------------------------
void top_keeper_print(top_keeper_t* ptop_keeper) {
printf("top_keeper dump:\n");
for (int i = 0; i < ptop_keeper->size; i++)
printf("[%02d] %.8lf\n", i, ptop_keeper->top_values[i]);
for (int i = ptop_keeper->size; i < ptop_keeper->capacity; i++)
printf("[%02d] ---\n", i);
}

3
c/containers/top_keeper.h
View file

@ -17,4 +17,7 @@ top_keeper_t* top_keeper_alloc(int capacity);
void top_keeper_free(top_keeper_t* ptop_keeper);
void top_keeper_add(top_keeper_t* ptop_keeper, double value, lrec_t* prec);
// For debug/test
void top_keeper_print(top_keeper_t* ptop_keeper);
#endif // TOP_KEEPER_H