/* Populate the hash with zero entries */
for (i_d = trunc (lo); i_d <= trunc (hi); i_d += 1.0 )
{
- union value the_value;
struct freq_mutable *fr = xmalloc (sizeof (*fr));
-
- the_value.f = i_d;
-
- fr->value = value_dup (&the_value, 0);
+ value_init (&fr->value, 0);
+ fr->value.f = i_d;
fr->count = 0;
-
hsh_insert (freq_hash, fr);
}
- while ((c = casereader_read (input)) != NULL)
+ for (; (c = casereader_read (input)) != NULL; case_unref (c))
{
- union value obs_value;
- struct freq **existing_fr;
- struct freq *fr = xmalloc(sizeof (*fr));
- fr->value = case_data (c, var);
-
- fr->count = dict_get_case_weight (dict, c, &warn);
-
- obs_value.f = trunc (fr->value->f);
-
- if ( obs_value.f < lo || obs_value.f > hi)
- {
- free (fr);
- case_unref (c);
- continue;
- }
-
- fr->value = &obs_value;
-
- existing_fr = (struct freq **) hsh_probe (freq_hash, fr);
-
- /* This must exist in the hash, because we previously populated it
- with zero counts */
- assert (*existing_fr);
-
- (*existing_fr)->count += fr->count;
- free (fr);
-
- case_unref (c);
+ struct freq_mutable fr;
+ fr.value.f = trunc (case_num (c, var));
+ if (fr.value.f >= lo && fr.value.f <= hi)
+ {
+ struct freq_mutable *existing_fr = hsh_force_find (freq_hash, &fr);
+ existing_fr->count += dict_get_case_weight (dict, c, &warn);
+ }
}
if (casereader_destroy (input))
return freq_hash;
struct casereader *input,
const struct variable *var)
{
+ int width = var_get_width (var);
bool warn = true;
struct ccase *c;
for (; (c = casereader_read (input)) != NULL; case_unref (c))
{
- struct freq **existing_fr;
- struct freq *fr = xmalloc(sizeof (*fr));
- fr->value = case_data (c, var);
+ struct freq_mutable fr;
+ void **p;
- fr->count = dict_get_case_weight (dict, c, &warn);
+ fr.value = *case_data (c, var);
+ fr.count = dict_get_case_weight (dict, c, &warn);
- existing_fr = (struct freq **) hsh_probe (freq_hash, fr);
- if ( *existing_fr)
- {
- (*existing_fr)->count += fr->count;
- free (fr);
- }
+ p = hsh_probe (freq_hash, &fr);
+ if (*p == NULL)
+ {
+ struct freq_mutable *new_fr = *p = xmalloc (sizeof *new_fr);
+ value_init (&new_fr->value, width);
+ value_copy (&new_fr->value, &fr.value, width);
+ new_fr->count = fr.count;
+ }
else
- {
- *existing_fr = fr;
- fr->value = value_dup (fr->value, var_get_width (var));
- }
+ {
+ struct freq *existing_fr = *p;
+ existing_fr->count += fr.count;
+ }
}
if (casereader_destroy (input))
return freq_hash;
}
table = tab_create(4, n_cells + 2, 0);
- tab_dim (table, tab_natural_dimensions);
+ tab_dim (table, tab_natural_dimensions, NULL);
tab_title (table, var_to_string(var));
tab_text (table, 1, 0, TAB_LEFT, _("Observed N"));
int n_cells = test->hi - test->lo + 1;
table = tab_create(1 + ost->n_vars * 4, n_cells + 3, 0);
- tab_dim (table, tab_natural_dimensions);
+ tab_dim (table, tab_natural_dimensions, NULL);
tab_title (table, _("Frequencies"));
for ( i = 0 ; i < ost->n_vars ; ++i )
struct tab_table *table;
table = tab_create (1 + ost->n_vars, 4, 0);
- tab_dim (table, tab_natural_dimensions);
+ tab_dim (table, tab_natural_dimensions, NULL);
tab_title (table, _("Test Statistics"));
tab_headers (table, 1, 0, 1, 0);
{
struct string str;
double exp;
- const union value *observed_value = ff[i]->value;
+ const union value *observed_value = &ff[i]->value;
ds_init_empty (&str);
var_append_value_name (ost->vars[v], observed_value, &str);
struct string str;
double exp;
- const union value *observed_value = ff[i]->value;
+ const union value *observed_value = &ff[i]->value;
ds_init_empty (&str);
var_append_value_name (ost->vars[v], observed_value, &str);