WPBDC 2013.1.5 → 2013.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTA1NzdjZjA3NGQzYmZlNzUzYjQ4Y2JjODAwNjUwNjUxZDRmZTUxZg==
+    NzQ1ZDYzZTUzNzI0ZTkzMzU5ZWVlM2E3MDIxNDY3ZTVkYzBjMDcxYg==
   data.tar.gz: !binary |-
-    NTcyZDdiODExMDdkZTRjMWQ0NTBkNTE0MmFhYjg1NjEzMjdjZjAyOQ==
+    YTgyNTliYWJjYzQyZmQ5NWVlMTBiMTU1Yjk5N2UxYjU4MzA0ZTI1Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTBmMDEwODE2OTM1YzE4ZTUxMDJkMzc3ODJmNzQ3OTNmZGUwMzU4MjM3YTdk
-    NmFjMWY3YTRlMGY0ZmUwN2ZmNDkxNTg0NDBjNjY5OTM3ZjFlYWVlOTBmM2My
-    MzVhYjYwNTliOWE2ZWQ1MDExOGUwYmUyNTA0ZDdlOGNhOGU1MDk=
+    MzljYWFjNDljZGU0YzAxNjJlNGVhN2NjOTc2MDg4MDhjYWY5NWQxYjc2ZGNi
+    MTA0OGNkZjE2NDFkMWY5YjBjZjE4ODdiZmZjYTMzOWJkOGRkNWQzMGMyMmMz
+    NDNkZDM2OTRiNDk1MmVmNGU1ZDQ0Y2UxZWVkNGQ2YTNlYmY0ODk=
   data.tar.gz: !binary |-
-    M2VhOGQ0NDhjMjkyMjk2YzJkYzAyOWE4NTRiZTM4NjZjOTA2NTYwOGE0YjVl
-    MGQ2OTAwNWI5Y2M3NDZkZGM0ZmYxYzYzZTY2MDQ2NjQ2ZTI2MmM3MGJiMGJm
-    NjNhMWYyNmUzMDFhOGQyZDU1NzQ3NzNlY2IyYmQyOWZmMWY2ZmE=
+    Mzc1MjQ5NGFmODQ1Zjk1YzJhMzlkNmViNDMyNTIwMzUwMmRjZDRiNzM3MmQz
+    OTI5YmNmZWYxZjE3YTg0MjUzYmI5N2IxMjExMzU3OGE4MmEwOGM3MWI2NTU2
+    ZDU4NGYyNzRmYjAyYzc2NjQ4YjVlZDFkMDhhNjMwM2I5ZmYxNzY=

data/ext/WPBDC/WPBDC.c

@@ -220,6 +220,15 @@ static struct ict_entry {
   INT_CONST_TABLE_ENTRY(SCENARIO_NUMBER_SIZE),
 };
 
+#define STRING_CONST_TABLE_ENTRY(Name) { #Name, Name }
+
+static struct sct_entry {
+  char *name;
+  char *val;
+} string_const_table[] = {
+    STRING_CONST_TABLE_ENTRY(SEMIFINAL_SCENARIO_ID)
+};
+
 void Init_WPBDC(void)
 {
   int i;
@@ -235,4 +244,8 @@ void Init_WPBDC(void)
     struct ict_entry *e = int_const_table + i;
     rb_define_const(module, e->name, INT2FIX(e->val));
   }
+  for (i = 0; i < STATIC_ARRAY_SIZE(string_const_table); i++) {
+    struct sct_entry *e = string_const_table + i;
+    rb_define_const(module, e->name, rb_str_new2(e->val));
+  }
 }

data/ext/WPBDC/judge.c

@@ -556,7 +556,6 @@ int main(int argc, char* argv[])
     printf("%d examples read, %d written\n", n_examples_read, n_examples_written);
 #endif
 
-
     return 0;
 }
 

data/ext/WPBDC/judge.h

@@ -15,6 +15,10 @@
 #define YEAR_TO_VERSION(Y) (((((Y) % 100) / 10) << 8) | (((Y) % 10) << 4) | 0x400c)
 #define BD_VERSION YEAR_TO_VERSION(CONTEST_YEAR)
 
+// The id for the semifinal scenario including a null value
+#define NULL_SEMIFINAL_SCENARIO_ID "0000000000"
+#define SEMIFINAL_SCENARIO_ID NULL_SEMIFINAL_SCENARIO_ID
+
 // Status returns from analyze().
 #define BRIDGE_OK           0
 #define BRIDGE_MALFORMED    1

data/ext/WPBDC/scenario.c

@@ -8,7 +8,9 @@
 // The indices do _not_ have to be in order.
 
 // 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 },
@@ -427,23 +429,42 @@ char *local_contest_number_to_id(char *number)
 int lookup_scenario_descriptor(TScenarioDescriptor *desc, char *id)
 {
 	static TScenarioDescriptor null_desc = NULL_SCENARIO_DESCRIPTOR;
+	static int initialized_p = 0;
 	int lo = 0;
 	int hi = STATIC_ARRAY_SIZE(scenario_descriptor_tbl) - 1;
-	int cmp, mid;
-
-	while (lo <= hi) {
-		mid = (unsigned)(lo + hi) >> 1;
-		cmp = strncmp(id, scenario_descriptor_tbl[mid].id, SCENARIO_ID_SIZE);
-		if (cmp < 0)
-			hi = mid - 1;
-		else if (cmp > 0)
-			lo = mid + 1;
-		else {
-			if (desc)
-				*desc = scenario_descriptor_tbl[mid];
-			return mid;
-		}
-	}
+	int i, cmp, mid;
+
+    // Bubble the semifinal scenario to the right position one time.
+    if (!initialized_p) {
+        initialized_p = 1;
+        TScenarioDescriptor semifinal_descriptor = scenario_descriptor_tbl[0];
+        for (i = 0; i < STATIC_ARRAY_SIZE(scenario_descriptor_tbl) - 1; i++) {
+            if (strncmp(scenario_descriptor_tbl[i + 1].id, semifinal_descriptor.id, SCENARIO_ID_SIZE) < 0)
+                scenario_descriptor_tbl[i] = scenario_descriptor_tbl[i + 1];
+            else
+                break;
+        }
+        scenario_descriptor_tbl[i] = semifinal_descriptor;
+    }
+
+    // Don't bother searching for the null semifinal scenario.
+    if (strncmp(id, NULL_SEMIFINAL_SCENARIO_ID, SCENARIO_ID_SIZE) != 0) {
+
+        while (lo <= hi) {
+            mid = (unsigned)(lo + hi) >> 1;
+            cmp = strncmp(id, scenario_descriptor_tbl[mid].id, SCENARIO_ID_SIZE);
+            if (cmp < 0)
+                hi = mid - 1;
+            else if (cmp > 0)
+                lo = mid + 1;
+            else {
+                if (desc)
+                    *desc = scenario_descriptor_tbl[mid];
+                return mid;
+            }
+        }
+
+    }
 	if (desc)
 		*desc = null_desc;
 	return -1;

metadata

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