X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Ffactor_stats.c;h=29eebed2d5e6015f801724c450ab83f980c4e0a4;hb=4f31116689eeda21658601c6ecf75a915b80103b;hp=2b9c48a6bd01a3e8ff5f0eeb84b2944977ac3ef4;hpb=5501903810bcbae487b12bc44d9cbedf29644d96;p=pspp

diff --git a/src/factor_stats.c b/src/factor_stats.c
index 2b9c48a6bd..29eebed2d5 100644
--- a/src/factor_stats.c
+++ b/src/factor_stats.c
@@ -15,22 +15,23 @@ 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
@@ -43,6 +44,7 @@ metrics_precalc(struct metrics *m)
   m->min = DBL_MAX;
   m->max = -DBL_MAX;
 
+  m->histogram = 0;
 
   m->moments = moments1_create(MOMENT_KURTOSIS);
 
@@ -51,9 +53,6 @@ metrics_precalc(struct metrics *m)
 				(hsh_hash_func *) hash_value,
 				(hsh_free_func *) weighted_value_free,
 				(void *) 0);
-
-  m->histogram = gsl_histogram_alloc(10);
-
 }
 
 
@@ -94,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;
 
@@ -108,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;
@@ -126,7 +125,6 @@ metrics_postcalc(struct metrics *m)
   int i;
   int j = 1;  
 
-
   moments1_calculate (m->moments, &m->n, &m->mean, &m->var, 
 		      &m->skewness, &m->kurtosis);
 
@@ -144,20 +142,25 @@ metrics_postcalc(struct metrics *m)
   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;
@@ -169,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 ) 
     {
@@ -180,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 ) 
     {
@@ -192,14 +208,6 @@ metrics_postcalc(struct metrics *m)
   m->trimmed_mean /= 0.9 * m->n ;
 
 
-  gsl_histogram_set_ranges_uniform(m->histogram, m->min, m->max);
-
-  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);
-    }
-
 }
 
 
@@ -207,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;
@@ -218,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)
     {
@@ -243,21 +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);
-  gsl_histogram_free(f->m->histogram);
+
+  int i; 
+  for ( i = 0 ; i < f->n_var; ++i ) 
+       metrics_destroy(&f->m[i]);
   free(f->m) ; 
   free(f);
 }