Changeset 2046 for trunk/gsdl

Timestamp:

2001-02-22T14:35:03+13:00 (23 years ago)

Author:

jrm21

Message:

Fixed bug that caused perf_hash to fail for lexicon of < 4 words.
Added a #define to increase size of n (for vertices in the graph) as we
need to allocate more memory somewhere else before calling tree_builder()

File:

• trunk/gsdl/packages/mg/lib/perf_hash.c (modified) (4 diffs)

trunk/gsdl/packages/mg/lib/perf_hash.c

@@ -30 +30 @@
 /*
    $Log$
+   Revision 1.2  2001/02/22 01:35:03  jrm21
+   Fixed bug that caused perf_hash to fail for lexicon of < 4 words.
+   Added a #define to increase size of n (for vertices in the graph) as we
+   need to allocate more memory somewhere else before calling tree_builder()
+
    Revision 1.1  1999/08/10 21:16:57  sjboddie
    renamed mg-1.3d directory mg
@@ -85 +90 @@
 static int MAX_N;
 
-
+/* An arbitrary amount to add to both MAX_N and n for building tree/acyclic
+   graph -- John McPherson - jrm21 (22-02-2001) */
+#define MAX_N_HEADROOM  100
 
 
@@ -342 +349 @@
   do
     {
-      *n = (int) (num * c + 1);
+      /* Added variable - need to increase MAX_N on allocate as well */
+      *n = (int) (num * c + MAX_N_HEADROOM); /* john mcpherson 22-02-2001 */
+
       /* initialize tables of random integers */
       for (i = 0; i < MAX_CH; i++)
@@ -770 +779 @@
   MAX_M = num + 1;
 
-  MAX_N = MAX_M + MAX_M / 4;
+  /* For extremely small lexicons (<4 words), this isn't good enough! 
+   -- John McPherson jrm21 22-02-2001 */
+  /* MAX_N = MAX_M + MAX_M / 4; */
+  MAX_N = (int)(ceil (1.25 * MAX_M)); 
+  /* Add some space for "experimentation" of n in tree_builder() */
+  MAX_N += MAX_N_HEADROOM;
 
   if (allocate_memory () == -1)