Added type 3 sums of squares to GLM

[pspp-builds.git] / src / math / categoricals.c

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index 215f4d1fbc89ca5d406fae4a196bb4797e6cdac0..f40ae10b5d7dca7714cf8aea4e88314792bea795 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -177,7 +177,7 @@ categoricals_dump (const struct categoricals *cat)
 
   printf ("\nReverse variable map:\n");
 
-  for (v = 0 ; v < cat->n_cats_total; ++v)
+  for (v = 0 ; v < cat->n_cats_total - cat->n_vars; ++v)
     printf ("%d ", cat->reverse_variable_map[v]);
   printf ("\n");
 }
@@ -323,7 +323,7 @@ categoricals_done (const struct categoricals *cat_)
   int v;
   int idx = 0;
   cat->reverse_variable_map = pool_calloc (cat->pool,
-                                          cat->n_cats_total,
+                                          cat->n_cats_total - cat->n_vars,
                                           sizeof *cat->reverse_variable_map);
   
   for (v = 0 ; v < cat->n_vp; ++v)
@@ -349,12 +349,11 @@ categoricals_done (const struct categoricals *cat_)
 
       /* Populate the reverse variable map.
        */
-      for (i = 0; i < vp->n_cats; ++i)
+      for (i = 0; i < vp->n_cats - 1; ++i)
        cat->reverse_variable_map[idx++] = v;
     }
 
   assert (cat->n_vars <= cat->n_vp);
-
 }
 
 
@@ -363,7 +362,7 @@ reverse_variable_lookup (const struct categoricals *cat, int subscript)
 {
   assert (cat->reverse_variable_map);
   assert (subscript >= 0);
-  assert (subscript < cat->n_cats_total);
+  assert (subscript < cat->n_cats_total - cat->n_vars);
 
   return cat->reverse_variable_map[subscript];
 }