projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite PSPP output engine.
[pspp-builds.git]
/
src
/
language
/
stats
/
roc.c
diff --git
a/src/language/stats/roc.c
b/src/language/stats/roc.c
index 1f2691d8919e01eac157688d053f218c426581af..724bc523a3beef42df39ca5b801da5918f88d398 100644
(file)
--- a/
src/language/stats/roc.c
+++ b/
src/language/stats/roc.c
@@
-18,28
+18,24
@@
#include <language/stats/roc.h>
#include <language/stats/roc.h>
-#include <data/procedure.h>
-#include <language/lexer/variable-parser.h>
-#include <language/lexer/value-parser.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-
#include <data/casegrouper.h>
#include <data/casereader.h>
#include <data/casewriter.h>
#include <data/dictionary.h>
#include <data/format.h>
#include <data/casegrouper.h>
#include <data/casereader.h>
#include <data/casewriter.h>
#include <data/dictionary.h>
#include <data/format.h>
-#include <
math/sort
.h>
+#include <
data/procedure
.h>
#include <data/subcase.h>
#include <data/subcase.h>
-
-
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/value-parser.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/misc.h>
#include <libpspp/misc.h>
+#include <math/sort.h>
+#include <output/chart-item.h>
+#include <output/charts/roc-chart.h>
+#include <output/tab.h>
#include <gsl/gsl_cdf.h>
#include <gsl/gsl_cdf.h>
-#include <output/table.h>
-
-#include <output/chart.h>
-#include <output/charts/roc-chart.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-939,7
+935,6
@@
show_auc (struct roc_state *rs, const struct cmd_roc *roc)
tab_headers (tbl, n_cols - n_fields, 0, 1, 0);
tab_headers (tbl, n_cols - n_fields, 0, 1, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
tab_text (tbl, n_cols - n_fields, 1, TAT_TITLE, _("Area"));
tab_text (tbl, n_cols - n_fields, 1, TAT_TITLE, _("Area"));
@@
-1031,8
+1026,6
@@
show_summary (const struct cmd_roc *roc)
tab_headers (tbl, 1, 0, 2, 0);
tab_headers (tbl, 1, 0, 2, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
tab_box (tbl,
TAL_2, TAL_2,
-1, -1,
tab_box (tbl,
TAL_2, TAL_2,
-1, -1,
@@
-1093,8
+1086,6
@@
show_coords (struct roc_state *rs, const struct cmd_roc *roc)
tab_headers (tbl, 1, 0, 1, 0);
tab_headers (tbl, 1, 0, 1, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
tab_hline (tbl, TAL_2, 0, n_cols - 1, 1);
if ( roc->n_vars > 1)
tab_hline (tbl, TAL_2, 0, n_cols - 1, 1);
if ( roc->n_vars > 1)
@@
-1171,7
+1162,7
@@
output_roc (struct roc_state *rs, const struct cmd_roc *roc)
for (i = 0; i < roc->n_vars; i++)
roc_chart_add_var (rc, var_get_name (roc->vars[i]),
rs[i].cutpoint_rdr);
for (i = 0; i < roc->n_vars; i++)
roc_chart_add_var (rc, var_get_name (roc->vars[i]),
rs[i].cutpoint_rdr);
-
chart_submit (roc_chart_get_chart (rc)
);
+
roc_chart_submit (rc
);
}
show_auc (rs, roc);
}
show_auc (rs, roc);