X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffactor_stats.h;h=cf660c6a1b25ec7634113ddd0e3c0fc91c0b8711;hb=cd7b08ad5e6bbec75e778acf008f84e1eb548154;hp=c7f1216221f5401fa8444f4c0888c9483012ac54;hpb=eeb3352d718b0cd85afab3f7a7466fcac7791c1c;p=pspp-builds.git

diff --git a/src/factor_stats.h b/src/factor_stats.h
index c7f12162..cf660c6a 100644
--- a/src/factor_stats.h
+++ b/src/factor_stats.h
@@ -28,25 +28,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "hash.h"
 #include "val.h"
 
-struct weighted_value 
-{
-  union value v;
-
-  /* The weight */
-  double w;
-
-  /* The cumulative weight */
-  double cc; 
-
-  /* The rank */
-  double rank;
-};
-
-
-
 struct metrics
 {
   double n;
+
+  double n_missing;
   
   double ssq;
   
@@ -66,45 +52,88 @@ struct metrics
 
   double trimmed_mean;
 
-  /* An ordered arary of data for this factor */
+  /* A hash of data for this factor */
   struct hsh_table *ordered_data;
 
-  /* An SORTED array of weighted values */
+  /* A SORTED array of weighted values */
   struct weighted_value *wv;
 };
 
 
 
+
+void metrics_precalc(struct metrics *m);
+
+void metrics_calc(struct metrics *m, const union value *f, double weight, 
+		  int case_no);
+
+void metrics_postcalc(struct metrics *m);
+
+
+/* Linked list of case nos */
+struct case_node
+{
+  int num;
+  struct case_node *next;
+};
+
+struct weighted_value 
+{
+  union value v;
+
+  /* The weight */
+  double w;
+
+  /* The cumulative weight */
+  double cc; 
+
+  /* The rank */
+  double rank;
+
+  /* Linked list of cases nos which have this value */
+  struct case_node *case_nos;
+  
+};
+
+
+struct weighted_value *weighted_value_create(void);
+
+void weighted_value_free(struct weighted_value *wv);
+
+
+
 struct factor_statistics {
 
-  /* The value of the independent variable for this factor */
-  const union value *id;
+  /* The value of the independent variable */
+  union value id[2];
 
-  /* An array of metrics indexed by dependent variable */
-  struct metrics *stats;
+  /* The an array stats for this factor, one for each dependent var */
+  struct metrics *m;
 
 };
 
 
+/* Create a factor statistics object with for N dependent vars
+   and ID as the value of the independent variable */
+struct factor_statistics * 
+create_factor_statistics (int n, union value *id0, union value *id1);
 
-void metrics_precalc(struct metrics *fs);
 
-void metrics_calc(struct metrics *fs, const union value *f, double weight);
+void factor_statistics_free(struct factor_statistics *f);
 
-void metrics_postcalc(struct metrics *fs);
 
+int 
+factor_statistics_compare(const struct factor_statistics *f0,
+	                  const struct factor_statistics *f1, void *aux);
 
+			      
 
+unsigned int 
+factor_statistics_hash(const struct factor_statistics *f, void *aux);
 
-/* These functions are necessary for creating hashes */
 
-int compare_indep_values(const struct factor_statistics *f1, 
-		     const struct factor_statistics *f2, 
-		     int width);
 
-unsigned hash_indep_value(const struct factor_statistics *f, int width) ;
 
-void  free_factor_stats(struct factor_statistics *f, int width );
 
 
 #endif