/* PSPP - a program for statistical analysis.
- Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2008, 2009, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <config.h>
-#include <output/charts/np-plot.h>
+#include "output/charts/np-plot.h"
#include <gsl/gsl_cdf.h>
-#include <data/casereader.h>
-#include <libpspp/cast.h>
-#include <math/np.h>
-#include <output/chart-item-provider.h>
+#include "data/casereader.h"
+#include "libpspp/cast.h"
+#include "math/np.h"
+#include "output/chart-provider.h"
#include "gl/minmax.h"
-static struct chart_item *
+static struct chart *
make_np_plot (const struct np *np, const struct casereader *reader,
const char *label, bool detrended)
{
struct np_plot_chart *npp;
- if (np->n < 1.0)
+ if (np->n <= 1.0)
return NULL;
- npp = xmalloc (sizeof *npp);
- chart_item_init (&npp->chart_item, &np_plot_chart_class, label);
+ npp = xzalloc (sizeof *npp);
+ chart_init (&npp->chart, &np_plot_chart_class, label);
npp->data = casereader_clone (reader);
npp->y_min = np->y_min;
npp->y_max = np->y_max;
npp->x_upper = MAX (np->y_max, (npp->y_last - npp->intercept) / npp->slope);
npp->slack = (npp->x_upper - npp->x_lower) * 0.05;
- return &npp->chart_item;
+ return &npp->chart;
}
/* Creates and returns a normal probability plot corresponding to
Returns a null pointer if the data set is empty.
The caller retains ownership of NP and READER. */
-struct chart_item *
+struct chart *
np_plot_create (const struct np *np, const struct casereader *reader,
const char *label)
{
Returns a null pointer if the data set is empty.
The caller retains ownership of NP and READER. */
-struct chart_item *
+struct chart *
dnp_plot_create (const struct np *np, const struct casereader *reader,
const char *label)
{
}
static void
-np_plot_chart_destroy (struct chart_item *chart_item)
+np_plot_chart_destroy (struct chart *chart)
{
- struct np_plot_chart *npp = to_np_plot_chart (chart_item);
+ struct np_plot_chart *npp = to_np_plot_chart (chart);
casereader_destroy (npp->data);
- free (npp->label);
free (npp);
}
-const struct chart_item_class np_plot_chart_class =
+const struct chart_class np_plot_chart_class =
{
np_plot_chart_destroy
};