#include "data/case.h"
#include "data/casereader.h"
-#include "language/stats/roc.h"
+#include "language/commands/roc.h"
#include "output/cairo-chart.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
void
-xrchart_draw_roc (const struct chart_item *chart_item, cairo_t *cr,
+xrchart_draw_roc (const struct chart *chart, cairo_t *cr,
struct xrchart_geometry *geom)
{
- const struct roc_chart *rc = to_roc_chart (chart_item);
+ const struct roc_chart *rc = to_roc_chart (chart);
size_t i;
xrchart_write_title (cr, geom, _("ROC Curve"));
xrchart_vector_start (cr, geom, rv->name);
for (; (cc = casereader_read (r)) != NULL; case_unref (cc))
{
- double se = case_data_idx (cc, ROC_TP)->f;
- double sp = case_data_idx (cc, ROC_TN)->f;
+ double se = case_num_idx (cc, ROC_TP);
+ double sp = case_num_idx (cc, ROC_TN);
- se /= case_data_idx (cc, ROC_FN)->f + case_data_idx (cc, ROC_TP)->f ;
- sp /= case_data_idx (cc, ROC_TN)->f + case_data_idx (cc, ROC_FP)->f ;
+ se /= case_num_idx (cc, ROC_FN) + case_num_idx (cc, ROC_TP);
+ sp /= case_num_idx (cc, ROC_TN) + case_num_idx (cc, ROC_FP);
xrchart_vector (cr, geom, 1 - sp, se);
}