X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcategory.c;h=1620bc7f7f9b3c27bbde71737eeb860d5c4f7cf0;hb=3d161b40e72009aeca4bfc1cb8be82d05d7e6e2a;hp=a8dd431b31904845b9efec054fbb4646af5e0190;hpb=13a7d7fb2c398784b25f7f5f363c3fd86dc93eed;p=pspp-builds.git

diff --git a/src/data/category.c b/src/data/category.c
index a8dd431b..1620bc7f 100644
--- a/src/data/category.c
+++ b/src/data/category.c
@@ -1,20 +1,18 @@
-/* PSPP - binary encodings for categorical variables.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2005 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 /*
   Functions and data structures to store values of a categorical
@@ -32,19 +30,18 @@
 */
 #include <config.h>
 
-#include "category.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/alloc.h>
 #include <libpspp/message.h>
 #include "category.h"
 #include "value.h"
 #include "variable.h"
 
-#define CAT_VALUE_NOT_FOUND -2
+#include "xalloc.h"
+
+#define CAT_VALUE_NOT_FOUND -1
 
 #define N_INITIAL_CATEGORIES 1
 
@@ -61,6 +58,11 @@ struct cat_vals
 					   track of the number of
 					   values stored.
 					 */
+  size_t *value_counts; /* Element i stores the number of cases for which
+			   the categorical variable has that corresponding 
+			   value. This is necessary for computing covariance
+			   matrices.
+			 */
 };
 
 void
@@ -73,6 +75,7 @@ cat_stored_values_create (const struct variable *v)
       obs_vals->n_categories = 0;
       obs_vals->n_allocated_categories = N_INITIAL_CATEGORIES;
       obs_vals->vals = xnmalloc (N_INITIAL_CATEGORIES, sizeof *obs_vals->vals);
+      obs_vals->value_counts = xnmalloc (N_INITIAL_CATEGORIES, sizeof *obs_vals->value_counts);
       var_set_obs_vals (v, obs_vals);
     }
 }
@@ -83,7 +86,10 @@ cat_stored_values_destroy (struct cat_vals *obs_vals)
   if (obs_vals != NULL)
     {
       if (obs_vals->n_allocated_categories > 0)
-        free (obs_vals->vals);
+	{
+	  free (obs_vals->vals);
+	  free (obs_vals->value_counts);
+	}
       free (obs_vals);
     }
 }
@@ -111,15 +117,17 @@ cat_value_find (const struct variable *v, const union value *val)
 }
 
 /*
-   Add the new value unless it is already present.
+   Add the new value unless it is already present. Increment the count.
  */
 void
 cat_value_update (const struct variable *v, const union value *val)
 {
   if (var_is_alpha (v))
     {
+      size_t i;
       struct cat_vals *cv = var_get_obs_vals (v);
-      if (cat_value_find (v, val) == CAT_VALUE_NOT_FOUND)
+      i = cat_value_find (v, val);
+      if (i == CAT_VALUE_NOT_FOUND)
 	{
 	  if (cv->n_categories >= cv->n_allocated_categories)
 	    {
@@ -127,11 +135,35 @@ cat_value_update (const struct variable *v, const union value *val)
 	      cv->vals = xnrealloc (cv->vals,
 				    cv->n_allocated_categories,
 				    sizeof *cv->vals);
+	      cv->value_counts = xnrealloc (cv->value_counts, cv->n_allocated_categories,
+					    sizeof *cv->value_counts);
 	    }
 	  cv->vals[cv->n_categories] = *val;
+	  cv->value_counts[cv->n_categories] = 1;
 	  cv->n_categories++;
 	}
+      else
+	{
+	  cv->value_counts[i]++;
+	}
+    }
+}
+/*
+  Return the count for the sth category.
+ */
+size_t
+cat_get_category_count (const size_t s, const struct variable *v)
+{
+  struct cat_vals *tmp;
+  size_t n_categories;
+
+  tmp = var_get_obs_vals (v);
+  n_categories = cat_get_n_categories (v);
+  if (s < n_categories)
+    {
+      return tmp->value_counts[s];
     }
+  return CAT_VALUE_NOT_FOUND;
 }
 
 const union value *
@@ -144,7 +176,7 @@ cat_subscript_to_value (const size_t s, const struct variable *v)
 /*
   Return the number of categories of a categorical variable.
  */
-size_t 
+size_t
 cat_get_n_categories (const struct variable *v)
 {
   return var_get_obs_vals (v)->n_categories;