Work on MCONVERT.

[pspp] / src / language / stats / reliability.c

diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c
index 7b73f8a47e7efbbcccac94cd515f5c4a5037a4e9..86c1add760eb2faad211df850d53fadd020c28ab 100644 (file)
--- a/src/language/stats/reliability.c
+++ b/src/language/stats/reliability.c
@@ -32,7 +32,7 @@
 #include "libpspp/str.h"
 #include "math/moments.h"
 #include "output/pivot-table.h"
-#include "output/text-item.h"
+#include "output/output-item.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -426,11 +426,8 @@ append_sum (const struct ccase *c, casenumber n UNUSED, void *aux)
   double sum = 0;
   const struct cronbach *s = aux;
 
-  int v;
-  for (v = 0 ; v < s->n_items; ++v)
-    {
-      sum += case_data (c, s->items[v])->f;
-    }
+  for (int v = 0 ; v < s->n_items; ++v)
+    sum += case_num (c, s->items[v]);
 
   return sum;
 };
@@ -495,9 +492,9 @@ do_reliability (struct casereader *input, struct dataset *ds,
          struct cronbach *s = &rel->sc[si];
 
          for (i = 0 ; i < s->n_items ; ++i)
-           moments1_add (s->m[i], case_data (c, s->items[i])->f, weight);
+           moments1_add (s->m[i], case_num (c, s->items[i]), weight);
 
-         moments1_add (s->total, case_data_idx (c, s->totals_idx)->f, weight);
+         moments1_add (s->total, case_num_idx (c, s->totals_idx), weight);
        }
     }
   casereader_destroy (input);
@@ -522,8 +519,10 @@ do_reliability (struct casereader *input, struct dataset *ds,
        alpha (s->n_items, s->sum_of_variances, s->variance_of_sums);
     }
 
-  text_item_submit (text_item_create_format (TEXT_ITEM_TITLE, _("Scale: %s"),
-                                             ds_cstr (&rel->scale_name)));
+  output_item_submit (text_item_create_nocopy (
+                        TEXT_ITEM_TITLE,
+                        xasprintf (_("Scale: %s"), ds_cstr (&rel->scale_name)),
+                        NULL));
 
   case_processing_summary (n_valid, n_missing, dataset_dict (ds));
 }