X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flevene.c;h=5de5220588564cb6674fd20aa04e21279dd3f0bf;hb=92fb12eb06716d14c05b781f5d9dcde956d77c30;hp=67d8c374811d3508f851e6cee1d16b55d293893c;hpb=e976a0fa28771a625ba29b86cc5883838d0f1c70;p=pspp

diff --git a/src/levene.c b/src/levene.c
index 67d8c37481..5de5220588 100644
--- a/src/levene.c
+++ b/src/levene.c
@@ -16,14 +16,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "levene.h"
 #include "error.h"
 #include "case.h"
 #include "casefile.h"
+#include "dictionary.h"
+#include "group_proc.h"
 #include "hash.h"
 #include "str.h"
 #include "var.h"
@@ -55,8 +57,6 @@
 
  */
 
-static struct group_statistics *get_group(int v, struct group_statistics *key);
-
 
 struct levene_info
 {
@@ -68,7 +68,7 @@ struct levene_info
   struct variable *v_indep; 
 
   /* Number of dependent variables */
-  int n_dep;
+  size_t n_dep;
 
   /* The dependent variables */
   struct variable  **v_dep;
@@ -77,8 +77,7 @@ struct levene_info
   enum lev_missing missing;
 
   /* Function to test for missing values */
-  is_missing_func is_missing;
-
+  is_missing_func *is_missing;
 };
 
 /* First pass */
@@ -95,7 +94,7 @@ static void levene2_postcalc (void *);
 
 void  
 levene(const struct casefile *cf,
-       struct variable *v_indep, int n_dep, struct variable **v_dep,
+       struct variable *v_indep, size_t n_dep, struct variable **v_dep,
 	     enum lev_missing missing,   is_missing_func value_is_missing)
 {
   struct casereader *r;
@@ -132,8 +131,6 @@ levene(const struct casefile *cf,
 
 }
 
-static struct hsh_table **hash;
-
 /* Internal variables used in calculating the Levene statistic */
 
 /* Per variable statistics */
@@ -155,44 +152,33 @@ struct lz_stats
 /* An array of lz_stats for each variable */
 static struct lz_stats *lz;
 
-/* Set to 1 if the groups require inequality comparisions */ 
-static int inequality_compare;
-
 
 static void 
 levene_precalc (const struct levene_info *l)
 {
-  int i;
+  size_t i;
 
-  lz  = xmalloc (sizeof (struct lz_stats ) * l->n_dep ) ;
+  lz = xnmalloc (l->n_dep, sizeof *lz);
 
-  hash = xmalloc (sizeof ( struct hsh_table *) * l->n_dep );
-
-  for(i=0; i < l->n_dep ; ++i ) 
+  for(i = 0; i < l->n_dep ; ++i ) 
     {
-      struct variable *v = l->v_dep[i];
-      int g;
-      int number_of_groups = v->p.grp_data.n_groups ; 
-
-      hash[i] = hsh_create (l->n_dep * number_of_groups,
-			    (hsh_compare_func *) compare_group, 
-			    (hsh_hash_func *) hash_group,
-			    0,(void *) l->v_indep->width);
+      struct variable *var = l->v_dep[i];
+      struct group_proc *gp = group_proc_get (var);
+      struct group_statistics *gs;
+      struct hsh_iterator hi;
 
       lz[i].grand_total = 0;
       lz[i].total_n = 0;
-      lz[i].n_groups = number_of_groups;
+      lz[i].n_groups = gp->n_groups ; 
 
-      for (g = 0 ; g < v->p.grp_data.n_groups ; ++g ) 
+      
+      for ( gs = hsh_first(gp->group_hash, &hi);
+	    gs != 0;
+	    gs = hsh_next(gp->group_hash, &hi))
 	{
-	  struct group_statistics *gs = &v->p.grp_data.gs[g];
 	  gs->lz_total = 0;
-	  hsh_insert(hash[i], gs);
-	  if ( gs->criterion != CMP_EQ ) 
-	    {
-	      inequality_compare = 1;
-	    }
 	}
+	    
     }
 
 }
@@ -200,14 +186,13 @@ levene_precalc (const struct levene_info *l)
 static int 
 levene_calc (const struct ccase *c, void *_l)
 {
-  int i;
+  size_t i;
   int warn = 0;
   struct levene_info *l = (struct levene_info *) _l;
   const union value *gv = case_data (c, l->v_indep->fv);
   struct group_statistics key;
   double weight = dict_get_case_weight(default_dict,c,&warn); 
 
-
   /* Skip the entire case if /MISSING=LISTWISE is set */
   if ( l->missing == LEV_LISTWISE ) 
     {
@@ -216,7 +201,7 @@ levene_calc (const struct ccase *c, void *_l)
 	  struct variable *v = l->v_dep[i];
 	  const union value *val = case_data (c, v->fv);
 
-	  if (l->is_missing(val,v) )
+	  if (l->is_missing (&v->miss, val) )
 	    {
 	      return 0;
 	    }
@@ -225,19 +210,21 @@ levene_calc (const struct ccase *c, void *_l)
 
   
   key.id = *gv;
-  key.criterion = CMP_EQ;
 
   for (i = 0; i < l->n_dep; ++i) 
     {
       struct variable *var = l->v_dep[i];
+      struct group_proc *gp = group_proc_get (var);
       double levene_z;
       const union value *v = case_data (c, var->fv);
       struct group_statistics *gs;
-      gs = get_group(i,&key); 
+
+      gs = hsh_find(gp->group_hash,(void *) &key );
+
       if ( 0 == gs ) 
 	continue ;
 
-      if ( ! l->is_missing(v,var))
+      if ( ! l->is_missing(&var->miss, v))
 	{
 	  levene_z= fabs(v->f - gs->mean);
 	  lz[i].grand_total += levene_z * weight;
@@ -245,6 +232,7 @@ levene_calc (const struct ccase *c, void *_l)
 
 	  gs->lz_total += levene_z * weight;
 	}
+
     }
   return 0;
 }
@@ -253,16 +241,17 @@ levene_calc (const struct ccase *c, void *_l)
 static void 
 levene_postcalc (void *_l)
 {
-  int v;
+  size_t v;
 
   struct levene_info *l = (struct levene_info *) _l;
 
   for (v = 0; v < l->n_dep; ++v) 
     {
+      /* This is Z_LL */
       lz[v].grand_mean = lz[v].grand_total / lz[v].total_n ;
-
     }
 
+  
 }
 
 
@@ -272,22 +261,27 @@ static double *lz_denominator;
 static void 
 levene2_precalc (void *_l)
 {
-  int v;
+  size_t v;
 
   struct levene_info *l = (struct levene_info *) _l;
 
-  lz_denominator = (double *) xmalloc(sizeof(double) * l->n_dep);
+  lz_denominator = xnmalloc (l->n_dep, sizeof *lz_denominator);
 
   /* This stuff could go in the first post calc . . . */
   for (v = 0; v < l->n_dep; ++v) 
     {
       struct hsh_iterator hi;
       struct group_statistics *g;
-      for(g = (struct group_statistics *) hsh_first(hash[v],&hi);
+
+      struct variable *var = l->v_dep[v] ;
+      struct hsh_table *hash = group_proc_get (var)->group_hash;
+
+
+      for(g = (struct group_statistics *) hsh_first(hash,&hi);
 	  g != 0 ;
-	  g = (struct group_statistics *) hsh_next(hash[v],&hi) )
+	  g = (struct group_statistics *) hsh_next(hash,&hi) )
 	{
-	  g->lz_mean = g->lz_total/g->n ;
+	  g->lz_mean = g->lz_total / g->n ;
 	}
       lz_denominator[v] = 0;
   }
@@ -296,7 +290,7 @@ levene2_precalc (void *_l)
 static int 
 levene2_calc (const struct ccase *c, void *_l)
 {
-  int i;
+  size_t i;
   int warn = 0;
 
   struct levene_info *l = (struct levene_info *) _l;
@@ -314,7 +308,7 @@ levene2_calc (const struct ccase *c, void *_l)
 	  struct variable *v = l->v_dep[i];
 	  const union value *val = case_data (c, v->fv);
 
-	  if (l->is_missing(val,v) )
+	  if (l->is_missing(&v->miss, val) )
 	    {
 	      return 0;
 	    }
@@ -322,7 +316,6 @@ levene2_calc (const struct ccase *c, void *_l)
     }
 
   key.id = *gv;
-  key.criterion = CMP_EQ;
 
   for (i = 0; i < l->n_dep; ++i) 
     {
@@ -330,11 +323,13 @@ levene2_calc (const struct ccase *c, void *_l)
       struct variable *var = l->v_dep[i] ;
       const union value *v = case_data (c, var->fv);
       struct group_statistics *gs;
-      gs = get_group(i,&key); 
+
+      gs = hsh_find(group_proc_get (var)->group_hash,(void *) &key );
+
       if ( 0 == gs ) 
 	continue;
 
-      if ( ! l->is_missing(v,var) )
+      if ( ! l->is_missing (&var->miss, v) )
 	{
 	  levene_z = fabs(v->f - gs->mean); 
 	  lz_denominator[i] += weight * pow2(levene_z - gs->lz_mean);
@@ -348,7 +343,7 @@ levene2_calc (const struct ccase *c, void *_l)
 static void 
 levene2_postcalc (void *_l)
 {
-  int v;
+  size_t v;
 
   struct levene_info *l = (struct levene_info *) _l;
 
@@ -357,74 +352,27 @@ levene2_postcalc (void *_l)
       double lz_numerator = 0;
       struct hsh_iterator hi;
       struct group_statistics *g;
-      for(g = (struct group_statistics *) hsh_first(hash[v],&hi);
+
+      struct variable *var = l->v_dep[v] ;
+      struct group_proc *gp = group_proc_get (var);
+      struct hsh_table *hash = gp->group_hash;
+
+      for(g = (struct group_statistics *) hsh_first(hash,&hi);
 	  g != 0 ;
-	  g = (struct group_statistics *) hsh_next(hash[v],&hi) )
+	  g = (struct group_statistics *) hsh_next(hash,&hi) )
 	{
-
 	  lz_numerator += g->n * pow2(g->lz_mean - lz[v].grand_mean );
-      
-
 	}
-      lz_numerator *= ( l->v_dep[v]->p.grp_data.ugs.n - 
-			l->v_dep[v]->p.grp_data.n_groups );
+      lz_numerator *= ( gp->ugs.n - gp->n_groups );
+
+      lz_denominator[v] *= (gp->n_groups - 1);
+
+      gp->levene = lz_numerator / lz_denominator[v] ;
 
-      lz_denominator[v] /= (l->v_dep[v]->p.grp_data.n_groups - 1);
-      
-      l->v_dep[v]->p.grp_data.levene = lz_numerator/lz_denominator[v] ;
     }
 
   /* Now clear up after ourselves */
   free(lz_denominator);
-  for (v = 0; v < l->n_dep; ++v) 
-    {
-      hsh_destroy(hash[v]);
-    }
-
-  free(hash);
   free(lz);
 }
 
-
-/* Return the group belonging to the v_th dependent variable
-   which matches the key */
-static struct group_statistics *
-get_group(int v, struct group_statistics *key)
-{
-  struct group_statistics *gs;
-  gs = hsh_find(hash[v],key);
-
-
-  if ( ( !gs )  && inequality_compare) 
-    {
-      /* Here we degrade to a linear search.
-	 This would seem inefficient.  However, it should only ever happen 
-	 with the T-TEST, for which there are exactly two groups */
-
-      struct hsh_iterator hi;
-
-      assert( hsh_count(hash[v]) == 2 ) ;
-      for(gs = (struct group_statistics *) hsh_first(hash[v],&hi);
-	  gs != 0 ;
-	  gs = (struct group_statistics *) hsh_next(hash[v],&hi) )
-	{
-	  int cmp;
-
-	  cmp = compare_values(&gs->id, &key->id, 0);
-
-	  assert( cmp != 0 ); /* or else the hash would have found something */
-
-	  if ( cmp == -1 && 
-	       ( gs->criterion == CMP_GT || gs->criterion == CMP_GE ) 
-	     ) 
-	    break;
-
-	  if ( cmp == 1 && 
-	       ( gs->criterion == CMP_LT || gs->criterion == CMP_LE ) 
-	     ) 
-	    break;
-	}
-    }
-
-  return gs;
-}