-/* PSPP - binary encodings for categorical variables.
- Copyright (C) 2005 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2005, 2009 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
*/
#include <config.h>
-#include "category.h"
-
#include <assert.h>
+#include <data/category.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <gl/xalloc.h>
+#include <libpspp/message.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
+#define CAT_VALUE_NOT_FOUND -1
#define N_INITIAL_CATEGORIES 1
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
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);
}
}
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);
}
}
{
candidate = obs_vals->vals + i;
assert (candidate != NULL);
- if (!compare_values (candidate, val, var_get_width (v)))
+ if (value_equal (candidate, val, var_get_width (v)))
{
return i;
}
}
/*
- 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)
{
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 *
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;
}
+/*
+ If VAR is categorical with d categories, its first category should
+ correspond to the origin in d-dimensional Euclidean space.
+ */
+bool
+cat_is_origin (const struct variable *var, const union value *val)
+{
+ if (var_is_numeric (var))
+ {
+ return false;
+ }
+ if (cat_value_find (var, val) == 0)
+ {
+ return true;
+ }
+ return false;
+}
projects / pspp-builds.git / blobdiff