From 0cbd8fdc8be9f8374c868a419fed95267e809f00 Mon Sep 17 00:00:00 2001
From: "W. Trevor King" <wking@drexel.edu>
Date: Tue, 2 Sep 2008 07:39:24 -0400
Subject: [PATCH] Fixed linker error running wlc check in check_sawsim.

Obviously, the wlc check should be in check_tension_model, but that
doesn't exist yet.  When it does, it will still need the wlc()
declaration, since wlc() is not exported directly by tension_model.h.
I also added protective #ifndef-#def-#endif protection to the headers.

TODO: Determine which modules depend on which other modules and make
the appropriate includes in the headers themselves.  Then the .c files
need only include the headers they use directly.
---
 src/sawsim.nw | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/sawsim.nw b/src/sawsim.nw
index 78ce2e7..660adc0 100644
--- a/src/sawsim.nw
+++ b/src/sawsim.nw
@@ -227,11 +227,16 @@ typedef struct environment_struct {
 @ 
 
 <<global.h>>=
+#ifndef GLOBAL_H
+#define GLOBAL_H
 <<environment definition>>
 <<one dimensional function definition>>
 <<create/destroy definitions>>
 <<model globals>>
+#endif /* GLOBAL_H */
 @ 
+Where the [[GLOBAL_H]] defines are protecting [[global.h]] from being
+included multiple times.
 
 \section{Simulation functions}
 
@@ -1402,9 +1407,12 @@ need to take care of parsing those parameters themselves.
 We implement this parsing in [[parse.c]], define the interface in [[parse.h]], and the the unit testing in [[check_parse.c]].
 
 <<parse.h>>=
+#ifndef PARSE
+#define PARSE
 <<license comment>>
 <<parse definitions>>
 <<parse declarations>>
+#endif /* PARSE */
 @ 
 
 <<parse module makefile lines>>=
@@ -1634,6 +1642,7 @@ Here we check to make sure the various functions work as expected, using \citeta
 <<definitions>>
 <<globals>>
 <<check globals>>
+<<check relative error>>
 <<functions>>
 <<test suite>>
 <<main check program>>
@@ -1705,10 +1714,13 @@ int main(void)
 @ 
 
 <<worm-like chain tests>>=
+extern double wlc(double x, double T, double p, double L);
 START_TEST(test_wlc_at_zero)
 {
-  double T=1.0, L=1.0, p=0.1, x=0.0;
-  fail_unless(wlc(x, T, p, L)==0, NULL);
+  double T=1.0, L=1.0, p=0.1, x=0.0, lim=1e-30;
+  fail_unless(abs(wlc(x, T, p, L)) < lim, \
+              "abs(wlc(x=%g,T=%g,p=%g,L=%g)) = %g >= %g",
+              x, T, p, L, abs(wlc(x, T, p, L)), lim);
 }
 END_TEST
 
@@ -1813,8 +1825,11 @@ the implementation in [[tension_balance.c]], and the unit testing in
 [[check_tension_balance.c]]
 
 <<tension-balance.h>>=
+#ifndef TENSION_BALANCE_H
+#define TENSION_BALANCE_H
 <<license comment>>
 <<tension balance function declaration>>
+#endif /* TENSION_BALANCE_H */
 @ 
 
 <<tension balance functions>>=
@@ -2155,7 +2170,7 @@ The analytic solution for a general number of springs is given in Appendix \ref{
 <<tension balance function tests>>=
 START_TEST(test_double_hooke)
 {
-  double k1=5, k2=4, x=3, last_x=2.0, F, Fe, x1e, x2e;
+  double k1=5, k2=4, x=3, last_x=-1.0, F, Fe, x1e, x2e;
   one_dim_fn_t *handlers[] = {&hooke, &hooke};
   void *data[] =             {&k1,    &k2};
   F = tension_balance(2, handlers, data, last_x, x);
@@ -2169,6 +2184,7 @@ START_TEST(test_double_hooke)
 }
 END_TEST
 @ 
+TODO: test [[tension_balance()]] with another balance after the [[x_of_xo_data]] initializing balance we ran above.
 
 <<tension balance function test case defs>>=
 TCase *tc_tbfunc = tcase_create("tension balance function");
@@ -2187,9 +2203,12 @@ Since the list handling is so general, and separable from the bulk of the simula
 The interface is defined in [[list.h]], the implementation in [[list.c]], and the unit testing in [[check_list.c]]
 
 <<list.h>>=
+#ifndef LIST_H
+#define LIST_H
 <<license comment>>
 <<list definitions>>
 <<list declarations>>
+#endif /* LIST_H */
 @ 
 
 <<list declarations>>=
@@ -2640,10 +2659,13 @@ Because this functionality is independent of the rest of the simulation, we'll s
 The interface is defined in [[string_eval.h]], the implementation in [[string_eval.c]], and the unit testing in [[check_string_eval.c]].
 
 <<string-eval.h>>=
+#ifndef STRING_EVAL_H
+#define STRING_EVAL_H
 <<license comment>>
 <<string eval setup declaration>>
 <<string eval function declaration>>
 <<string eval teardown declaration>>
+#endif /* STRING_EVAL_H */
 @ 
 
 <<string eval module makefile lines>>=
@@ -2960,8 +2982,11 @@ That's only 15 calls per solution, so the search algorithm seems reasonable.
 The number of evaluation calls could be drastically reduced, however, by implementing an $x(x_0)$ lookup table.
 
 <<accel-k.h>>=
+#ifndef ACCEL_K_H
+#define ACCEL_K_H
 double accel_k(k_func_t *k, double F, environment_t *env, void *params);
 void free_accels();
+#endif /* ACCEL_K_H */
 @ 
 
 <<accel k module makefile lines>>=
@@ -3056,6 +3081,8 @@ Because these models are independent of the rest of the simulation, we'll split
 The interface is defined in [[tension_model.h]], the implementation in [[tension_model.c]], the unit testing in [[check_k_model.c]], and some other tidbits in [[tension_model_utils.c]].
 
 <<tension-model.h>>=
+#ifndef TENSION_MODEL_H
+#define TENSION_MODEL_H
 <<license comment>>
 <<tension handler types>>
 <<constant tension model declarations>>
@@ -3064,6 +3091,7 @@ The interface is defined in [[tension_model.h]], the implementation in [[tension
 <<freely-jointed chain tension model declarations>>
 <<find tension definitions>>
 <<tension model global declarations>>
+#endif /* TENSION_MODEL_H */
 @ 
 
 <<tension model module makefile lines>>=
@@ -3794,6 +3822,8 @@ but then your [[notangle]]s would look like [[notangle -R'k model.h']],
 which I don't like as much.
 
 <<k-model.h>>=
+#ifndef K_MODEL_H
+#define K_MODEL_H
 <<license comment>>
 <<k func definition>>
 <<null k declarations>>
@@ -3801,6 +3831,7 @@ which I don't like as much.
 <<bell k declarations>>
 <<kramers k declarations>>
 <<kramers integ k declarations>>
+#endif /* K_MODEL_H */
 @ 
 
 <<k model module makefile lines>>=
-- 
2.26.2