X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffactor_stats.c;h=29eebed2d5e6015f801724c450ab83f980c4e0a4;hb=bbe7ad1a7454599693c188fe1eaf8f5d6e154206;hp=6794043cec20f5151e712fe4b63c63b184a112e7;hpb=f62199cac6213ed1c03ffe48450a583da0fadc68;p=pspp-builds.git

diff --git a/src/factor_stats.c b/src/factor_stats.c
index 6794043c..29eebed2 100644
--- a/src/factor_stats.c
+++ b/src/factor_stats.c
@@ -15,41 +15,44 @@ General Public License for more details.
 
 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 "factor_stats.h"
-#include "config.h"
 #include "val.h"
 #include "hash.h"
 #include "algorithm.h"
 #include "alloc.h"
+#include "moments.h"
+#include "percentiles.h"
 
 #include <stdlib.h>
 #include <math.h>
 #include <float.h>
 #include <assert.h>
-
+#include <chart.h>
 
 
 void
-metrics_precalc(struct metrics *fs)
+metrics_precalc(struct metrics *m)
 {
-  assert (fs) ;
+  assert (m) ;
+
+  m->n_missing = 0;
+
+  m->min = DBL_MAX;
+  m->max = -DBL_MAX;
 
-  fs->n = 0;
-  fs->n_missing = 0;
-  fs->ssq = 0;
-  fs->sum = 0;
-  fs->min = DBL_MAX;
-  fs->max = -DBL_MAX;
+  m->histogram = 0;
 
-  fs->ordered_data = hsh_create(20,
+  m->moments = moments1_create(MOMENT_KURTOSIS);
+
+  m->ordered_data = hsh_create(20,
 				(hsh_compare_func *) compare_values,
 				(hsh_hash_func *) hash_value,
 				(hsh_free_func *) weighted_value_free,
 				(void *) 0);
-
 }
 
 
@@ -70,9 +73,9 @@ metrics_calc(struct metrics *fs, const union value *val,
     }
 
   x = val->f;
-  fs->n    += weight;
-  fs->ssq  += x * x * weight;
-  fs->sum  += x * weight;
+
+  moments1_add(fs->moments, x, weight);
+
 
   if ( x < fs->min) fs->min = x;
   if ( x > fs->max) fs->max = x;
@@ -90,7 +93,7 @@ metrics_calc(struct metrics *fs, const union value *val,
       assert( (*wv)->v.f == val->f );
       (*wv)->w += weight;      
 
-      cn = xmalloc( sizeof (struct case_node) ) ;
+      cn = xmalloc ( sizeof *cn);
       cn->next = (*wv)->case_nos ;
       cn->num = case_no;
 
@@ -104,7 +107,7 @@ metrics_calc(struct metrics *fs, const union value *val,
       (*wv)->v = *val;
       (*wv)->w = weight;
       
-      cn = xmalloc( sizeof (struct case_node) ) ;
+      cn = xmalloc (sizeof *cn);
       cn->next=0;
       cn->num = case_no;
       (*wv)->case_nos  = cn;
@@ -116,42 +119,48 @@ metrics_calc(struct metrics *fs, const union value *val,
 void
 metrics_postcalc(struct metrics *m)
 {
-  double sample_var; 
   double cc = 0.0;
   double tc ;
   int k1, k2 ;
   int i;
   int j = 1;  
 
-  m->mean = m->sum / m->n;
+  moments1_calculate (m->moments, &m->n, &m->mean, &m->var, 
+		      &m->skewness, &m->kurtosis);
 
-  sample_var = ( m->ssq / m->n  - m->mean * m->mean );
+  moments1_destroy (m->moments);
 
-  m->var  = m->n * sample_var / ( m->n - 1) ;
-  m->stddev = sqrt(m->var);
 
+  m->stddev = sqrt(m->var);
 
   /* FIXME: Check this is correct ???
      Shouldn't we use the sample variance ??? */
-  m->stderr = sqrt (m->var / m->n) ;
+  m->se_mean = sqrt (m->var / m->n) ;
+
+
 
   m->wvp = (struct weighted_value **) hsh_sort(m->ordered_data);
   m->n_data = hsh_count(m->ordered_data);
 
-  if ( m->n_data == 0 ) 
+  /* Trimmed mean calculation */
+  if ( m->n_data <= 1 ) 
     {
       m->trimmed_mean = m->mean;
       return;
     }
 
+  m->histogram = histogram_create(10, m->min, m->max);
 
-  /* Trimmed mean calculation */
+  for ( i = 0 ; i < m->n_data ; ++i ) 
+    {
+      struct weighted_value **wv = (m->wvp) ;
+      gsl_histogram_accumulate(m->histogram, wv[i]->v.f, wv[i]->w);
+    }
 
   tc = m->n * 0.05 ;
   k1 = -1;
   k2 = -1;
 
-
   for ( i = 0 ; i < m->n_data ; ++i ) 
     {
       cc += m->wvp[i]->w;
@@ -163,9 +172,10 @@ metrics_postcalc(struct metrics *m)
       
       if ( cc < tc ) 
 	k1 = i;
-
     }
 
+  
+
   k2 = m->n_data;
   for ( i = m->n_data -1  ; i >= 0; --i ) 
     {
@@ -174,6 +184,18 @@ metrics_postcalc(struct metrics *m)
     }
 
 
+  /* Calculate the percentiles */
+  ptiles(m->ptile_hash, m->wvp, m->n_data, m->n, m->ptile_alg);
+
+  tukey_hinges(m->wvp, m->n_data, m->n, m->hinge);
+
+  /* Special case here */
+  if ( k1 + 1 == k2 ) 
+    {
+      m->trimmed_mean = m->wvp[k2]->v.f;
+      return;
+    }
+
   m->trimmed_mean = 0;
   for ( i = k1 + 2 ; i <= k2 - 1 ; ++i ) 
     {
@@ -185,6 +207,7 @@ metrics_postcalc(struct metrics *m)
   m->trimmed_mean += (m->wvp[k1 + 1]->cc - tc) * m->wvp[k1 + 1]->v.f ;
   m->trimmed_mean /= 0.9 * m->n ;
 
+
 }
 
 
@@ -192,7 +215,7 @@ struct weighted_value *
 weighted_value_create(void)
 {
   struct weighted_value *wv;
-  wv = xmalloc (sizeof (struct weighted_value ));
+  wv = xmalloc (sizeof *wv);
 
   wv->cc = 0;
   wv->case_nos = 0;
@@ -203,7 +226,12 @@ weighted_value_create(void)
 void 
 weighted_value_free(struct weighted_value *wv)
 {
-  struct case_node *cn = wv->case_nos;
+  struct case_node *cn ;
+
+  if ( !wv ) 
+    return ;
+
+  cn = wv->case_nos;
 
   while(cn)
     {
@@ -228,20 +256,34 @@ create_factor_statistics (int n, union value *id0, union value *id1)
 {
   struct factor_statistics *f;
 
-  f =  xmalloc( sizeof  ( struct factor_statistics ));
+  f = xmalloc (sizeof *f);
 
   f->id[0] = *id0;
   f->id[1] = *id1;
-  f->m = xmalloc( sizeof ( struct metrics ) * n ) ;
+  f->m = xnmalloc (n, sizeof *f->m);
+  memset (f->m, 0, sizeof(struct metrics) * n);
+  f->n_var = n;
 
   return f;
 }
 
 
+void 
+metrics_destroy(struct metrics *m)
+{
+  hsh_destroy(m->ordered_data);
+  hsh_destroy(m->ptile_hash);
+  if ( m-> histogram ) 
+    gsl_histogram_free(m->histogram);
+}
+
 void
 factor_statistics_free(struct factor_statistics *f)
 {
-  hsh_destroy(f->m->ordered_data);
+
+  int i; 
+  for ( i = 0 ; i < f->n_var; ++i ) 
+       metrics_destroy(&f->m[i]);
   free(f->m) ; 
   free(f);
 }
@@ -251,7 +293,7 @@ factor_statistics_free(struct factor_statistics *f)
 
 int 
 factor_statistics_compare(const struct factor_statistics *f0,
-	                  const struct factor_statistics *f1, void *aux)
+	                  const struct factor_statistics *f1, int width)
 {
 
   int cmp0;
@@ -259,7 +301,7 @@ factor_statistics_compare(const struct factor_statistics *f0,
   assert(f0);
   assert(f1);
 
-  cmp0 = compare_values(&f0->id[0], &f1->id[0], aux);
+  cmp0 = compare_values(&f0->id[0], &f1->id[0], width);
 
   if ( cmp0 != 0 ) 
     return cmp0;
@@ -271,20 +313,20 @@ factor_statistics_compare(const struct factor_statistics *f0,
   if ( ( f0->id[1].f != SYSMIS )  && (f1->id[1].f == SYSMIS) ) 
     return -1;
 
-  return compare_values(&f0->id[1], &f1->id[1], aux);
+  return compare_values(&f0->id[1], &f1->id[1], width);
   
 }
 
 unsigned int 
-factor_statistics_hash(const struct factor_statistics *f, void *aux)
+factor_statistics_hash(const struct factor_statistics *f, int width)
 {
   
   unsigned int h;
 
-  h = hash_value(&f->id[0], aux);
+  h = hash_value(&f->id[0], width);
   
   if ( f->id[1].f != SYSMIS )
-    h += hash_value(&f->id[1], aux);
+    h += hash_value(&f->id[1], width);
 
 
   return h;