WPBDC 2013.2.1 → 2014.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2IwNzMwZTEwY2ZmMTE2NzViYTY2NjY4MTA5YWM1Y2RjMTViOGYwMg==
+    Y2JiOTA2NjQ1OTI2YmRhZmJiYTJmMjZhZjNiNmMyMGFkOTY5OWQzNQ==
   data.tar.gz: !binary |-
-    ZDIzMjY4OGM4MDMxMmFiZGY1YWJmMjk4MGUwM2U0YmJlYTk2YWJkMA==
+    ZWU4NDFmMmNmMjBjODVlNjUwYjUzYjM3MDBmNWU0ZDQ1MTM3ZTMyZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGNlMDYxNDY1NDU0YTM5NWQ5MDIzYmJiYzRiMTNhMjViYzc0NzU5YjI5MjBk
-    Zjg3ZWU2OGEyNjRiOGJiNWEwMDQ3MjRlYzE0YWUwNTdhYmYxYmY1ZGY3YTg1
-    N2I5MjNmM2Q1N2U4ZGU0MTQyNTA0MWQyODk1MmQyZTI1ZGM1OTI=
+    YTQ4YmE4NjRiMTUxOTRlNTgwNTAzMzVkNGYxYjg3NjQyMzU5MTUzMTJhNjZl
+    NmQ0OTNmZGY0NWM3ZTZkOTNmZDc0YWQ2NmRmMGEyYTQzZDAxZmVmYjEwZGRl
+    N2FiOTEwNWU4YTQxZGFlYWYyMmVmNTliZTNlNmRmN2ZjNTRiNDU=
   data.tar.gz: !binary |-
-    MjlhZGJhZThmNTFmZTQ4OWUxMDA5ZWRkN2ZkM2FkYzU4OGNlNjNjZDBmZDUz
-    YTMxNGQ1NjBiZjdlODE1ZGFhYmU0OWM2MWM4Y2VkMjI0MjBhNGNhOThjNmZi
-    NjhmY2Y3YzFhNmI1YTU1ZGQ3YWM2YTA3OGE4YTk4MjJlMmE5MTk=
+    M2ZmNTVjNTQ3YjA3Y2JhZjAyYWFjZjM2ZDYyOTU3YjRkZjg2MmY4M2Y5ODg0
+    Nzk4NjlmYjVkMjAxM2M5NTVmZjVlZmUyZGZhNmI0YjIyNmZjYjRmOTZlODZk
+    MjhiMTg4Y2I5MzAwZjM5Y2FmNTA1ZDNlODAzYjkwZjA0YTEwNWU=

data/ext/WPBDC/WPBDC.c

@@ -154,6 +154,15 @@ static VALUE rb_api_analysis_table(VALUE self, VALUE bridge_as_string)
     return c_str_to_value(result);
 }
 
+static VALUE rb_api_analysis_log(VALUE self, VALUE bridge_as_string)
+#define ARGC_analysis_log 1
+{
+    Check_Type(bridge_as_string, T_STRING);
+    INIT_STRING_FROM_VALUE(bridge_internal_string, bridge_as_string);
+    char *result = analysis_log(bridge_internal_string);
+    return c_str_to_value(result);
+}
+
 static VALUE rb_api_local_contest_number_to_id(VALUE self, VALUE number_as_string)
 #define ARGC_local_contest_number_to_id 1
 {
@@ -180,6 +189,7 @@ static struct ft_entry {
   FUNCTION_TABLE_ENTRY(perturbation),
   FUNCTION_TABLE_ENTRY(sketch),
   FUNCTION_TABLE_ENTRY(analysis_table),
+  FUNCTION_TABLE_ENTRY(analysis_log),
   FUNCTION_TABLE_ENTRY(local_contest_number_to_id),
 };
 

data/ext/WPBDC/analysis.c

@@ -465,7 +465,6 @@ char *analysis_to_html(TAnalysis *analysis,
 	char *rtn, *p;
 	char buf[1024];
 	unsigned member_index;
-	TLoadScenario *ls;
 
 #define Append(S)	do {							\
 	char *q = (S);									\
@@ -495,8 +494,6 @@ char *analysis_to_html(TAnalysis *analysis,
 	assert(params);
 	// result is optional
 
-	ls = &bridge->load_scenario;
-
 	// Allocate an initial return buffer.
 	New(140, rtn, rtn_size, char);
 	p = rtn;
@@ -614,6 +611,110 @@ char *analysis_to_html(TAnalysis *analysis,
 	return rtn;
 }
 
+char *analysis_to_text(TAnalysis *analysis,
+					   TBridge *bridge,
+					   TGeometry *geometry,
+					   TLoading *loading,
+					   TParams *params,
+					   struct analysis_result_t *result)
+{
+	size_t rtn_size = 1024 * 8;
+	char *rtn, *p;
+	char buf[1024];
+	unsigned member_index;
+
+	assert(analysis);
+	assert(bridge);
+	assert(geometry);
+	assert(loading);
+	assert(params);
+	// result is optional
+
+	// Allocate an initial return buffer.
+	New(145, rtn, rtn_size, char);
+	p = rtn;
+
+	if (analysis->error) {
+		sprintf(buf, "Analysis error: %d\n", analysis->error);
+		Append(buf);
+		return rtn;
+	}
+
+	#define AppendTab Append("\t")
+	#define AppendNewline Append("\n")
+
+	// Header
+	AppendInt(bridge->n_design_iterations);
+	AppendTab;
+	Append(bridge->scenario_descriptor.id);
+	AppendTab;
+	Append(bridge->scenario_descriptor.number);
+	AppendTab;
+	if (result)
+		AppendFloat(result->cost/100, 2);
+	else
+		AppendFloat(bridge_cost(bridge, geometry, params), 2);
+	AppendNewline;
+	for (member_index = 1; member_index <= bridge->n_members; member_index++) {
+		TXSection *xs = &bridge->members[member_index].x_section;
+		TFloat compressive = analysis->member_strength[member_index].compressive;
+		TFloat tensile = analysis->member_strength[member_index].tensile;
+		AppendInt(member_index);
+		AppendTab;
+		Append(params->shapes[xs->section][xs->size].name);
+		AppendTab;
+		Append(section_str(xs->section));
+		AppendTab;
+		Append(params->materials[xs->material].short_name);
+		AppendTab;
+		AppendFloat(geometry->length[member_index], 6);
+		AppendTab;
+		AppendFloat(analysis->max_forces[member_index].compression, 6);
+		AppendTab;
+		AppendFloat(compressive, 6);
+		AppendTab;
+		if (compressive > 0)
+			AppendFloat(analysis->max_forces[member_index].compression/compressive, 6);
+		else
+			Append("oo");
+		AppendTab;
+		switch (analysis->member_strength[member_index].compressive_fail_mode) {
+		case FailModeNone:
+			Append("OK");
+			break;
+		case FailModeSlenderness:
+			Append("Slenderness");
+			break;
+		default:
+			Append("Fail");
+			break;
+		}
+		AppendTab;
+		AppendFloat(analysis->max_forces[member_index].tension, 6);
+		AppendTab;
+		AppendFloat(tensile, 6);
+		AppendTab;
+		if (tensile > 0)
+			AppendFloat(analysis->max_forces[member_index].tension/tensile, 6);
+		else
+			Append("oo");
+		AppendTab;
+		switch (analysis->member_strength[member_index].tensile_fail_mode) {
+		case FailModeNone:
+			Append("OK");
+			break;
+		case FailModeSlenderness:
+			Append("Slenderness");
+			break;
+		default:
+			Append("Fail");
+			break;
+		}
+		AppendNewline;
+	}
+	return rtn;
+}
+
 static char *test_status_str[] = {
 	"Unrecorded",
 	"Untested",

data/ext/WPBDC/bridge.c

@@ -242,10 +242,10 @@ void canonicalize(TBridge *dst, TBridge *src)
 
 			// Ignore joints that are outside the rectangular extent of the member.
 			joint = &dst->joints[joint_index];
-			if (start->x > joint->x && end->x > joint->x ||
-				start->x < joint->x && end->x < joint->x ||
-				start->y > joint->y && end->y > joint->y ||
-				start->y < joint->y && end->y < joint->y)
+			if ((start->x > joint->x && end->x > joint->x) ||
+				(start->x < joint->x && end->x < joint->x) ||
+				(start->y > joint->y && end->y > joint->y) ||
+				(start->y < joint->y && end->y < joint->y))
 				continue;
 
 			// Check if the joint is on the line struck by the member ends.

data/ext/WPBDC/bridge_parser.c

@@ -1059,7 +1059,6 @@ void pack_bridge(STRING *in_str, STRING *out_str,
 {
 	TBridge bridge[1];
 	char *mutable_copy;
-	char *rtn = 0;
 
 	init_bridge(bridge);
 
@@ -1091,7 +1090,6 @@ void unpack_bridge(STRING *in_str, STRING *out_str,
 {
 	TBridge bridge[1];
 	char *mutable_copy;
-	char *rtn = 0;
 
 	init_bridge(bridge);
 

data/ext/WPBDC/bridge_sketch.c

@@ -54,7 +54,7 @@ void do_sketch(TBridge *bridge,
 {
 	IMAGE image[1];
 	static RGB_TRIPLE white[1] = {{255, 255, 255}};
-	static RGB_TRIPLE black[1] = {{0, 0, 0}};
+	//static RGB_TRIPLE black[1] = {{0, 0, 0}};
 	static RGB_TRIPLE gray[1] = {{192, 192, 192}};
 	RGB_TRIPLE color[1];
 	UNSIGNED bridge_width_grids;

data/ext/WPBDC/internal.h

@@ -283,8 +283,8 @@ typedef struct params_t {
 		{	/* [1] */																		\
 			"Case B (Heavy Deck, Heavy Truck)",												\
 			DEAD_LOAD_FACTOR * 120.265 + 33.097,		/* TFloat point_dead_load; */		\
-			118,										/* TFloat front_axle_load; */		\
-			118,										/* TFloat rear_axle_load; */		\
+			120,										/* TFloat front_axle_load; */		\
+			120,										/* TFloat rear_axle_load; */		\
 		},																					\
 		{	/* [2] */																		\
 			"Case C (Light Deck, Light Truck)",												\
@@ -295,11 +295,11 @@ typedef struct params_t {
 		{	/* [3] */																		\
 			"Case D (Light Deck, Heavy Truck)",												\
 			DEAD_LOAD_FACTOR * 82.608 + 33.097,			/* TFloat point_dead_load; */		\
-			118,										/* TFloat front_axle_load; */		\
-			118,										/* TFloat rear_axle_load; */		\
+			120,										/* TFloat front_axle_load; */		\
+			120,										/* TFloat rear_axle_load; */		\
 		},																					\
 	},																						\
-	300,										/* TFloat connection_cost; */				\
+	500,										/* TFloat connection_cost; */				\
 	1000,										/* TFloat ordering_fee; */					\
 	{	/* TMaterial materials[NMaterials];	*/												\
 		{																					\
@@ -309,7 +309,7 @@ typedef struct params_t {
 			250000,							/* TFloat Fy; */								\
 			7850,							/* TFloat density; */							\
 			{								/* TFloat cost[NSections]; */					\
-				3.78,							/* Bar */									\
+				4.50,							/* Bar */									\
 				6.30,							/* Tube */									\
 			}																				\
 		},																					\
@@ -320,8 +320,8 @@ typedef struct params_t {
 			345000,							/* TFloat Fy; */								\
 			7850,							/* TFloat density; */							\
 			{								/* TFloat cost[NSections]; */					\
-				4.62,							/* Bar */									\
-				7.03,							/* Tube	*/									\
+				5.00,							/* Bar */									\
+				7.00,							/* Tube	*/									\
 			}																				\
 		},																					\
 		{																					\
@@ -331,8 +331,8 @@ typedef struct params_t {
 			485000,							/* TFloat Fy; */								\
 			7850,							/* TFloat density; */							\
 			{								/* TFloat cost[NSections]; */					\
-				5.70,							/* Bar */									\
-				7.95,							/* Tube	*/									\
+				5.55,							/* Bar */									\
+				7.75,							/* Tube	*/									\
 			}																				\
 		},																					\
 	}																						\
@@ -427,6 +427,7 @@ void clear_analysis(TAnalysis *anal);
 void setup_analysis(TAnalysis *anal, TBridge *bridge, TGeometry *geometry, TLoading *loading, TParams *params);
 void do_analyze(STRING *bridge_as_string, TAnalysis *analysis, TBridge *bridge, TGeometry *geometry, TLoading *loading, TParams *params, struct analysis_result_t *result);
 char *analysis_to_html(TAnalysis *analysis, TBridge *bridge, TGeometry *geometry, TLoading *loading, TParams *params, struct analysis_result_t *result);
+char *analysis_to_text(TAnalysis *analysis, TBridge *bridge, TGeometry *geometry, TLoading *loading, TParams *params, struct analysis_result_t *result);
 void print_analysis(FILE *f, TAnalysis *anal, TBridge *bridge, TGeometry *geometry, TLoading *loading, TParams *params);
 /* bridge.c */
 void init_bridge(TBridge *bridge);

data/ext/WPBDC/judge.c

@@ -25,8 +25,8 @@
 // External interface.
 #include "judge.h"
 
-#if BD_VERSION != 0x412c
-#error Wrong BD_VERSION. Should be 0x412c.
+#if BD_VERSION != 0x414c
+#error Wrong BD_VERSION. Should be 0x414c.
 #endif
 
 // Extension stubs --------------------------------------------------------------
@@ -171,8 +171,6 @@ void sketch(STRING *bridge_as_string,
 
 char *get_local_contest_number(STRING *number_as_string)
 {
-    char *rtn;
-    
     if (number_as_string->size != SCENARIO_NUMBER_SIZE)
         return NULL;
     return local_contest_number_to_id(number_as_string->ptr);
@@ -201,15 +199,39 @@ char *analysis_table(STRING *bridge_as_string)
     return rtn;
 }
 
+char *analysis_log(STRING *bridge_as_string)
+{
+    TBridge bridge[1];
+    TParams params[1];
+    TGeometry geometry[1];
+    TLoading loading[1];
+    TAnalysis analysis[1];
+    struct analysis_result_t result[1];
+    char *rtn = 0;
+
+    do_analyze(bridge_as_string, analysis, bridge, geometry, loading, params, result);
+    if (!bridge->error)
+        rtn = analysis_to_text(analysis, bridge, geometry, loading, params, result);
+
+    clear_analysis(analysis);
+    clear_bridge(bridge);
+    clear_geometry(geometry);
+    clear_loading(loading);
+    clear_params(params);
+
+    return rtn;
+}
+
 #if defined(NATIVE_TEST) && !defined(CPROTO)
 
 //#define WRITE_EXAMPLES
 
 #ifdef WRITE_EXAMPLES
+#define PREVIOUS_YEAR_DELTA 2
 #define EG_DIR  "../../test/eg/2012"
-#define NEW_EG_DIR  "../../test/eg/2013"
+#define NEW_EG_DIR  "../../test/eg/2014"
 #else
-#define EG_DIR  "../../test/eg/2012"
+#define EG_DIR  "../../test/eg/2014"
 #endif
 
 #ifdef WINDOWS
@@ -219,6 +241,7 @@ char *analysis_table(STRING *bridge_as_string)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#include <unistd.h>
 
 void strcpyn(char *dst, char *src, int n)
 {
@@ -229,7 +252,6 @@ void strcpyn(char *dst, char *src, int n)
 
 void split_path(char *path, char *drv, char *dir, char *fname, char *ext)
 {
-    int len = strlen(path);
     char *colon, *slash, *dot;
 
     colon = strchr(path, ':');
@@ -305,7 +327,7 @@ int main(int argc, char* argv[])
     TLoading loading[1];
     TAnalysis anal[1];
     int i, n, test_case;
-    long h;
+    //long h;
     COMPRESSED_IMAGE compressed_image[1];
 
 #ifdef WRITE_EXAMPLES
@@ -355,8 +377,10 @@ int main(int argc, char* argv[])
             continue;
 
         // SINGLE TEST CASE!
+        /*
         if (strcmp(dir_ent->d_name, "semis-01.bdc") != 0)
             continue;
+        */
 
         printf("Test case %d (%s):\n", test_case, dir_ent->d_name);
         sprintf(fname, EG_DIR "/%s", dir_ent->d_name);
@@ -381,7 +405,7 @@ int main(int argc, char* argv[])
 #ifdef WRITE_EXAMPLES
 
         // Set the parser to look for last year's bridges.
-        contest_year = CONTEST_YEAR - 1;
+        contest_year = CONTEST_YEAR - PREVIOUS_YEAR_DELTA;
 #endif
 
         // Try a parse.
@@ -401,7 +425,7 @@ int main(int argc, char* argv[])
 
         if (!strstr(dir_ent->d_name, "failed")) {
 
-            struct _stat stat_buf[1];
+            struct stat stat_buf[1];
 
             n_examples_read++;
 
@@ -432,7 +456,7 @@ int main(int argc, char* argv[])
             // Write a failed version of this bridge for future testing.
             printf("writing failed version\n");
             sprintf(fname, NEW_EG_DIR "/" "%s-failed%s", name, ext);
-            if (_stat(fname, stat_buf) != 0 && induce_failure(copy, bridge, 0) == 0) {
+            if (stat(fname, stat_buf) != 0 && induce_failure(copy, bridge, 0) == 0) {
                 text = unparse_bridge(copy);
                 copy_str->ptr = text;
                 copy_str->size = strlen(text);
@@ -546,7 +570,7 @@ int main(int argc, char* argv[])
         text = analysis_table(bridge_str);
 
         if (text) {
-            printf("writing analysis...");
+            printf("writing analysis table...");
             split_path(dir_ent->d_name, 0, path, name, ext);
             sprintf(buf, "Debug/html/%s.htm", name);
             f = fopen(buf, "w");
@@ -566,6 +590,24 @@ int main(int argc, char* argv[])
             Safefree(text);
         }
 
+        // Do an analysis log.
+        text = analysis_log(bridge_str);
+
+        if (text) {
+            printf("writing analysis log...");
+            split_path(dir_ent->d_name, 0, path, name, ext);
+            sprintf(buf, "Debug/text/%s.txt", name);
+            f = fopen(buf, "w");
+            if (!f) {
+                fprintf(stderr, "can't open %s for output", buf);
+                return 4;
+            }
+            fputs(text, f);
+            fclose(f);
+
+            Safefree(text);
+        }
+
         //print_analysis(stdout, anal, bridge, geometry, loading, params);
         //printf("Cost = $%.2lf\n", (double)bridge_cost(bridge, geometry, params));
 

data/ext/WPBDC/judge.h

@@ -11,7 +11,7 @@
 #include "rubydefs.h"
 #include "sketch.h"
 
-#define CONTEST_YEAR 2012
+#define CONTEST_YEAR 2014
 #define YEAR_TO_VERSION(Y) (((((Y) % 100) / 10) << 8) | (((Y) % 10) << 4) | 0x400c)
 #define BD_VERSION YEAR_TO_VERSION(CONTEST_YEAR)
 
@@ -19,8 +19,8 @@
 #define NULL_SEMIFINAL_SCENARIO_ID "0000000000"
 
 // 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
+//#define SEMIFINAL_SCENARIO_ID "3100003100"
+#define SEMIFINAL_SCENARIO_ID NULL_SEMIFINAL_SCENARIO_ID
 
 // Status returns from analyze().
 #define BRIDGE_OK           0
@@ -142,6 +142,9 @@ void sketch(STRING *bridge_as_string,
 // Return HTML for a table of analysis data.
 char *analysis_table(STRING *bridge_as_string);
 
+// Return tab-delimited text for a table of analysis data.
+char *analysis_log(STRING *bridge_as_string);
+
 // Accept a string containing a scenario number.
 // Return a pointer to the 3-character local contest code or null if no match.
 char *get_local_contest_number(STRING *number_as_string);