X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Froc-chart-cairo.c;h=bf6398460dbf31694f44bcd66f2d8c2d75e6caf5;hb=c0b02c779f26fe801dbc83f1650294df03e0522a;hp=ae2db62efbd6f7acd4482be82323d70bc093e154;hpb=8f998d65fb573c1b4c12f917cc3dd0639808cfa3;p=pspp

diff --git a/src/output/charts/roc-chart-cairo.c b/src/output/charts/roc-chart-cairo.c
index ae2db62efb..bf6398460d 100644
--- a/src/output/charts/roc-chart-cairo.c
+++ b/src/output/charts/roc-chart-cairo.c
@@ -20,17 +20,17 @@
 
 #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"));
@@ -58,11 +58,11 @@ xrchart_draw_roc (const struct chart_item *chart_item, cairo_t *cr,
       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);
 	}