X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Freliability.c;h=fd6af69448a59200195994aa7ebfc208c43a10a7;hb=3f5db6689698d28d22533342a7f8a02f4f1bb071;hp=92f4ac1c22b8a8730a41e3f891a59603b2250527;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c
index 92f4ac1c22..fd6af69448 100644
--- a/src/language/stats/reliability.c
+++ b/src/language/stats/reliability.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011, 2013, 2015 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
 
 #include "data/casegrouper.h"
 #include "data/casereader.h"
+#include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/format.h"
 #include "data/missing-values.h"
-#include "data/procedure.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
 #include "language/lexer/variable-parser.h"
@@ -108,6 +108,27 @@ struct reliability
 
 static bool run_reliability (struct dataset *ds, const struct reliability *reliability);
 
+static void
+reliability_destroy (struct reliability *rel)
+{
+  int j;
+  ds_destroy (&rel->scale_name);
+  if (rel->sc)
+    for (j = 0; j < rel->n_sc ; ++j)
+      {
+	int x;
+	free (rel->sc[j].items);
+        moments1_destroy (rel->sc[j].total);
+        if (rel->sc[j].m)
+          for (x = 0; x < rel->sc[j].n_items; ++x)
+            free (rel->sc[j].m[x]);
+	free (rel->sc[j].m);
+      }
+
+  free (rel->sc);
+  free (rel->variables);
+}
+
 int
 cmd_reliability (struct lexer *lexer, struct dataset *ds)
 {
@@ -117,12 +138,14 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
   reliability.n_variables = 0;
   reliability.variables = NULL;
   reliability.model = MODEL_ALPHA;
-    reliability.exclude = MV_ANY;
+  reliability.exclude = MV_ANY;
   reliability.summary = 0;
-
+  reliability.n_sc = 0;
+  reliability.sc = NULL;
   reliability.wv = dict_get_weight (dict);
-
   reliability.total_start = 0;
+  ds_init_empty (&reliability.scale_name);
+
 
   lex_match (lexer, T_SLASH);
 
@@ -149,7 +172,7 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
       reliability.n_sc = 1;
       reliability.sc = xzalloc (sizeof (struct cronbach) * reliability.n_sc);
 
-      ds_init_cstr (&reliability.scale_name, "ANY");
+      ds_assign_cstr (&reliability.scale_name, "ANY");
 
       c = &reliability.sc[0];
       c->n_items = reliability.n_variables;
@@ -174,7 +197,7 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
 	  if ( ! lex_force_string (lexer) ) 
 	    goto error;
 
-	  ds_init_substring (&reliability.scale_name, lex_tokss (lexer));
+	  ds_assign_substring (&reliability.scale_name, lex_tokss (lexer));
 
 	  lex_get (lexer);
 
@@ -185,7 +208,7 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
 
 	  vs = const_var_set_create_from_array (reliability.variables, reliability.n_variables);
 
-
+	  free (reliability.sc->items);
 	  if (!parse_const_var_set_vars (lexer, vs, &reliability.sc->items, &reliability.sc->n_items, 0))
 	    {
 	      const_var_set_destroy (vs);
@@ -206,12 +229,13 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
 	      reliability.model = MODEL_SPLIT;
 	      reliability.split_point = -1;
 
-	      if ( lex_match (lexer, T_LPAREN))
+	      if ( lex_match (lexer, T_LPAREN)
+		   && lex_force_num (lexer))
 		{
-		  lex_force_num (lexer);
 		  reliability.split_point = lex_number (lexer);
 		  lex_get (lexer);
-		  lex_force_match (lexer, T_RPAREN);
+		  if (! lex_force_match (lexer, T_RPAREN))
+		    goto error;
 		}
 	    }
 	  else
@@ -251,6 +275,14 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
 		}
 	    }
 	}
+      else if (lex_match_id (lexer, "STATISTICS"))
+        {
+          lex_match (lexer, T_EQUALS);
+          msg (SW, _("The STATISTICS subcommand is not yet implemented.  "
+                     "No statistics will be produced."));
+          while (lex_match (lexer, T_ID))
+            continue;
+        }
       else
 	{
 	  lex_error (lexer, NULL);
@@ -263,6 +295,12 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
       int i;
       const struct cronbach *s;
 
+      if ( reliability.split_point >= reliability.n_variables)
+        {
+          msg (ME, _("The split point must be less than the number of variables"));
+          goto error;
+        }
+
       reliability.n_sc += 2 ;
       reliability.sc = xrealloc (reliability.sc, sizeof (struct cronbach) * reliability.n_sc);
 
@@ -319,11 +357,11 @@ cmd_reliability (struct lexer *lexer, struct dataset *ds)
   if ( ! run_reliability (ds, &reliability)) 
     goto error;
 
-  free (reliability.variables);
+  reliability_destroy (&reliability);
   return CMD_SUCCESS;
 
  error:
-  free (reliability.variables);
+  reliability_destroy (&reliability);
   return CMD_FAILURE;
 }
 
@@ -346,6 +384,19 @@ run_reliability (struct dataset *ds, const struct reliability *reliability)
   struct casereader *group;
 
   struct casegrouper *grouper = casegrouper_create_splits (proc_open (ds), dict);
+  int si;
+
+  for (si = 0 ; si < reliability->n_sc; ++si)
+    {
+      struct cronbach *s = &reliability->sc[si];
+      int i;
+
+      s->m = xzalloc (sizeof *s->m * s->n_items);
+      s->total = moments1_create (MOMENT_VARIANCE);
+
+      for (i = 0 ; i < s->n_items ; ++i )
+	s->m[i] = moments1_create (MOMENT_VARIANCE);
+    }
 
 
   while (casegrouper_get_next_group (grouper, &group))
@@ -410,11 +461,10 @@ do_reliability (struct casereader *input, struct dataset *ds,
     {
       struct cronbach *s = &rel->sc[si];
 
-      s->m = xzalloc (sizeof (s->m) * s->n_items);
-      s->total = moments1_create (MOMENT_VARIANCE);
+      moments1_clear (s->total);
 
       for (i = 0 ; i < s->n_items ; ++i )
-	s->m[i] = moments1_create (MOMENT_VARIANCE);
+        moments1_clear (s->m[i]);
     }
 
   input = casereader_create_filter_missing (input,
@@ -472,7 +522,7 @@ 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_PARAGRAPH, "Scale: %s",
+  text_item_submit (text_item_create_format (TEXT_ITEM_PARAGRAPH, _("Scale: %s"),
                                              ds_cstr (&rel->scale_name)));
 
   case_processing_summary (n_valid, n_missing, dataset_dict (ds));
@@ -496,6 +546,7 @@ case_processing_summary (casenumber n_valid, casenumber n_missing,
   int heading_rows = 1;
   struct tab_table *tbl;
   tbl = tab_create (n_cols, n_rows);
+  tab_set_format (tbl, RC_WEIGHT, wfmt);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
   tab_title (tbl, _("Case Processing Summary"));
@@ -540,27 +591,27 @@ case_processing_summary (casenumber n_valid, casenumber n_missing,
   total = n_missing + n_valid;
 
   tab_double (tbl, 2, heading_rows, TAB_RIGHT,
-	     n_valid, wfmt);
+	     n_valid, NULL, RC_WEIGHT);
 
 
   tab_double (tbl, 2, heading_rows + 1, TAB_RIGHT,
-	     n_missing, wfmt);
+	     n_missing, NULL, RC_WEIGHT);
 
 
   tab_double (tbl, 2, heading_rows + 2, TAB_RIGHT,
-	     total, wfmt);
+	     total, NULL, RC_WEIGHT);
 
 
   tab_double (tbl, 3, heading_rows, TAB_RIGHT,
-	     100 * n_valid / (double) total, NULL);
+	      100 * n_valid / (double) total, NULL, RC_OTHER);
 
 
   tab_double (tbl, 3, heading_rows + 1, TAB_RIGHT,
-	     100 * n_missing / (double) total, NULL);
+	      100 * n_missing / (double) total, NULL, RC_OTHER);
 
 
   tab_double (tbl, 3, heading_rows + 2, TAB_RIGHT,
-	     100 * total / (double) total, NULL);
+	      100 * total / (double) total, NULL, RC_OTHER);
 
 
   tab_submit (tbl);
@@ -576,8 +627,10 @@ reliability_summary_total (const struct reliability *rel)
   const int heading_columns = 1;
   const int heading_rows = 1;
   const int n_rows = rel->sc[0].n_items + heading_rows ;
-
+  const struct variable *wv = rel->wv;
+  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
   struct tab_table *tbl = tab_create (n_cols, n_rows);
+  tab_set_format (tbl, RC_WEIGHT, wfmt);
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
   tab_title (tbl, _("Item-Total Statistics"));
@@ -626,13 +679,13 @@ reliability_summary_total (const struct reliability *rel)
       moments1_calculate (s->total, &weight, &mean, &var, 0, 0);
 
       tab_double (tbl, 1, heading_rows + i, TAB_RIGHT,
-		 mean, NULL);
+		  mean, NULL, RC_OTHER);
 
       tab_double (tbl, 2, heading_rows + i, TAB_RIGHT,
-		 s->variance_of_sums, NULL);
+		  s->variance_of_sums, NULL, RC_OTHER);
 
       tab_double (tbl, 4, heading_rows + i, TAB_RIGHT,
-		 s->alpha, NULL);
+		  s->alpha, NULL, RC_OTHER);
 
 
       moments1_calculate (rel->sc[0].m[i], &weight, &mean, &var, 0,0);
@@ -643,7 +696,7 @@ reliability_summary_total (const struct reliability *rel)
 
 
       tab_double (tbl, 3, heading_rows + i, TAB_RIGHT,
-		 item_to_total_r, NULL);
+		  item_to_total_r, NULL, RC_OTHER);
     }
 
 
@@ -681,8 +734,11 @@ reliability_statistics (const struct reliability *rel)
   int n_rows = rol[rel->model].n_rows;
   int heading_columns = rol[rel->model].heading_cols;
   int heading_rows = rol[rel->model].heading_rows;
-
+  const struct variable *wv = rel->wv;
+  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
   struct tab_table *tbl = tab_create (n_cols, n_rows);
+  tab_set_format (tbl, RC_WEIGHT, wfmt);
+
   tab_headers (tbl, heading_columns, 0, heading_rows, 0);
 
   tab_title (tbl, _("Reliability Statistics"));
@@ -719,9 +775,6 @@ static void
 reliability_statistics_model_alpha (struct tab_table *tbl,
 				    const struct reliability *rel)
 {
-  const struct variable *wv = rel->wv;
-  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
-
   const struct cronbach *s = &rel->sc[0];
 
   tab_text (tbl, 0, 0, TAB_CENTER | TAT_TITLE,
@@ -730,9 +783,9 @@ reliability_statistics_model_alpha (struct tab_table *tbl,
   tab_text (tbl, 1, 0, TAB_CENTER | TAT_TITLE,
 		_("N of Items"));
 
-  tab_double (tbl, 0, 1, TAB_RIGHT, s->alpha, NULL);
+  tab_double (tbl, 0, 1, TAB_RIGHT, s->alpha, NULL, RC_OTHER);
 
-  tab_double (tbl, 1, 1, TAB_RIGHT, s->n_items, wfmt);
+  tab_double (tbl, 1, 1, TAB_RIGHT, s->n_items, NULL, RC_WEIGHT);
 }
 
 
@@ -740,9 +793,6 @@ static void
 reliability_statistics_model_split (struct tab_table *tbl,
 				    const struct reliability *rel)
 {
-  const struct variable *wv = rel->wv;
-  const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0;
-
   tab_text (tbl, 0, 0, TAB_LEFT,
 	    _("Cronbach's Alpha"));
 
@@ -755,8 +805,6 @@ reliability_statistics_model_split (struct tab_table *tbl,
   tab_text (tbl, 2, 1, TAB_LEFT,
 	    _("N of Items"));
 
-
-
   tab_text (tbl, 1, 2, TAB_LEFT,
 	    _("Part 2"));
 
@@ -766,15 +814,12 @@ reliability_statistics_model_split (struct tab_table *tbl,
   tab_text (tbl, 2, 3, TAB_LEFT,
 	    _("N of Items"));
 
-
-
   tab_text (tbl, 1, 4, TAB_LEFT,
 	    _("Total N of Items"));
 
   tab_text (tbl, 0, 5, TAB_LEFT,
 	    _("Correlation Between Forms"));
 
-
   tab_text (tbl, 0, 6, TAB_LEFT,
 	    _("Spearman-Brown Coefficient"));
 
@@ -790,14 +835,14 @@ reliability_statistics_model_split (struct tab_table *tbl,
 
 
 
-  tab_double (tbl, 3, 0, TAB_RIGHT, rel->sc[1].alpha, NULL);
-  tab_double (tbl, 3, 2, TAB_RIGHT, rel->sc[2].alpha, NULL);
+  tab_double (tbl, 3, 0, TAB_RIGHT, rel->sc[1].alpha, NULL, RC_OTHER);
+  tab_double (tbl, 3, 2, TAB_RIGHT, rel->sc[2].alpha, NULL, RC_OTHER);
 
-  tab_double (tbl, 3, 1, TAB_RIGHT, rel->sc[1].n_items, wfmt);
-  tab_double (tbl, 3, 3, TAB_RIGHT, rel->sc[2].n_items, wfmt);
+  tab_double (tbl, 3, 1, TAB_RIGHT, rel->sc[1].n_items, NULL, RC_WEIGHT);
+  tab_double (tbl, 3, 3, TAB_RIGHT, rel->sc[2].n_items, NULL, RC_WEIGHT);
 
   tab_double (tbl, 3, 4, TAB_RIGHT,
-	     rel->sc[1].n_items + rel->sc[2].n_items, wfmt);
+	     rel->sc[1].n_items + rel->sc[2].n_items, NULL, RC_WEIGHT);
 
   {
     /* R is the correlation between the two parts */
@@ -816,12 +861,12 @@ reliability_statistics_model_split (struct tab_table *tbl,
     r /= sqrt (rel->sc[2].variance_of_sums);
     r /= 2.0;
 
-    tab_double (tbl, 3, 5, TAB_RIGHT, r, NULL);
+    tab_double (tbl, 3, 5, TAB_RIGHT, r, NULL, RC_OTHER);
 
     /* Equal length Spearman-Brown Coefficient */
-    tab_double (tbl, 3, 6, TAB_RIGHT, 2 * r / (1.0 + r), NULL);
+    tab_double (tbl, 3, 6, TAB_RIGHT, 2 * r / (1.0 + r), NULL, RC_OTHER);
 
-    tab_double (tbl, 3, 8, TAB_RIGHT, g, NULL);
+    tab_double (tbl, 3, 8, TAB_RIGHT, g, NULL, RC_OTHER);
 
     tmp = (1.0 - r*r) * rel->sc[1].n_items * rel->sc[2].n_items /
       pow2 (rel->sc[0].n_items);
@@ -830,7 +875,7 @@ reliability_statistics_model_split (struct tab_table *tbl,
     uly -= pow2 (r);
     uly /= 2 * tmp;
 
-    tab_double (tbl, 3, 7, TAB_RIGHT, uly, NULL);
+    tab_double (tbl, 3, 7, TAB_RIGHT, uly, NULL, RC_OTHER);
   }
 }