Move all command implementations into a single 'commands' directory.

[pspp] / src / output / charts / roc-chart-cairo.c

diff --git a/src/output/charts/roc-chart-cairo.c b/src/output/charts/roc-chart-cairo.c
index 910d6152f0a7f64140b67cae932aa60a9bc7a652..bf6398460dbf31694f44bcd66f2d8c2d75e6caf5 100644 (file)
--- a/src/output/charts/roc-chart-cairo.c
+++ b/src/output/charts/roc-chart-cairo.c
@@ -20,7 +20,7 @@
 
 #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"
@@ -58,11 +58,11 @@ xrchart_draw_roc (const struct chart *chart, 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);
        }