Encapsulated the static data of procedure.[ch] into a single object, to be

[pspp-builds.git] / src / language / stats / examine.q

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index 940a4391fc733734a91965f4f988ce8a1a6b7142..6b748335fa46d40b723a8236e964f706343a67ea 100644 (file)
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -19,50 +19,54 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <config.h>
+
 #include <gsl/gsl_cdf.h>
-#include "message.h"
+#include <libpspp/message.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
-#include "alloc.h"
-#include "str.h"
-#include "case.h"
-#include "dictionary.h"
-#include "command.h"
-#include "lexer.h"
-#include "message.h"
-#include "magic.h"
-#include "misc.h"
-#include "table.h"
-#include "manager.h"
-#include "value-labels.h"
-#include "variable.h"
-#include "procedure.h"
-#include "hash.h"
-#include "casefile.h"
-#include "factor-stats.h"
-#include "moments.h"
-#include "percentiles.h"
-#include "box-whisker.h"
-#include "cartesian.h"
+
+#include <data/case.h>
+#include <data/casefile.h>
+#include <data/dictionary.h>
+#include <data/procedure.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/compiler.h>
+#include <libpspp/hash.h>
+#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <math/factor-stats.h>
+#include <math/moments.h>
+#include <math/percentiles.h>
+#include <output/charts/box-whisker.h>
+#include <output/charts/cartesian.h>
+#include <output/manager.h>
+#include <output/table.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 /* (headers) */
-#include "chart.h"
-#include "plot-hist.h"
-#include "plot-chart.h"
+#include <output/chart.h>
+#include <output/charts/plot-hist.h>
+#include <output/charts/plot-chart.h>
 
 /* (specification)
    "EXAMINE" (xmn_):
    *^variables=custom;
    +total=custom;
    +nototal=custom;
-   +missing=miss:pairwise/!listwise,
-   rep:report/!noreport,
-   incl:include/!exclude;
+   missing=miss:pairwise/!listwise,
+           rep:report/!noreport,
+           incl:include/!exclude;
    +compare=cmp:variables/!groups;
    +percentiles=custom;
    +id=var;
@@ -147,7 +151,8 @@ void box_plot_variables(const struct factor *fctr,
 
 
 /* Per Split function */
-static bool run_examine(const struct casefile *cf, void *cmd_);
+static bool run_examine(const struct ccase *,
+                        const struct casefile *cf, void *cmd_);
 
 static void output_examine(void);
 
@@ -193,7 +198,7 @@ cmd_examine(void)
   subc_list_double_create(&percentile_list);
   percentile_algorithm = PC_HAVERAGE;
 
-  if ( !parse_examine(&cmd) )
+  if ( !parse_examine(&cmd, NULL) )
     return CMD_FAILURE;
 
   /* If /MISSING=INCLUDE is set, then user missing values are ignored */
@@ -217,7 +222,7 @@ cmd_examine(void)
       subc_list_double_push(&percentile_list, 75);
     }
 
-  ok = multipass_procedure_with_splits (run_examine, &cmd);
+  ok = multipass_procedure_with_splits (current_dataset, run_examine, &cmd);
 
   if ( totals ) 
     {
@@ -284,12 +289,13 @@ output_examine(void)
            {
              if ( cmd.cmp == XMN_GROUPS ) 
                {
-                 box_plot_group(0, dependent_vars, n_dependent_vars, 
-                                cmd.v_id);
+                 box_plot_group (0, (const struct variable **) dependent_vars,
+                                  n_dependent_vars, cmd.v_id);
                }
              else
-               box_plot_variables(0, dependent_vars, n_dependent_vars,
-                                  cmd.v_id);
+               box_plot_variables (0,
+                                    (const struct variable **) dependent_vars,
+                                    n_dependent_vars, cmd.v_id);
            }
 
          if ( cmd.a_plot[XMN_PLT_HISTOGRAM] ) 
@@ -341,11 +347,13 @@ output_examine(void)
          if ( cmd.a_plot[XMN_PLT_BOXPLOT] )
            {
              if ( cmd.cmp == XMN_VARIABLES ) 
-               box_plot_variables(fctr, dependent_vars, n_dependent_vars, 
-                                  cmd.v_id);
+               box_plot_variables (fctr,
+                                    (const struct variable **) dependent_vars,
+                                    n_dependent_vars, cmd.v_id);
              else
-               box_plot_group(fctr, dependent_vars, n_dependent_vars, 
-                              cmd.v_id);
+               box_plot_group (fctr,
+                                (const struct variable **) dependent_vars,
+                                n_dependent_vars, cmd.v_id);
            }
 
          for ( v = 0 ; v < n_dependent_vars; ++v )
@@ -415,7 +423,7 @@ list_to_ptile_hash(const subc_list_double *l)
 
 /* Parse the PERCENTILES subcommand */
 static int
-xmn_custom_percentiles(struct cmd_examine *p UNUSED)
+xmn_custom_percentiles(struct cmd_examine *p UNUSED, void *aux UNUSED)
 {
   sbc_percentile = 1;
 
@@ -470,7 +478,7 @@ xmn_custom_percentiles(struct cmd_examine *p UNUSED)
 
 /* TOTAL and NOTOTAL are simple, mutually exclusive flags */
 static int
-xmn_custom_total(struct cmd_examine *p)
+xmn_custom_total(struct cmd_examine *p, void *aux UNUSED)
 {
   if ( p->sbc_nototal ) 
     {
@@ -482,7 +490,7 @@ xmn_custom_total(struct cmd_examine *p)
 }
 
 static int
-xmn_custom_nototal(struct cmd_examine *p)
+xmn_custom_nototal(struct cmd_examine *p, void *aux UNUSED)
 {
   if ( p->sbc_total ) 
     {
@@ -498,17 +506,17 @@ xmn_custom_nototal(struct cmd_examine *p)
 /* Parser for the variables sub command  
    Returns 1 on success */
 static int
-xmn_custom_variables(struct cmd_examine *cmd )
+xmn_custom_variables(struct cmd_examine *cmd, void *aux UNUSED)
 {
   lex_match('=');
 
-  if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
+  if ((token != T_ID || dict_lookup_var (dataset_dict (current_dataset), tokid) == NULL)
       && token != T_ALL)
     {
       return 2;
     }
   
-  if (!parse_variables (default_dict, &dependent_vars, &n_dependent_vars,
+  if (!parse_variables (dataset_dict (current_dataset), &dependent_vars, &n_dependent_vars,
                        PV_NO_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH) )
     {
       free (dependent_vars);
@@ -542,7 +550,7 @@ examine_parse_independent_vars(struct cmd_examine *cmd)
   int success;
   struct factor *sf = xmalloc (sizeof *sf);
 
-  if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
+  if ((token != T_ID || dict_lookup_var (dataset_dict (current_dataset), tokid) == NULL)
       && token != T_ALL)
     {
       free ( sf ) ;
@@ -558,7 +566,7 @@ examine_parse_independent_vars(struct cmd_examine *cmd)
 
       lex_match(T_BY);
 
-      if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
+      if ((token != T_ID || dict_lookup_var (dataset_dict (current_dataset), tokid) == NULL)
          && token != T_ALL)
        {
          free ( sf ) ;
@@ -610,7 +618,7 @@ void populate_summary(struct tab_table *t, int col, int row,
 
 
 
-static int bad_weight_warn = 1;
+static bool bad_weight_warn = true;
 
 
 /* Perform calculations for the sub factors */
@@ -670,7 +678,7 @@ factor_calc(struct ccase *c, int case_no, double weight, int case_missing)
 }
 
 static bool 
-run_examine(const struct casefile *cf, void *cmd_ )
+run_examine(const struct ccase *first, const struct casefile *cf, void *cmd_ )
 {
   struct casereader *r;
   struct ccase c;
@@ -678,9 +686,13 @@ run_examine(const struct casefile *cf, void *cmd_ )
 
   const struct cmd_examine *cmd = (struct cmd_examine *) cmd_;
 
+  struct factor *fctr;
+
+  output_split_file_values (first);
+
   /* Make sure we haven't got rubbish left over from a 
      previous split */
-  struct factor *fctr = factors;
+  fctr = factors;
   while (fctr) 
     {
       struct factor *next = fctr->next;
@@ -705,7 +717,7 @@ run_examine(const struct casefile *cf, void *cmd_ )
       const int case_no = casereader_cnum(r);
 
       const double weight = 
-       dict_get_case_weight(default_dict, &c, &bad_weight_warn);
+       dict_get_case_weight(dataset_dict (current_dataset), &c, &bad_weight_warn);
 
       if ( cmd->miss == XMN_LISTWISE ) 
        {
@@ -913,7 +925,7 @@ show_summary(struct variable **dependent_var, int n_dep_var,
   tab_vline (tbl, TAL_2, heading_columns, 0, n_rows - 1);
 
 
-  tab_title (tbl, 0, _("Case Processing Summary"));
+  tab_title (tbl, _("Case Processing Summary"));
   
 
   tab_joint_text(tbl, heading_columns, 0, 
@@ -1119,7 +1131,7 @@ show_extremes(struct variable **dependent_var, int n_dep_var,
 
   tab_hline (tbl, TAL_2, 0, n_cols - 1, heading_rows );
 
-  tab_title (tbl, 0, _("Extreme Values"));
+  tab_title (tbl, _("Extreme Values"));
 
   tab_vline (tbl, TAL_2, n_cols - 2, 0, n_rows -1);
   tab_vline (tbl, TAL_1, n_cols - 1, 0, n_rows -1);
@@ -1368,7 +1380,7 @@ show_descriptives(struct variable **dependent_var,
   tab_text (tbl, n_cols - 2, 0, TAB_CENTER | TAT_TITLE, _("Statistic"));
   tab_text (tbl, n_cols - 1, 0, TAB_CENTER | TAT_TITLE, _("Std. Error"));
 
-  tab_title (tbl, 0, _("Descriptives"));
+  tab_title (tbl, _("Descriptives"));
 
 
   for ( i = 0 ; i < n_dep_var ; ++i ) 
@@ -1956,7 +1968,7 @@ show_percentiles(struct variable **dependent_var,
   tab_vline (tbl, TAL_2, n_heading_columns, 0, n_rows - 1);
 
 
-  tab_title (tbl, 0, _("Percentiles"));
+  tab_title (tbl, _("Percentiles"));
 
 
   tab_hline (tbl, TAL_1, n_heading_columns, n_cols - 1, 1 );