WPBDC 2013.1.6 → 2013.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQ1ZDYzZTUzNzI0ZTkzMzU5ZWVlM2E3MDIxNDY3ZTVkYzBjMDcxYg==
+    MmM1MDlkNTI1YWUyOTM5OTNjYTA3YWQ5NTIzNDBkMGM0MmZiMmQyMA==
   data.tar.gz: !binary |-
-    YTgyNTliYWJjYzQyZmQ5NWVlMTBiMTU1Yjk5N2UxYjU4MzA0ZTI1Mg==
+    MGJhOTAxMTNhZDkwYzk5YTAyNmViZTc1M2IxNTY5Y2VlNTRmNjQ2MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzljYWFjNDljZGU0YzAxNjJlNGVhN2NjOTc2MDg4MDhjYWY5NWQxYjc2ZGNi
-    MTA0OGNkZjE2NDFkMWY5YjBjZjE4ODdiZmZjYTMzOWJkOGRkNWQzMGMyMmMz
-    NDNkZDM2OTRiNDk1MmVmNGU1ZDQ0Y2UxZWVkNGQ2YTNlYmY0ODk=
+    OGEwMGMwOGIwMjQ0MGUwM2UzMjBjM2EzNGNkNzQ2ZDRmNzhhZjhmNTI4NjM3
+    YzNkN2I5MWM5MTk1MjE2ZTNhZDFlMTdiYWQ4OTBjMzQ1Mzc3YTdlMTUyZDQ0
+    ZThhMDFkNWQ5YzQyZDZkYTRiZGQ1M2RmMjg5NzYyMWVjMmE5NjA=
   data.tar.gz: !binary |-
-    Mzc1MjQ5NGFmODQ1Zjk1YzJhMzlkNmViNDMyNTIwMzUwMmRjZDRiNzM3MmQz
-    OTI5YmNmZWYxZjE3YTg0MjUzYmI5N2IxMjExMzU3OGE4MmEwOGM3MWI2NTU2
-    ZDU4NGYyNzRmYjAyYzc2NjQ4YjVlZDFkMDhhNjMwM2I5ZmYxNzY=
+    MDVmNTZhZjE5YWYzOTIxYWI3NWY5N2M3MjUzZWJmYzYzMTQzZjRhNzgyYmQ3
+    MWYwMGY3YWM3MDc3NDZhYzM5ZmM4YWRjMzI3YzllOGM5YjIzNTg3MDliNjcw
+    MjY5ZGM0OTlkYWYwNjRiMWE1YzVjMTUxMDI5MWMwYjQ1NDIwOGI=

data/ext/WPBDC/judge.c

@@ -206,16 +206,52 @@ char *analysis_table(STRING *bridge_as_string)
 //#define WRITE_EXAMPLES
 
 #ifdef WRITE_EXAMPLES
-#define EG_DIR  "../Eg/2011"
-#define NEW_EG_DIR  "../Eg/2012"
+#define EG_DIR  "../../test/eg/2012"
+#define NEW_EG_DIR  "../../test/eg/2013"
 #else
-#define EG_DIR  "../Eg/2012"
+#define EG_DIR  "../../test/eg/2012"
 #endif
 
-#include <io.h>
+#ifdef WINDOWS
 #include <crtdbg.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <dirent.h>
+
+void strcpyn(char *dst, char *src, int n)
+{
+    while (n-- > 0 && *src)
+        *dst++ = *src++;
+    *dst = '\0';
+}
+
+void split_path(char *path, char *drv, char *dir, char *fname, char *ext)
+{
+    int len = strlen(path);
+    char *colon, *slash, *dot;
+
+    colon = strchr(path, ':');
+    if (colon) {
+        if (drv) strcpyn(drv, path, colon - path + 1);
+        path = colon + 1;
+    }
+    slash = strrchr(path, '/');
+    if (slash) {
+        if (dir) strcpyn(dir, path, slash - path + 1);
+        path = slash + 1;
+    }
+    dot = strrchr(path, '.');
+    if (dot) {
+        if (ext) strcpy(ext, dot);
+        if (fname) strcpyn(fname, path, dot - path);
+    }
+    else {
+        if (ext) strcpy(ext, "");
+        if (fname) strcpy(fname, path);
+    }
+}
 
 void split_fn(char *fn, char *path, char *name, char *ext)
 {
@@ -250,6 +286,7 @@ int main(int argc, char* argv[])
 {
     extern unsigned contest_year;  // ugly hack go read other years' bridge files
 
+    DIR *d;
     FILE *f;
     char fname[256];
     char raw[4*1024];
@@ -259,6 +296,7 @@ int main(int argc, char* argv[])
     char buf[256], path[256], name[256], ext[256];
     char *text;
     struct analysis_result_t result[1];
+    struct dirent *dir_ent;
 
     TBridge bridge[1];
     TBridge copy[1];
@@ -268,7 +306,6 @@ int main(int argc, char* argv[])
     TAnalysis anal[1];
     int i, n, test_case;
     long h;
-    struct _finddata_t file_data[1];
     COMPRESSED_IMAGE compressed_image[1];
 
 #ifdef WRITE_EXAMPLES
@@ -288,6 +325,12 @@ int main(int argc, char* argv[])
     }
 #endif
 
+    d = opendir (EG_DIR "/");
+    if (!d) {
+        perror ("Couldn't open test input directory " EG_DIR);
+        return 17;
+    }
+
     init_bridge(bridge);
     init_bridge(copy);
     init_geometry(geometry);
@@ -302,26 +345,21 @@ int main(int argc, char* argv[])
         return 1;
 
     for (test_case = 1;;test_case++) {
-
-        if (test_case == 1) {
-            h = _findfirst( EG_DIR "/*.bdc", file_data );
-            if (h == -1) {
-                printf( "No bridge files!\n" );
-                return 17;
-            }
-        }
-        else {
-            if (_findnext(h, file_data) != 0) {
-                _findclose(h);
-                test_case--;
-                break;
-            }
+        dir_ent = readdir(d);
+        if (!dir_ent) {
+            closedir(d);
+            test_case--;
+            break;
         }
-        if (strcmp(file_data->name, "A-arch-10-4-1.bdc") != 0) 
+        if (strstr(dir_ent->d_name, ".bdc") == NULL)
+            continue;
+
+        // SINGLE TEST CASE!
+        if (strcmp(dir_ent->d_name, "semis-01.bdc") != 0)
             continue;
 
-        printf("Test case %d (%s):\n", test_case, file_data->name);
-        sprintf(fname, EG_DIR "/%s", file_data->name);
+        printf("Test case %d (%s):\n", test_case, dir_ent->d_name);
+        sprintf(fname, EG_DIR "/%s", dir_ent->d_name);
         f = fopen(fname, "rb");
         if (!f) {
             printf("can't open bridge file\n");
@@ -361,13 +399,13 @@ int main(int argc, char* argv[])
 
 #ifdef WRITE_EXAMPLES
 
-        if (!strstr(file_data->name, "failed")) {
+        if (!strstr(dir_ent->d_name, "failed")) {
 
             struct _stat stat_buf[1];
 
             n_examples_read++;
 
-            split_fn(file_data->name, path, name, ext);
+            split_fn(dir_ent->d_name, path, name, ext);
 
             n = fix_failure(copy, bridge, params);
 
@@ -509,7 +547,7 @@ int main(int argc, char* argv[])
 
         if (text) {
             printf("writing analysis...");
-            _splitpath(file_data->name, 0, path, name, ext);
+            split_path(dir_ent->d_name, 0, path, name, ext);
             sprintf(buf, "Debug/html/%s.htm", name);
             f = fopen(buf, "w");
             if (!f) {
@@ -540,7 +578,7 @@ int main(int argc, char* argv[])
 
         // Do a sketch
         sketch(bridge_str, 300, 300, compressed_image, result);
-        _splitpath(file_data->name, 0, path, name, ext);
+        split_path(dir_ent->d_name, 0, path, name, ext);
         sprintf(buf, "Debug/sketch/%s.png", name);
         f = fopen(buf, "wb");
         if (!f) {

data/ext/WPBDC/judge.h

@@ -17,7 +17,10 @@
 
 // The id for the semifinal scenario including a null value
 #define NULL_SEMIFINAL_SCENARIO_ID "0000000000"
-#define SEMIFINAL_SCENARIO_ID NULL_SEMIFINAL_SCENARIO_ID
+
+// When you set this, you _must_ change the scenario table so its record is in sorted order!
+#define SEMIFINAL_SCENARIO_ID "3100003100"
+//#define SEMIFINAL_SCENARIO_ID NULL_SEMIFINAL_SCENARIO_ID
 
 // Status returns from analyze().
 #define BRIDGE_OK           0

data/ext/WPBDC/rubydefs.h

@@ -1,7 +1,7 @@
 #ifndef _RUBYDEFS_H
 #define _RUBYDEFS_H
 
-#if !defined(STAND_ALONE)
+#if !defined(NATIVE_TEST)
 
 #include <ruby.h>
 
@@ -41,6 +41,8 @@
 
 #else
 
+#include <stdio.h>
+
 #define New(x,v,n,t)									\
 	do {												\
 		if ( !(v = (t*)malloc((n)*sizeof(t))) ) {		\

data/ext/WPBDC/scenario.c

@@ -10,7 +10,6 @@
 // Lookup table is sorted on 10-char ID field for binary search.
 // The search routine will bubble the semifinal row to the right location.
 static TScenarioDescriptor scenario_descriptor_tbl[] = {
-    { 999, SEMIFINAL_SCENARIO_ID, "99Z", 100000.00 },
     {   0, "1050824100", "27A",  99874.40 },
     {   1, "1051220100", "32A", 105140.00 },
     {   2, "1051616100", "36A", 111994.40 },
@@ -272,6 +271,7 @@ static TScenarioDescriptor scenario_descriptor_tbl[] = {
     { 258, "3091616300", "17C", 108700.00 },
     { 259, "3091616350", "84C", 112200.00 },
     { 260, "3091616351", "88C", 120200.00 },
+    { 999, SEMIFINAL_SCENARIO_ID, "99Z", 100000.00 },
     { 261, "3100804100", "22C",  88840.40 },
     { 262, "3101204060", "54C",  94500.00 },
     { 263, "3101204360", "82C", 106500.00 },
@@ -434,6 +434,8 @@ int lookup_scenario_descriptor(TScenarioDescriptor *desc, char *id)
 	int hi = STATIC_ARRAY_SIZE(scenario_descriptor_tbl) - 1;
 	int i, cmp, mid;
 
+    /*  NOT THREAD SAFE.  DO BY HAND!
+
     // Bubble the semifinal scenario to the right position one time.
     if (!initialized_p) {
         initialized_p = 1;
@@ -446,11 +448,16 @@ int lookup_scenario_descriptor(TScenarioDescriptor *desc, char *id)
         }
         scenario_descriptor_tbl[i] = semifinal_descriptor;
     }
+    */
+
+    // TODO Remove
+    fprintf(stderr, "looking for %.10s\n", id);
 
     // Don't bother searching for the null semifinal scenario.
     if (strncmp(id, NULL_SEMIFINAL_SCENARIO_ID, SCENARIO_ID_SIZE) != 0) {
 
         while (lo <= hi) {
+            fprintf(stderr, "SEARCH [%d, %d]\n", lo, hi);
             mid = (unsigned)(lo + hi) >> 1;
             cmp = strncmp(id, scenario_descriptor_tbl[mid].id, SCENARIO_ID_SIZE);
             if (cmp < 0)
@@ -658,6 +665,8 @@ int test_scenario_table(void)
 	printf("scenario lookup check (find good indices): ");
 	for (i = 0; i < STATIC_ARRAY_SIZE(scenario_descriptor_tbl); i++) {
 		printf("%d ", i);
+		if (strncmp(scenario_descriptor_tbl[i].id, NULL_SEMIFINAL_SCENARIO_ID, SCENARIO_ID_SIZE) == 0)
+		    continue;
 		if (lookup_scenario_descriptor(desc, scenario_descriptor_tbl[i].id) < 0) {
 			printf("\nfailed to find scenario id %s (position %d)\n", 
 				scenario_descriptor_tbl[i].id, i);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: WPBDC
 version: !ruby/object:Gem::Version
-  version: 2013.1.6
+  version: 2013.1.8
 platform: ruby
 authors:
 - Gene Ressler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies: []
 description: Container for C code extension that implements the West Point Bridge
   Contest Judge.