projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to latest Gnulib
[pspp]
/
src
/
language
/
stats
/
examine.q
diff --git
a/src/language/stats/examine.q
b/src/language/stats/examine.q
index f415d0033017e7f8a510257c9541f327e7d26258..e4239fda6adbbd45695b4350c93e64f7a51ade9b 100644
(file)
--- a/
src/language/stats/examine.q
+++ b/
src/language/stats/examine.q
@@
-43,15
+43,14
@@
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <libpspp/compiler.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <math/moments.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <math/moments.h>
-#include <output/charts/box-whisker.h>
+#include <output/chart-item.h>
+#include <output/charts/boxplot.h>
#include <output/charts/np-plot.h>
#include <output/charts/np-plot.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
#include "minmax.h"
#include "xalloc.h"
#include "minmax.h"
#include "xalloc.h"
@@
-61,9
+60,7
@@
#define N_(msgid) msgid
/* (headers) */
#define N_(msgid) msgid
/* (headers) */
-#include <output/chart.h>
#include <output/charts/plot-hist.h>
#include <output/charts/plot-hist.h>
-#include <output/charts/plot-chart.h>
#include <math/histogram.h>
/* (specification)
#include <math/histogram.h>
/* (specification)
@@
-339,7
+336,7
@@
show_npplot (const struct variable **dependent_var,
struct string label;
const struct factor_result *result =
ll_data (ll, struct factor_result, ll);
struct string label;
const struct factor_result *result =
ll_data (ll, struct factor_result, ll);
- struct chart *npp, *dnpp;
+ struct chart
_item
*npp, *dnpp;
struct casereader *reader;
struct np *np;
struct casereader *reader;
struct np *np;
@@
-357,16
+354,17
@@
show_npplot (const struct variable **dependent_var,
if (npp == NULL || dnpp == NULL)
{
msg (MW, _("Not creating NP plot because data set is empty."));
if (npp == NULL || dnpp == NULL)
{
msg (MW, _("Not creating NP plot because data set is empty."));
- chart_unref (npp);
- chart_unref (dnpp);
+ chart_
item_
unref (npp);
+ chart_
item_
unref (dnpp);
}
else
{
}
else
{
- chart_submit (npp);
- chart_submit (dnpp);
+ chart_
item_
submit (npp);
+ chart_
item_
submit (dnpp);
}
statistic_destroy (&np->parent.parent);
}
statistic_destroy (&np->parent.parent);
+ casereader_destroy (reader);
}
}
}
}
}
}
@@
-406,8
+404,9
@@
show_histogram (const struct variable **dependent_var,
moments1_calculate (result->metrics[v].moments,
&n, &mean, &var, NULL, NULL);
moments1_calculate (result->metrics[v].moments,
&n, &mean, &var, NULL, NULL);
- chart_submit (histogram_chart_create (histogram, ds_cstr (&str),
- n, mean, sqrt (var), false));
+ chart_item_submit (histogram_chart_create (histogram->gsl_hist,
+ ds_cstr (&str), n, mean,
+ sqrt (var), false));
ds_destroy (&str);
}
ds_destroy (&str);
}
@@
-471,7
+470,7
@@
show_boxplot_groups (const struct variable **dependent_var,
ds_destroy (&str);
}
ds_destroy (&str);
}
-
chart_submit (boxplot_get_chart (boxplot)
);
+
boxplot_submit (boxplot
);
}
}
}
}
@@
-519,7
+518,7
@@
show_boxplot_variables (const struct variable **dependent_var,
metrics->box_whisker = NULL;
}
metrics->box_whisker = NULL;
}
-
chart_submit (boxplot_get_chart (boxplot)
);
+
boxplot_submit (boxplot
);
}
}
}
}
@@
-986,11
+985,12
@@
examine_group (struct cmd_examine *cmd, struct casereader *reader, int level,
struct factor_metrics *metric = &result->metrics[v];
int n_vals = caseproto_get_n_widths (casereader_get_proto (
metric->up_reader));
struct factor_metrics *metric = &result->metrics[v];
int n_vals = caseproto_get_n_widths (casereader_get_proto (
metric->up_reader));
- struct order_stats *os
= &metric->box_whisker->parent
;
+ struct order_stats *os;
metric->box_whisker =
box_whisker_create ( metric->tukey_hinges, cmd->v_id, n_vals - 1);
metric->box_whisker =
box_whisker_create ( metric->tukey_hinges, cmd->v_id, n_vals - 1);
+ os = &metric->box_whisker->parent;
order_stats_accumulate ( &os, 1,
casereader_clone (metric->up_reader),
wv, dependent_vars[v], MV_ANY);
order_stats_accumulate ( &os, 1,
casereader_clone (metric->up_reader),
wv, dependent_vars[v], MV_ANY);
@@
-1134,8
+1134,6
@@
show_summary (const struct variable **dependent_var, int n_dep_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
@@
-1371,8
+1369,6
@@
show_descriptives (const struct variable **dependent_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
@@
-1683,8
+1679,6
@@
show_extremes (const struct variable **dependent_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
@@
-1775,7
+1769,6
@@
show_extremes (const struct variable **dependent_var,
min_ll = ll_next (min_ll);
}
min_ll = ll_next (min_ll);
}
-
max_ll = ll_head (extrema_list (result->metrics[v].maxima));
for (e = 0; e < cmd.st_n;)
{
max_ll = ll_head (extrema_list (result->metrics[v].maxima));
for (e = 0; e < cmd.st_n;)
{
@@
-1888,8
+1881,6
@@
show_percentiles (const struct variable **dependent_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,