From 62d87e063318cc4c842b1b2d8c184f48aeaf6659 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Mon, 19 May 2025 17:45:14 +0200 Subject: Refactored checkdata Relevant changes include: - Changed the signature of nissy_checkdata(). - Removed expected_distribution.h from tools; this data is now included in each solver's src/ code. - Removed distribution check for cocsep; may add back later. --- tools/100_checkdata/checkdata.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tools/100_checkdata') diff --git a/tools/100_checkdata/checkdata.c b/tools/100_checkdata/checkdata.c index c284aa4..3a3c098 100644 --- a/tools/100_checkdata/checkdata.c +++ b/tools/100_checkdata/checkdata.c @@ -1,11 +1,11 @@ #include "../tool.h" -#include "../expected_distributions.h" char *solver, *filename; static void run(void) { - long long int size, sizeread, result; + bool result; + long long int size, sizeread; char dataid[NISSY_SIZE_DATAID]; unsigned char *buf; FILE *f; @@ -25,10 +25,12 @@ run(void) { buf = malloc(size); sizeread = fread(buf, size, 1, f); fclose(f); - result = sizeread == 1 && nissy_checkdata(size, buf); + if (sizeread != 1) + printf("File has unexpected size\n"); + result = sizeread == 1 && nissy_checkdata(solver, size, buf) == NISSY_OK; free(buf); - printf("checkdata %s\n", result == 0 ? "succeeded" : "failed"); + printf("checkdata %s\n", result ? "succeeded" : "failed"); /* TODO: cross-check with expected distributions? */ } -- cgit v1.3