projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Categoricals.c Create entries for all groups.
[pspp]
/
src
/
math
/
categoricals.c
diff --git
a/src/math/categoricals.c
b/src/math/categoricals.c
index 33e3b51c62f99cc2290ce7918dbba6aedb111878..c544f97e98000ade273bd78785bd9a9a4b924e1b 100644
(file)
--- a/
src/math/categoricals.c
+++ b/
src/math/categoricals.c
@@
-102,6
+102,7
@@
categoricals_destroy ( struct categoricals *cat)
}
}
+#if 0
void
categoricals_dump (const struct categoricals *cat)
{
void
categoricals_dump (const struct categoricals *cat)
{
@@
-132,8
+133,8
@@
categoricals_dump (const struct categoricals *cat)
for (node = hmap_first (m); node; node = hmap_next (m, node))
{
struct string s;
for (node = hmap_first (m); node; node = hmap_next (m, node))
{
struct string s;
- ds_init_empty (&s);
const struct value_node *vn = HMAP_DATA (node, struct value_node, node);
const struct value_node *vn = HMAP_DATA (node, struct value_node, node);
+ ds_init_empty (&s);
var_append_value_name (vp->var, &vn->value, &s);
printf ("Value: %s; Index %d; CC %g\n",
ds_cstr (&s),
var_append_value_name (vp->var, &vn->value, &s);
printf ("Value: %s; Index %d; CC %g\n",
ds_cstr (&s),
@@
-151,10
+152,11
@@
categoricals_dump (const struct categoricals *cat)
printf ("\nReverse variable map:\n");
printf ("\nReverse variable map:\n");
- for (v = 0 ; v < cat->n_cats_total
- cat->n_vars
; ++v)
+ for (v = 0 ; v < cat->n_cats_total; ++v)
printf ("%d ", cat->reverse_variable_map[v]);
printf ("\n");
}
printf ("%d ", cat->reverse_variable_map[v]);
printf ("\n");
}
+#endif
@@
-281,7
+283,7
@@
categoricals_done (struct categoricals *cat)
int v;
int idx = 0;
cat->reverse_variable_map = pool_calloc (cat->pool,
int v;
int idx = 0;
cat->reverse_variable_map = pool_calloc (cat->pool,
- cat->n_cats_total
- cat->n_vars
,
+ cat->n_cats_total,
sizeof *cat->reverse_variable_map);
for (v = 0 ; v < cat->n_vp; ++v)
sizeof *cat->reverse_variable_map);
for (v = 0 ; v < cat->n_vp; ++v)
@@
-302,9
+304,8
@@
categoricals_done (struct categoricals *cat)
}
/* Populate the reverse variable map.
}
/* Populate the reverse variable map.
- This implementation considers the first value of each categorical variable
- as the basis. Therefore, this loop starts from 1 instead of 0 */
- for (i = 1; i < vp->n_cats; ++i)
+ */
+ for (i = 0; i < vp->n_cats; ++i)
cat->reverse_variable_map[idx++] = v;
}
cat->reverse_variable_map[idx++] = v;
}
@@
-317,7
+318,7
@@
reverse_variable_lookup (const struct categoricals *cat, int subscript)
{
assert (cat->reverse_variable_map);
assert (subscript >= 0);
{
assert (cat->reverse_variable_map);
assert (subscript >= 0);
- assert (subscript < cat->n_cats_total
- cat->n_vars
);
+ assert (subscript < cat->n_cats_total);
return cat->reverse_variable_map[subscript];
}
return cat->reverse_variable_map[subscript];
}