#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/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
#include "minmax.h"
#include "xalloc.h"
#define N_(msgid) msgid
/* (headers) */
-#include <output/chart.h>
#include <output/charts/plot-hist.h>
-#include <output/charts/plot-chart.h>
#include <math/histogram.h>
/* (specification)
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;
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
{
- chart_submit (npp);
- chart_submit (dnpp);
+ chart_item_submit (npp);
+ chart_item_submit (dnpp);
}
statistic_destroy (&np->parent.parent);
+ casereader_destroy (reader);
}
}
}
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);
}
- chart_submit (boxplot_get_chart (boxplot));
+ boxplot_submit (boxplot);
}
}
metrics->box_whisker = NULL;
}
- chart_submit (boxplot_get_chart (boxplot));
+ boxplot_submit (boxplot);
}
}
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);
+ os = &metric->box_whisker->parent;
order_stats_accumulate ( &os, 1,
casereader_clone (metric->up_reader),
wv, dependent_vars[v], MV_ANY);
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,
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,
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,
min_ll = ll_next (min_ll);
}
-
max_ll = ll_head (extrema_list (result->metrics[v].maxima));
for (e = 0; e < cmd.st_n;)
{
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,