projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate table functions that format their arguments from those that don't.
[pspp-builds.git]
/
src
/
language
/
stats
/
reliability.q
diff --git
a/src/language/stats/reliability.q
b/src/language/stats/reliability.q
index 0e7f91a02629776213b18938045cd0a0dfb7afdd..681669d18999fdac3c5516c9815b9079aae99dfb 100644
(file)
--- a/
src/language/stats/reliability.q
+++ b/
src/language/stats/reliability.q
@@
-16,26
+16,27
@@
#include <config.h>
#include <config.h>
-#include "xalloc.h"
-#include "xmalloca.h"
+#include <math.h>
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-#include <data/variable.h>
+#include <data/case.h>
+#include <data/casegrouper.h>
+#include <data/casereader.h>
#include <data/dictionary.h>
#include <data/procedure.h>
#include <data/dictionary.h>
#include <data/procedure.h>
-#include <data/casereader.h>
-#include <data/casegrouper.h>
-#include <math/moments.h>
-#include <data/case.h>
-
+#include <data/variable.h>
#include <language/command.h>
#include <language/command.h>
-
+#include <libpspp/misc.h>
+#include <math/moments.h>
#include <output/manager.h>
#include <output/table.h>
#include <output/manager.h>
#include <output/table.h>
+#include "xalloc.h"
+#include "xmalloca.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
/* (headers) */
/* (specification)
/* (headers) */
/* (specification)
@@
-335,7
+336,7
@@
run_reliability (struct casereader *input, struct dataset *ds,
struct cronbach *s = &rel->sc[si];
struct cronbach *s = &rel->sc[si];
- s->totals_idx = case
reader_get_value_cnt (input
);
+ s->totals_idx = case
proto_get_n_widths (casereader_get_proto (input)
);
input =
casereader_create_append_numeric (input, append_sum,
s, NULL);
input =
casereader_create_append_numeric (input, append_sum,
s, NULL);
@@
-382,10
+383,10
@@
run_reliability (struct casereader *input, struct dataset *ds,
{
struct tab_table *tab = tab_create(1, 1, 0);
{
struct tab_table *tab = tab_create(1, 1, 0);
- tab_dim (tab, tab_natural_dimensions);
+ tab_dim (tab, tab_natural_dimensions
, NULL
);
tab_flags (tab, SOMF_NO_TITLE );
tab_flags (tab, SOMF_NO_TITLE );
- tab_text
(tab, 0, 0, TAT_PRINTF
, "Scale: %s", ds_cstr (&rel->scale_name));
+ tab_text
_format (tab, 0, 0, 0
, "Scale: %s", ds_cstr (&rel->scale_name));
tab_submit(tab);
}
tab_submit(tab);
}
@@
-427,7
+428,7
@@
reliability_statistics (const struct reliability *rel)
struct tab_table *tbl = tab_create (n_cols, n_rows, 0);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
struct tab_table *tbl = tab_create (n_cols, n_rows, 0);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions);
+ tab_dim (tbl, tab_natural_dimensions
, NULL
);
tab_title (tbl, _("Reliability Statistics"));
tab_title (tbl, _("Reliability Statistics"));
@@
-470,7
+471,7
@@
reliability_summary_total (const struct reliability *rel)
struct tab_table *tbl = tab_create (n_cols, n_rows, 0);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
struct tab_table *tbl = tab_create (n_cols, n_rows, 0);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions);
+ tab_dim (tbl, tab_natural_dimensions
, NULL
);
tab_title (tbl, _("Item-Total Statistics"));
tab_title (tbl, _("Item-Total Statistics"));
@@
-680,7
+681,7
@@
case_processing_summary (casenumber n_valid, casenumber n_missing,
tbl = tab_create (n_cols, n_rows, 0);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows, 0);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions);
+ tab_dim (tbl, tab_natural_dimensions
, NULL
);
tab_title (tbl, _("Case Processing Summary"));
tab_title (tbl, _("Case Processing Summary"));
@@
-719,8
+720,7
@@
case_processing_summary (casenumber n_valid, casenumber n_missing,
tab_text (tbl, heading_columns, 0, TAB_CENTER | TAT_TITLE,
_("N"));
tab_text (tbl, heading_columns, 0, TAB_CENTER | TAT_TITLE,
_("N"));
- tab_text (tbl, heading_columns + 1, 0, TAB_CENTER | TAT_TITLE | TAT_PRINTF,
- _("%%"));
+ tab_text (tbl, heading_columns + 1, 0, TAB_CENTER | TAT_TITLE, _("%"));
total = n_missing + n_valid;
total = n_missing + n_valid;