X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.q;h=a09ecc100759b76d2ecf4d682a050c9999be79f5;hb=37f8a4cc05e3e99f0219ed2765ed242e63464857;hp=fdb19b0391f9c23dec4e036217e40b9bfa6af466;hpb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;p=pspp-builds.git

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index fdb19b03..a09ecc10 100644
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -251,12 +251,12 @@ static void calc_stats (const struct variable *v, double d[frq_n_stats]);
 
 static void precalc (struct casereader *, struct dataset *);
 static void calc (const struct ccase *, const struct dataset *);
-static void postcalc (void);
+static void postcalc (const struct dataset *);
 
 static void postprocess_freq_tab (const struct variable *);
-static void dump_full (const struct variable *);
-static void dump_condensed (const struct variable *);
-static void dump_statistics (const struct variable *, int show_varname);
+static void dump_full ( const struct variable *, const struct variable *);
+static void dump_condensed (const struct variable *, const struct variable *);
+static void dump_statistics (const struct variable *, bool show_varname, const struct variable *);
 static void cleanup_freq_tab (const struct variable *);
 
 static hsh_compare_func compare_value_numeric_a, compare_value_alpha_a;
@@ -381,7 +381,7 @@ internal_cmd_frequencies (struct lexer *lexer, struct dataset *ds)
       precalc (group, ds);
       for (; casereader_read (group, &c); case_destroy (&c))
         calc (&c, ds);
-      postcalc ();
+      postcalc (ds);
     }
   ok = casegrouper_destroy (grouper);
   ok = proc_commit (ds) && ok;
@@ -538,10 +538,11 @@ precalc (struct casereader *input, struct dataset *ds)
   struct ccase c;
   size_t i;
 
-  if (!casereader_peek (input, 0, &c))
-    return;
-  output_split_file_values (ds, &c);
-  case_destroy (&c);
+  if (casereader_peek (input, 0, &c))
+    {
+      output_split_file_values (ds, &c);
+      case_destroy (&c);
+    }
 
   pool_destroy (data_pool);
   data_pool = pool_create ();
@@ -558,8 +559,10 @@ precalc (struct casereader *input, struct dataset *ds)
 /* Finishes up with the variables after frequencies have been
    calculated.  Displays statistics, percentiles, ... */
 static void
-postcalc (void)
+postcalc (const struct dataset *ds)
 {
+  const struct dictionary *dict = dataset_dict (ds);
+  const struct variable *wv = dict_get_weight (dict);
   size_t i;
 
   for (i = 0; i < n_variables; i++)
@@ -579,16 +582,16 @@ postcalc (void)
 	switch (cmd.cond)
 	  {
 	  case FRQ_CONDENSE:
-	    dump_condensed (v);
+	    dump_condensed (v, wv);
 	    break;
 	  case FRQ_STANDARD:
-	    dump_full (v);
+	    dump_full (v, wv);
 	    break;
 	  case FRQ_ONEPAGE:
 	    if (n_categories > cmd.onepage_limit)
-	      dump_condensed (v);
+	      dump_condensed (v, wv);
 	    else
-	      dump_full (v);
+	      dump_full (v, wv);
 	    break;
 	  default:
             NOT_REACHED ();
@@ -598,7 +601,7 @@ postcalc (void)
 
       /* Statistics. */
       if (n_stats)
-	dump_statistics (v, !dumped_freq_tab);
+	dump_statistics (v, !dumped_freq_tab, wv);
 
 
 
@@ -765,7 +768,7 @@ frq_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_freque
       vf->groups = NULL;
       vf->width = var_get_width (v);
       vf->print = *var_get_print_format (v);
-      if (vf->width > MAX_SHORT_STRING && get_algorithm () == COMPATIBLE)
+      if (vf->width > MAX_SHORT_STRING && settings_get_algorithm () == COMPATIBLE)
         {
           enum fmt_type type = var_get_print_format (v)->type;
           vf->width = MAX_SHORT_STRING;
@@ -1033,8 +1036,9 @@ full_dim (struct tab_table *t, struct outp_driver *d)
 
 /* Displays a full frequency table for variable V. */
 static void
-dump_full (const struct variable *v)
+dump_full (const struct variable *v, const struct variable *wv)
 {
+  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0;
   int n_categories;
   struct var_freqs *vf;
   struct freq_tab *ft;
@@ -1103,10 +1107,10 @@ dump_full (const struct variable *v)
 	}
 
       tab_value (t, 0 + lab, r, TAB_NONE, f->value, &vf->print);
-      tab_float (t, 1 + lab, r, TAB_NONE, f->count, 8, 0);
-      tab_float (t, 2 + lab, r, TAB_NONE, percent, 5, 1);
-      tab_float (t, 3 + lab, r, TAB_NONE, valid_percent, 5, 1);
-      tab_float (t, 4 + lab, r, TAB_NONE, cum_total, 5, 1);
+      tab_double (t, 1 + lab, r, TAB_NONE, f->count, wfmt);
+      tab_double (t, 2 + lab, r, TAB_NONE, percent, NULL);
+      tab_double (t, 3 + lab, r, TAB_NONE, valid_percent, NULL);
+      tab_double (t, 4 + lab, r, TAB_NONE, cum_total, NULL);
       r++;
     }
   for (; f < &ft->valid[n_categories]; f++)
@@ -1121,9 +1125,9 @@ dump_full (const struct variable *v)
 	}
 
       tab_value (t, 0 + lab, r, TAB_NONE, f->value, &vf->print);
-      tab_float (t, 1 + lab, r, TAB_NONE, f->count, 8, 0);
-      tab_float (t, 2 + lab, r, TAB_NONE,
-		     f->count / ft->total_cases * 100.0, 5, 1);
+      tab_double (t, 1 + lab, r, TAB_NONE, f->count, wfmt);
+      tab_double (t, 2 + lab, r, TAB_NONE,
+		     f->count / ft->total_cases * 100.0, NULL);
       tab_text (t, 3 + lab, r, TAB_NONE, _("Missing"));
       r++;
     }
@@ -1135,9 +1139,9 @@ dump_full (const struct variable *v)
   tab_hline (t, TAL_2, 0, 4 + lab, r);
   tab_joint_text (t, 0, r, 0 + lab, r, TAB_RIGHT | TAT_TITLE, _("Total"));
   tab_vline (t, TAL_0, 1, r, r);
-  tab_float (t, 1 + lab, r, TAB_NONE, cum_freq, 8, 0);
-  tab_float (t, 2 + lab, r, TAB_NONE, 100.0, 5, 1);
-  tab_float (t, 3 + lab, r, TAB_NONE, 100.0, 5, 1);
+  tab_double (t, 1 + lab, r, TAB_NONE, cum_freq, wfmt);
+  tab_fixed (t, 2 + lab, r, TAB_NONE, 100.0, 5, 1);
+  tab_fixed (t, 3 + lab, r, TAB_NONE, 100.0, 5, 1);
 
   tab_title (t, "%s", var_to_string (v));
   tab_submit (t);
@@ -1164,8 +1168,9 @@ condensed_dim (struct tab_table *t, struct outp_driver *d)
 
 /* Display condensed frequency table for variable V. */
 static void
-dump_condensed (const struct variable *v)
+dump_condensed (const struct variable *v, const struct variable *wv)
 {
+  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0;
   int n_categories;
   struct var_freqs *vf;
   struct freq_tab *ft;
@@ -1196,17 +1201,17 @@ dump_condensed (const struct variable *v)
       cum_total += f->count / ft->valid_cases * 100.0;
 
       tab_value (t, 0, r, TAB_NONE, f->value, &vf->print);
-      tab_float (t, 1, r, TAB_NONE, f->count, 8, 0);
-      tab_float (t, 2, r, TAB_NONE, percent, 3, 0);
-      tab_float (t, 3, r, TAB_NONE, cum_total, 3, 0);
+      tab_double (t, 1, r, TAB_NONE, f->count, wfmt);
+      tab_double (t, 2, r, TAB_NONE, percent, NULL);
+      tab_double (t, 3, r, TAB_NONE, cum_total, NULL);
       r++;
     }
   for (; f < &ft->valid[n_categories]; f++)
     {
       tab_value (t, 0, r, TAB_NONE, f->value, &vf->print);
-      tab_float (t, 1, r, TAB_NONE, f->count, 8, 0);
-      tab_float (t, 2, r, TAB_NONE,
-		 f->count / ft->total_cases * 100.0, 3, 0);
+      tab_double (t, 1, r, TAB_NONE, f->count, wfmt);
+      tab_double (t, 2, r, TAB_NONE,
+		 f->count / ft->total_cases * 100.0, NULL);
       r++;
     }
 
@@ -1256,7 +1261,7 @@ calc_stats (const struct variable *v, double d[frq_n_stats])
 	  double tp;
 	  if ( percentiles[i].flag2  ) continue ;
 
-	  if ( get_algorithm() != COMPATIBLE )
+	  if ( settings_get_algorithm () != COMPATIBLE )
 	    tp =
 	      (ft->valid_cases - 1) *  percentiles[i].p;
 	  else
@@ -1307,7 +1312,7 @@ calc_stats (const struct variable *v, double d[frq_n_stats])
       double s;
 
       double dummy;
-      if ( get_algorithm() != COMPATIBLE )
+      if ( settings_get_algorithm () != COMPATIBLE )
 	{
 	  s = modf((ft->valid_cases - 1) * percentiles[i].p , &dummy);
 	}
@@ -1363,8 +1368,10 @@ calc_stats (const struct variable *v, double d[frq_n_stats])
 
 /* Displays a table of all the statistics requested for variable V. */
 static void
-dump_statistics (const struct variable *v, int show_varname)
+dump_statistics (const struct variable *v, bool show_varname,
+		 const struct variable *wv)
 {
+  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0;
   struct freq_tab *ft;
   double stat_value[frq_n_stats];
   struct tab_table *t;
@@ -1397,7 +1404,7 @@ dump_statistics (const struct variable *v, int show_varname)
       {
 	tab_text (t, 0, r, TAB_LEFT | TAT_TITLE,
 		      gettext (st_name[i].s10));
-	tab_float (t, 2, r, TAB_NONE, stat_value[i], 11, 3);
+	tab_double (t, 2, r, TAB_NONE, stat_value[i], NULL);
 	r++;
       }
 
@@ -1405,9 +1412,8 @@ dump_statistics (const struct variable *v, int show_varname)
   tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Valid"));
   tab_text (t, 1, 1, TAB_LEFT | TAT_TITLE, _("Missing"));
 
-  tab_float(t, 2, 0, TAB_NONE, ft->valid_cases, 11, 0);
-  tab_float(t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, 11, 0);
-
+  tab_double (t, 2, 0, TAB_NONE, ft->valid_cases, wfmt);
+  tab_double (t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, wfmt);
 
   for (i = 0; i < n_percentiles; i++, r++)
     {
@@ -1419,9 +1425,9 @@ dump_statistics (const struct variable *v, int show_varname)
       if (percentiles[i].p == 0.5)
         tab_text (t, 1, r, TAB_LEFT, _("50 (Median)"));
       else
-        tab_float (t, 1, r, TAB_LEFT, percentiles[i].p * 100, 3, 0);
-      tab_float (t, 2, r, TAB_NONE, percentiles[i].value, 11, 3);
-
+        tab_fixed (t, 1, r, TAB_LEFT, percentiles[i].p * 100, 3, 0);
+      tab_double (t, 2, r, TAB_NONE, percentiles[i].value,
+		  var_get_print_format (v));
     }
 
   tab_columns (t, SOM_COL_DOWN, 1);
@@ -1498,7 +1504,8 @@ freq_tab_to_slice_array(const struct freq_tab *frq_tab,
     {
       const struct freq *frq = &frq_tab->valid[i];
 
-      slices[i].label = var_get_value_name (var, frq->value);
+      ds_init_empty (&slices[i].label);
+      var_append_value_name (var, frq->value, &slices[i].label);
       slices[i].magnetude = frq->count;
     }
 
@@ -1512,12 +1519,17 @@ static void
 do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
 {
   struct slice *slices;
-  int n_slices;
+  int n_slices, i;
 
   slices = freq_tab_to_slice_array(frq_tab, var, &n_slices);
 
   piechart_plot(var_to_string(var), slices, n_slices);
 
+  for (i = 0 ; i < n_slices ; ++i )
+    {
+      ds_destroy (&slices[i].label);
+    }
+
   free(slices);
 }