projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a casefile, instead of a case sink, for MATCH FILES output.
[pspp-builds.git]
/
src
/
language
/
stats
/
examine.q
diff --git
a/src/language/stats/examine.q
b/src/language/stats/examine.q
index aad3baa10fd4380e68b0faddede7d834480b6966..e2bd897a5200f20838959727368e74c691cda686 100644
(file)
--- a/
src/language/stats/examine.q
+++ b/
src/language/stats/examine.q
@@
-19,33
+19,36
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
#include <config.h>
02110-1301, USA. */
#include <config.h>
+
#include <gsl/gsl_cdf.h>
#include <libpspp/message.h>
#include <gsl/gsl_cdf.h>
#include <libpspp/message.h>
+#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
-#include <libpspp/alloc.h>
-#include <libpspp/str.h>
+
#include <data/case.h>
#include <data/case.h>
+#include <data/casefile.h>
#include <data/dictionary.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-#include <l
ibpspp/compiler
.h>
+#include <l
anguage/dictionary/split-file
.h>
#include <language/lexer/lexer.h>
#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/misc.h>
-#include <output/table.h>
-#include <output/manager.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <procedure.h>
-#include <libpspp/hash.h>
-#include <data/casefile.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 <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)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-148,7
+151,8
@@
void box_plot_variables(const struct factor *fctr,
/* Per Split function */
/* 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);
static void output_examine(void);
@@
-285,12
+289,13
@@
output_examine(void)
{
if ( cmd.cmp == XMN_GROUPS )
{
{
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
}
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] )
}
if ( cmd.a_plot[XMN_PLT_HISTOGRAM] )
@@
-342,11
+347,13
@@
output_examine(void)
if ( cmd.a_plot[XMN_PLT_BOXPLOT] )
{
if ( cmd.cmp == XMN_VARIABLES )
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
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 )
}
for ( v = 0 ; v < n_dependent_vars; ++v )
@@
-671,7
+678,7
@@
factor_calc(struct ccase *c, int case_no, double weight, int case_missing)
}
static bool
}
static bool
-run_examine(const struct casefile *cf, void *cmd_ )
+run_examine(const struct c
case *first, const struct c
asefile *cf, void *cmd_ )
{
struct casereader *r;
struct ccase c;
{
struct casereader *r;
struct ccase c;
@@
-679,9
+686,13
@@
run_examine(const struct casefile *cf, void *cmd_ )
const struct cmd_examine *cmd = (struct cmd_examine *) 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 */
/* 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;
while (fctr)
{
struct factor *next = fctr->next;