X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Froc.c;h=0709992ce469ae113814f6996b549fe0d684b7fc;hp=46d2da9ed3a645b914fdfa14300941425e60ae41;hb=1fe8ef2486ef1e853d68bbab967ccb812900128f;hpb=3542b2c285a83fb43a4b7031c477ab938eaf7c1c diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c index 46d2da9e..0709992c 100644 --- a/src/language/stats/roc.c +++ b/src/language/stats/roc.c @@ -26,13 +26,19 @@ #include #include #include +#include #include +#include + #include #include #include +#include +#include + #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -41,6 +47,7 @@ struct cmd_roc { size_t n_vars; const struct variable **vars; + const struct dictionary *dict; struct variable *state_var ; union value state_value; @@ -60,6 +67,11 @@ struct cmd_roc bool invert ; /* True iff a smaller test result variable indicates a positive result */ + + double pos; + double neg; + double pos_weighted; + double neg_weighted; }; static int run_roc (struct dataset *ds, struct cmd_roc *roc); @@ -80,6 +92,9 @@ cmd_roc (struct lexer *lexer, struct dataset *ds) roc.ci = 95; roc.bi_neg_exp = false; roc.invert = false; + roc.pos = roc.pos_weighted = 0; + roc.neg = roc.neg_weighted = 0; + roc.dict = dataset_dict (ds); if (!parse_variables_const (lexer, dict, &roc.vars, &roc.n_vars, PV_APPEND | PV_NO_DUPLICATE | PV_NUMERIC)) @@ -283,7 +298,7 @@ run_roc (struct dataset *ds, struct cmd_roc *roc) return ok; } - +#if 0 static void dump_casereader (struct casereader *reader) { @@ -302,15 +317,31 @@ dump_casereader (struct casereader *reader) casereader_destroy (r); } +#endif static bool match_positives (const struct ccase *c, void *aux) { struct cmd_roc *roc = aux; + const struct variable *wv = dict_get_weight (roc->dict); + const double weight = wv ? case_data (c, wv)->f : 1.0; - return 0 == value_compare_3way (case_data (c, roc->state_var), - &roc->state_value, - var_get_width (roc->state_var)); + bool positive = ( 0 == value_compare_3way (case_data (c, roc->state_var), + &roc->state_value, + var_get_width (roc->state_var))); + + if ( positive ) + { + roc->pos++; + roc->pos_weighted += weight; + } + else + { + roc->neg++; + roc->neg_weighted += weight; + } + + return positive; } @@ -324,26 +355,92 @@ struct roc_state double n1; double n2; + + double q1hat; + double q2hat; + + struct casewriter *cutpoint_wtr; + struct casereader *cutpoint_rdr; + double prev_result; + double min; + double max; }; -static void output_roc (struct roc_state *rs, const struct cmd_roc *roc); +#define CUTPOINT 0 +#define TP 1 +#define FN 2 +#define TN 3 +#define FP 4 + + +static struct casereader * +accumulate_counts (struct casereader *cutpoint_rdr, + double result, double weight, + bool (*pos_cond) (double, double), + int true_index, int false_index) +{ + const struct caseproto *proto = casereader_get_proto (cutpoint_rdr); + struct casewriter *w = + autopaging_writer_create (proto); + struct casereader *r = casereader_clone (cutpoint_rdr); + struct ccase *cpc; + double prev_cp = SYSMIS; + + + for ( ; (cpc = casereader_read (r) ); case_unref (cpc)) + { + struct ccase *new_case; + const double cp = case_data_idx (cpc, CUTPOINT)->f; + + /* We don't want duplicates here */ + if ( cp == prev_cp ) + continue; + + new_case = case_clone (cpc); + + if ( pos_cond (result, cp)) + { + case_data_rw_idx (new_case, true_index)->f += weight; + } + else + { + case_data_rw_idx (new_case, false_index)->f += weight; + } + + prev_cp = cp; + + casewriter_write (w, new_case); + } + casereader_destroy (r); + + return casewriter_make_reader (w); +} + + + +static void output_roc (struct roc_state *rs, const struct cmd_roc *roc); static struct casereader * process_group (const struct variable *var, struct casereader *reader, bool (*pred) (double, double), const struct dictionary *dict, - double *cc) + double *cc, + struct casereader **cutpoint_rdr, + bool (*pos_cond) (double, double), + int true_index, + int false_index) { const struct variable *w = dict_get_weight (dict); - const int weight_idx = w ? var_get_case_index (w) : - caseproto_get_n_widths (casereader_get_proto (reader)) - 1; struct casereader *r1 = casereader_create_distinct (sort_execute_1var (reader, var), var, w); + const int weight_idx = w ? var_get_case_index (w) : + caseproto_get_n_widths (casereader_get_proto (r1)) - 1; + struct ccase *c1; struct casereader *rclone = casereader_clone (r1); @@ -357,9 +454,10 @@ process_group (const struct variable *var, struct casereader *reader, wtr = autopaging_writer_create (proto); *cc = 0; - + for ( ; (c1 = casereader_read (r1) ); case_unref (c1)) { + struct ccase *new_case = case_create (proto); struct ccase *c2; struct casereader *r2 = casereader_clone (rclone); @@ -368,8 +466,9 @@ process_group (const struct variable *var, struct casereader *reader, double n_eq = 0.0; double n_pred = 0.0; - - struct ccase *new_case = case_create (proto); + *cutpoint_rdr = accumulate_counts (*cutpoint_rdr, d1, weight1, + pos_cond, + true_index, false_index); *cc += weight1; @@ -410,38 +509,172 @@ gt (double d1, double d2) return d1 > d2; } + +static bool +ge (double d1, double d2) +{ + return d1 > d2; +} + static bool lt (double d1, double d2) { return d1 < d2; } +static struct casereader * +process_positive_group (const struct variable *var, struct casereader *reader, + const struct dictionary *dict, + struct roc_state *rs) +{ + return process_group (var, reader, gt, dict, &rs->n1, + &rs->cutpoint_rdr, + ge, + TP, FN); +} + + +static struct casereader * +process_negative_group (const struct variable *var, struct casereader *reader, + const struct dictionary *dict, + struct roc_state *rs) +{ + return process_group (var, reader, lt, dict, &rs->n2, + &rs->cutpoint_rdr, + lt, + TN, FP); +} + + + static void -do_roc (struct cmd_roc *roc, struct casereader *input, struct dictionary *dict) +append_cutpoint (struct casewriter *writer, double cutpoint) +{ + struct ccase *cc = case_create (casewriter_get_proto (writer)); + + case_data_rw_idx (cc, CUTPOINT)->f = cutpoint; + case_data_rw_idx (cc, TP)->f = 0; + case_data_rw_idx (cc, FN)->f = 0; + case_data_rw_idx (cc, TN)->f = 0; + case_data_rw_idx (cc, FP)->f = 0; + + + casewriter_write (writer, cc); +} + + +/* Prepare the cutpoints */ +static void +prepare_cutpoints (struct cmd_roc *roc, struct roc_state *rs, struct casereader *input) { int i; + struct casereader *r = casereader_clone (input); + struct ccase *c; + struct caseproto *proto = caseproto_create (); - struct roc_state *rs = xcalloc (roc->n_vars, sizeof *rs); + struct subcase ordering; + subcase_init (&ordering, CUTPOINT, 0, SC_ASCEND); + + proto = caseproto_add_width (proto, 0); /* cutpoint */ + proto = caseproto_add_width (proto, 0); /* TP */ + proto = caseproto_add_width (proto, 0); /* FN */ + proto = caseproto_add_width (proto, 0); /* TN */ + proto = caseproto_add_width (proto, 0); /* FP */ + + for (i = 0 ; i < roc->n_vars; ++i) + { + rs[i].cutpoint_wtr = sort_create_writer (&ordering, proto); + rs[i].prev_result = SYSMIS; + rs[i].max = -DBL_MAX; + rs[i].min = DBL_MAX; + } - const struct caseproto *proto = casereader_get_proto (input); + for (; (c = casereader_read (r)) != NULL; case_unref (c)) + { + for (i = 0 ; i < roc->n_vars; ++i) + { + const union value *v = case_data (c, roc->vars[i]); + const double result = v->f; + + if ( mv_is_value_missing (var_get_missing_values (roc->vars[i]), v, roc->exclude)) + continue; - struct casewriter *neg_wtr = autopaging_writer_create (proto); + minimize (&rs[i].min, result); + maximize (&rs[i].max, result); + + if ( rs[i].prev_result != SYSMIS && rs[i].prev_result != result ) + { + const double mean = (result + rs[i].prev_result ) / 2.0; + append_cutpoint (rs[i].cutpoint_wtr, mean); + } + + rs[i].prev_result = result; + } + } + casereader_destroy (r); + + + /* Append the min and max cutpoints */ + for (i = 0 ; i < roc->n_vars; ++i) + { + append_cutpoint (rs[i].cutpoint_wtr, rs[i].min - 1); + append_cutpoint (rs[i].cutpoint_wtr, rs[i].max + 1); + + rs[i].cutpoint_rdr = casewriter_make_reader (rs[i].cutpoint_wtr); + } +} + +static void +do_roc (struct cmd_roc *roc, struct casereader *reader, struct dictionary *dict) +{ + int i; + + struct roc_state *rs = xcalloc (roc->n_vars, sizeof *rs); struct casereader *negatives = NULL; + struct casereader *positives = NULL; + + struct caseproto *n_proto = caseproto_create (); + + struct subcase up_ordering; + struct subcase down_ordering; - struct casereader *positives = + struct casereader *input = casereader_create_filter_missing (reader, + roc->vars, roc->n_vars, + roc->exclude, + NULL, + NULL); + + + struct casewriter *neg_wtr = autopaging_writer_create (casereader_get_proto (input)); + + prepare_cutpoints (roc, rs, input); + + positives = casereader_create_filter_func (input, match_positives, NULL, roc, neg_wtr); + n_proto = caseproto_create (); + + n_proto = caseproto_add_width (n_proto, 0); + n_proto = caseproto_add_width (n_proto, 0); + n_proto = caseproto_add_width (n_proto, 0); + n_proto = caseproto_add_width (n_proto, 0); + n_proto = caseproto_add_width (n_proto, 0); + + subcase_init (&up_ordering, VALUE, 0, SC_ASCEND); + subcase_init (&down_ordering, VALUE, 0, SC_DESCEND); for (i = 0 ; i < roc->n_vars; ++i) { - double q1hat = 0; - double q2hat = 0; + struct casewriter *w = NULL; + struct casereader *r = NULL; + + struct ccase *c; struct ccase *cpos; struct casereader *n_neg ; @@ -450,53 +683,158 @@ do_roc (struct cmd_roc *roc, struct casereader *input, struct dictionary *dict) struct casereader *neg ; struct casereader *pos = casereader_clone (positives); - struct casereader *n_pos = process_group (var, pos, gt, dict, &rs[i].n1); + struct casereader *n_pos = + process_positive_group (var, pos, dict, &rs[i]); if ( negatives == NULL) { negatives = casewriter_make_reader (neg_wtr); } - + neg = casereader_clone (negatives); - n_neg = process_group (var, neg, lt, dict, &rs[i].n2); + n_neg = process_negative_group (var, neg, dict, &rs[i]); - /* Simple join on VALUE */ + w = sort_create_writer (&up_ordering, n_proto); for ( ; (cpos = casereader_read (n_pos) ); case_unref (cpos)) { - struct ccase *cneg = NULL; - double dneg = -DBL_MAX; - const double dpos = case_data_idx (cpos, VALUE)->f; - while (dneg < dpos) - { - if ( cneg ) - case_unref (cneg); + struct ccase *pos_case = case_create (n_proto); + struct ccase *cneg; + const double jpos = case_data_idx (cpos, VALUE)->f; - cneg = casereader_read (n_neg); - dneg = case_data_idx (cneg, VALUE)->f; - } - - if ( dpos == dneg ) + while ((cneg = casereader_read (n_neg))) { - double n_pos_eq = case_data_idx (cpos, N_EQ)->f; - double n_neg_eq = case_data_idx (cneg, N_EQ)->f; - double n_pos_gt = case_data_idx (cpos, N_PRED)->f; - double n_neg_lt = case_data_idx (cneg, N_PRED)->f; - - rs[i].auc += n_pos_gt * n_neg_eq + (n_pos_eq * n_neg_eq) / 2.0; - q1hat += n_neg_eq * ( pow2 (n_pos_gt) + n_pos_gt * n_pos_eq + pow2 (n_pos_eq) / 3.0); - q2hat += n_pos_eq * ( pow2 (n_neg_lt) + n_neg_lt * n_neg_eq + pow2 (n_neg_eq) / 3.0); - } + struct ccase *nc = case_create (n_proto); - if ( cneg ) - case_unref (cneg); - } + const double jneg = case_data_idx (cneg, VALUE)->f; - rs[i].auc /= rs[i].n1 * rs[i].n2; - if ( roc->invert ) - rs[i].auc = 1 - rs[i].auc; + case_data_rw_idx (nc, VALUE)->f = jneg; + case_data_rw_idx (nc, N_EQ)->f = 0; + case_data_rw_idx (nc, N_PRED)->f = SYSMIS; + + *case_data_rw_idx (nc, 3) = *case_data_idx (cneg, N_EQ); + *case_data_rw_idx (nc, 4) = *case_data_idx (cneg, N_PRED); + + casewriter_write (w, nc); + + case_unref (cneg); + if ( jneg > jpos) + break; + } + case_data_rw_idx (pos_case, VALUE)->f = jpos; + *case_data_rw_idx (pos_case, N_EQ) = *case_data_idx (cpos, N_EQ); + *case_data_rw_idx (pos_case, N_PRED) = *case_data_idx (cpos, N_PRED); + case_data_rw_idx (pos_case, 3)->f = 0; + case_data_rw_idx (pos_case, 4)->f = SYSMIS; + + casewriter_write (w, pos_case); + } + + r = casewriter_make_reader (w); + + { + double prev_pos_gt = rs[i].n1; + w = sort_create_writer (&down_ordering, n_proto); + + for ( ; (c = casereader_read (r) ); case_unref (c)) + { + double n_pos_gt = case_data_idx (c, N_PRED)->f; + struct ccase *nc = case_clone (c); + + if ( n_pos_gt == SYSMIS) + { + n_pos_gt = prev_pos_gt; + case_data_rw_idx (nc, N_PRED)->f = n_pos_gt; + } + + casewriter_write (w, nc); + prev_pos_gt = n_pos_gt; + } + + r = casewriter_make_reader (w); + } + + { + double prev_neg_lt = rs[i].n2; + w = sort_create_writer (&up_ordering, n_proto); + + for ( ; (c = casereader_read (r) ); case_unref (c)) + { + double n_neg_lt = case_data_idx (c, 4)->f; + struct ccase *nc = case_clone (c); + + if ( n_neg_lt == SYSMIS) + { + n_neg_lt = prev_neg_lt; + case_data_rw_idx (nc, 4)->f = n_neg_lt; + } + + casewriter_write (w, nc); + prev_neg_lt = n_neg_lt; + } + + r = casewriter_make_reader (w); + } + + { + struct ccase *prev_case = NULL; + for ( ; (c = casereader_read (r) ); case_unref (c)) + { + const struct ccase *next_case = casereader_peek (r, 0); + + const double j = case_data_idx (c, VALUE)->f; + double n_pos_eq = case_data_idx (c, N_EQ)->f; + double n_pos_gt = case_data_idx (c, N_PRED)->f; + double n_neg_eq = case_data_idx (c, 3)->f; + double n_neg_lt = case_data_idx (c, 4)->f; + + if ( prev_case && j == case_data_idx (prev_case, VALUE)->f) + { + if ( 0 == case_data_idx (c, N_EQ)->f) + { + n_pos_eq = case_data_idx (prev_case, N_EQ)->f; + n_pos_gt = case_data_idx (prev_case, N_PRED)->f; + } + + if ( 0 == case_data_idx (c, 3)->f) + { + n_neg_eq = case_data_idx (prev_case, 3)->f; + n_neg_lt = case_data_idx (prev_case, 4)->f; + } + } + + if ( NULL == next_case || j != case_data_idx (next_case, VALUE)->f) + { + rs[i].auc += n_pos_gt * n_neg_eq + (n_pos_eq * n_neg_eq) / 2.0; + + rs[i].q1hat += + n_neg_eq * ( pow2 (n_pos_gt) + n_pos_gt * n_pos_eq + pow2 (n_pos_eq) / 3.0); + rs[i].q2hat += + n_pos_eq * ( pow2 (n_neg_lt) + n_neg_lt * n_neg_eq + pow2 (n_neg_eq) / 3.0); + + } + + case_unref (prev_case); + prev_case = case_clone (c); + } + + rs[i].auc /= rs[i].n1 * rs[i].n2; + if ( roc->invert ) + rs[i].auc = 1 - rs[i].auc; + + if ( roc->bi_neg_exp ) + { + rs[i].q1hat = rs[i].auc / ( 2 - rs[i].auc); + rs[i].q2hat = 2 * pow2 (rs[i].auc) / ( 1 + rs[i].auc); + } + else + { + rs[i].q1hat /= rs[i].n2 * pow2 (rs[i].n1); + rs[i].q2hat /= rs[i].n1 * pow2 (rs[i].n2); + } + } } casereader_destroy (positives); @@ -507,9 +845,6 @@ do_roc (struct cmd_roc *roc, struct casereader *input, struct dictionary *dict) free (rs); } - - - static void show_auc (struct roc_state *rs, const struct cmd_roc *roc) { @@ -569,18 +904,14 @@ show_auc (struct roc_state *rs, const struct cmd_roc *roc) if ( roc->print_se ) { - double se ; const double sd_0_5 = sqrt ((rs[i].n1 + rs[i].n2 + 1) / (12 * rs[i].n1 * rs[i].n2)); double ci ; double yy ; - double q1 = rs[i].auc / ( 2 - rs[i].auc); - double q2 = 2 * pow2 (rs[i].auc) / ( 1 + rs[i].auc); - - se = rs[i].auc * (1 - rs[i].auc) + (rs[i].n1 - 1) * (q1 - pow2 (rs[i].auc)) + - (rs[i].n2 - 1) * (q2 - pow2 (rs[i].auc)); + se = rs[i].auc * (1 - rs[i].auc) + (rs[i].n1 - 1) * (rs[i].q1hat - pow2 (rs[i].auc)) + + (rs[i].n2 - 1) * (rs[i].q2hat - pow2 (rs[i].auc)); se /= rs[i].n1 * rs[i].n2; @@ -611,22 +942,206 @@ show_auc (struct roc_state *rs, const struct cmd_roc *roc) } +static void +show_summary (const struct cmd_roc *roc) +{ + const int n_cols = 3; + const int n_rows = 4; + struct tab_table *tbl = tab_create (n_cols, n_rows, 0); + + tab_title (tbl, _("Case Summary")); + + tab_headers (tbl, 1, 0, 2, 0); + + tab_dim (tbl, tab_natural_dimensions, NULL); + + tab_box (tbl, + TAL_2, TAL_2, + -1, -1, + 0, 0, + n_cols - 1, + n_rows - 1); + + tab_hline (tbl, TAL_2, 0, n_cols - 1, 2); + tab_vline (tbl, TAL_2, 1, 0, n_rows - 1); + + + tab_hline (tbl, TAL_2, 1, n_cols - 1, 1); + tab_vline (tbl, TAL_1, 2, 1, n_rows - 1); + + + tab_text (tbl, 0, 1, TAT_TITLE | TAB_LEFT, var_to_string (roc->state_var)); + tab_text (tbl, 1, 1, TAT_TITLE, _("Unweighted")); + tab_text (tbl, 2, 1, TAT_TITLE, _("Weighted")); + + tab_joint_text (tbl, 1, 0, 2, 0, + TAT_TITLE | TAB_CENTER, + _("Valid N (listwise)")); + + + tab_text (tbl, 0, 2, TAB_LEFT, _("Positive")); + tab_text (tbl, 0, 3, TAB_LEFT, _("Negative")); + + + tab_double (tbl, 1, 2, 0, roc->pos, &F_8_0); + tab_double (tbl, 1, 3, 0, roc->neg, &F_8_0); + + tab_double (tbl, 2, 2, 0, roc->pos_weighted, 0); + tab_double (tbl, 2, 3, 0, roc->neg_weighted, 0); + + tab_submit (tbl); +} + + +static void +show_coords (struct roc_state *rs, const struct cmd_roc *roc) +{ + int x = 1; + int i; + const int n_cols = roc->n_vars > 1 ? 4 : 3; + int n_rows = 1; + struct tab_table *tbl ; + + for (i = 0; i < roc->n_vars; ++i) + n_rows += casereader_count_cases (rs[i].cutpoint_rdr); + + tbl = tab_create (n_cols, n_rows, 0); + + if ( roc->n_vars > 1) + tab_title (tbl, _("Coordinates of the Curve")); + else + tab_title (tbl, _("Coordinates of the Curve (%s)"), var_to_string (roc->vars[0])); + + + tab_headers (tbl, 1, 0, 1, 0); + + tab_dim (tbl, tab_natural_dimensions, NULL); + + tab_hline (tbl, TAL_2, 0, n_cols - 1, 1); + + if ( roc->n_vars > 1) + tab_text (tbl, 0, 0, TAT_TITLE, _("Test variable")); + + tab_text (tbl, n_cols - 3, 0, TAT_TITLE, _("Positive if greater than or equal to")); + tab_text (tbl, n_cols - 2, 0, TAT_TITLE, _("Sensitivity")); + tab_text (tbl, n_cols - 1, 0, TAT_TITLE, _("1 - Specificity")); + + tab_box (tbl, + TAL_2, TAL_2, + -1, TAL_1, + 0, 0, + n_cols - 1, + n_rows - 1); + + if ( roc->n_vars > 1) + tab_vline (tbl, TAL_2, 1, 0, n_rows - 1); + + for (i = 0; i < roc->n_vars; ++i) + { + struct ccase *cc; + struct casereader *r = casereader_clone (rs[i].cutpoint_rdr); + + if ( roc->n_vars > 1) + tab_text (tbl, 0, x, TAT_TITLE, var_to_string (roc->vars[i])); + + if ( i > 0) + tab_hline (tbl, TAL_1, 0, n_cols - 1, x); + + + for (; (cc = casereader_read (r)) != NULL; + case_unref (cc), x++) + { + const double se = case_data_idx (cc, TP)->f / + ( + case_data_idx (cc, TP)->f + + + case_data_idx (cc, FN)->f + ); + + const double sp = case_data_idx (cc, TN)->f / + ( + case_data_idx (cc, TN)->f + + + case_data_idx (cc, FP)->f + ); + + tab_double (tbl, n_cols - 3, x, 0, case_data_idx (cc, CUTPOINT)->f, + var_get_print_format (roc->vars[i])); + + tab_double (tbl, n_cols - 2, x, 0, se, NULL); + tab_double (tbl, n_cols - 1, x, 0, 1 - sp, NULL); + } + + casereader_destroy (r); + } + + tab_submit (tbl); +} + + +static void +draw_roc (struct roc_state *rs, const struct cmd_roc *roc) +{ + int i; + + struct chart *roc_chart = chart_create (); + + chart_write_title (roc_chart, _("ROC Curve")); + chart_write_xlabel (roc_chart, _("1 - Specificity")); + chart_write_ylabel (roc_chart, _("Sensitivity")); + + chart_write_xscale (roc_chart, 0, 1, 5); + chart_write_yscale (roc_chart, 0, 1, 5); + + if ( roc->reference ) + { + chart_line (roc_chart, 1.0, 0, + 0.0, 1.0, + CHART_DIM_X); + } + + for (i = 0; i < roc->n_vars; ++i) + { + struct ccase *cc; + struct casereader *r = casereader_clone (rs[i].cutpoint_rdr); + + chart_vector_start (roc_chart, var_get_name (roc->vars[i])); + for (; (cc = casereader_read (r)) != NULL; + case_unref (cc)) + { + double se = case_data_idx (cc, TP)->f; + double sp = case_data_idx (cc, TN)->f; + + se /= case_data_idx (cc, FN)->f + + case_data_idx (cc, TP)->f ; + + sp /= case_data_idx (cc, TN)->f + + case_data_idx (cc, FP)->f ; + + chart_vector (roc_chart, 1 - sp, se); + } + chart_vector_end (roc_chart); + casereader_destroy (r); + } + + chart_write_legend (roc_chart); + + chart_submit (roc_chart); +} static void output_roc (struct roc_state *rs, const struct cmd_roc *roc) { -#if 0 show_summary (roc); if ( roc->curve ) draw_roc (rs, roc); -#endif show_auc (rs, roc); -#if 0 + if ( roc->print_coords ) show_coords (rs, roc); -#endif } +