*/
#include <config.h>
-#include "message.h"
+
#include <math.h>
#include <stdlib.h>
#include <gsl/gsl_histogram.h>
-#include "alloc.h"
-#include "bit-vector.h"
-#include "case.h"
-#include "dictionary.h"
-#include "hash.h"
-#include "pool.h"
-#include "command.h"
-#include "lexer.h"
-#include "moments.h"
-#include "message.h"
-#include "array.h"
-#include "magic.h"
-#include "misc.h"
-#include "output.h"
-#include "manager.h"
-#include "str.h"
-#include "table.h"
-#include "value-labels.h"
-#include "variable.h"
-#include "procedure.h"
-#include "settings.h"
-#include "piechart.h"
-#include "chart.h"
-#include "plot-hist.h"
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/settings.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/dictionary/split-file.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/array.h>
+#include <libpspp/bit-vector.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
+#include <math/histogram.h>
+#include <math/moments.h>
+#include <output/chart.h>
+#include <output/charts/piechart.h>
+#include <output/charts/plot-hist.h>
+#include <output/manager.h>
+#include <output/output.h>
+#include <output/table.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
/* (headers) */
-#include "debug-print.h"
-
/* (specification)
FREQUENCIES (frq_):
*variables=custom;
static void calc_stats (struct variable *v, double d[frq_n_stats]);
-static void precalc (void *);
-static bool calc (struct ccase *, void *);
+static void precalc (const struct ccase *, void *);
+static bool calc (const struct ccase *, void *);
static void postcalc (void *);
static void postprocess_freq_tab (struct variable *);
/* Add data from case C to the frequency table. */
static bool
-calc (struct ccase *c, void *aux UNUSED)
+calc (const struct ccase *c, void *aux UNUSED)
{
double weight;
size_t i;
/* Prepares each variable that is the target of FREQUENCIES by setting
up its hash table. */
static void
-precalc (void *aux UNUSED)
+precalc (const struct ccase *first, void *aux UNUSED)
{
size_t i;
+ output_split_file_values (first);
+
pool_destroy (gen_pool);
gen_pool = pool_create ();
}
tab_box (t, TAL_1, TAL_1,
- cmd.spaces == FRQ_SINGLE ? -1 : (TAL_1 | TAL_SPACING), TAL_1,
+ cmd.spaces == FRQ_SINGLE ? -1 : TAL_GAP, TAL_1,
0, 0, 4 + lab, r);
tab_hline (t, TAL_2, 0, 4 + lab, 2);
tab_hline (t, TAL_2, 0, 4 + lab, r);
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_title (t, 1, "%s: %s", v->name, v->label ? v->label : "");
+ tab_title (t, "%s: %s", v->name, v->label ? v->label : "");
tab_submit (t);
}
static void
condensed_dim (struct tab_table *t, struct outp_driver *d)
{
- int cum_w = max (outp_string_width (d, _("Cum")),
- max (outp_string_width (d, _("Cum")),
- outp_string_width (d, "000")));
+ int cum_w = max (outp_string_width (d, _("Cum"), OUTP_PROPORTIONAL),
+ max (outp_string_width (d, _("Cum"), OUTP_PROPORTIONAL),
+ outp_string_width (d, "000", OUTP_PROPORTIONAL)));
int i;
}
tab_box (t, TAL_1, TAL_1,
- cmd.spaces == FRQ_SINGLE ? -1 : (TAL_1 | TAL_SPACING), TAL_1,
+ cmd.spaces == FRQ_SINGLE ? -1 : TAL_GAP, TAL_1,
0, 0, 3, r - 1);
tab_hline (t, TAL_2, 0, 3, 2);
- tab_title (t, 1, "%s: %s", v->name, v->label ? v->label : "");
+ tab_title (t, "%s: %s", v->name, v->label ? v->label : "");
tab_columns (t, SOM_COL_DOWN, 1);
tab_submit (t);
}
tab_vline (t, TAL_1 , 2, 0, tab_nr(t) - 1);
- tab_vline (t, TAL_1 | TAL_SPACING , 1, 0, tab_nr(t) - 1 ) ;
+ tab_vline (t, TAL_GAP , 1, 0, tab_nr(t) - 1 ) ;
r=2; /* N missing and N valid are always dumped */
if (show_varname)
{
if (v->label)
- tab_title (t, 1, "%s: %s", v->name, v->label);
+ tab_title (t, "%s: %s", v->name, v->label);
else
- tab_title (t, 0, v->name);
+ tab_title (t, "%s", v->name);
}
else
tab_flags (t, SOMF_NO_TITLE);