X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.c;h=215f4d1fbc89ca5d406fae4a196bb4797e6cdac0;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=c8b337e452012f03c2d16f5229f2253441a16b21;hpb=9c8be641c528c8f55a68669e0014ee7664233d41;p=pspp-builds.git diff --git a/src/math/categoricals.c b/src/math/categoricals.c index c8b337e4..215f4d1f 100644 --- a/src/math/categoricals.c +++ b/src/math/categoricals.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011 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 @@ -16,19 +16,19 @@ #include -#include +#include "math/categoricals.h" -#include "categoricals.h" +#include -#include -#include -#include -#include -#include -#include -#include +#include "data/case.h" +#include "data/value.h" +#include "data/variable.h" +#include "libpspp/array.h" +#include "libpspp/hmap.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" -#include +#include "gl/xalloc.h" struct value_node { @@ -311,7 +311,7 @@ categoricals_total (const struct categoricals *cat) /* This function must be called *before* any call to categoricals_get_*_by subscript an *after* all calls to categoricals_update */ void -categoricals_done (struct categoricals *cat) +categoricals_done (const struct categoricals *cat_) { /* Implementation Note: Whilst this function is O(n) in cat->n_cats_total, in most uses it will be more efficient that using a tree based structure, since it @@ -319,6 +319,7 @@ categoricals_done (struct categoricals *cat) 1 call of O(n) + 10^9 calls of O(1) is better than 10^9 calls of O(log n). */ + struct categoricals *cat = CONST_CAST (struct categoricals *, cat_); int v; int idx = 0; cat->reverse_variable_map = pool_calloc (cat->pool,