};
void one_sample_insert_variables (const struct npar_test *test,
- struct hsh_table *variables);
+ struct const_hsh_table *variables);
static bool
npar_execute(const struct ccase *first UNUSED,
bool ok;
int i;
struct npar_specs npar_specs = {0, 0, 0, 0, 0, 0, 0, 0};
- struct hsh_table *var_hash;
+ struct const_hsh_table *var_hash;
npar_specs.pool = pool_create ();
- var_hash = hsh_create_pool (npar_specs.pool, 0,
+ var_hash = const_hsh_create_pool (npar_specs.pool, 0,
compare_vars_by_name, hash_var_by_name,
NULL, NULL);
return CMD_FAILURE;
}
- for (i = 0; i < npar_specs.n_tests; ++i )
+ for (i = 0; i < npar_specs.n_tests; ++i )
{
const struct npar_test *test = npar_specs.test[i];
test->insert_variables (test, var_hash);
}
- npar_specs.vv = (const struct variable *const *) hsh_data (var_hash);
- npar_specs.n_vars = hsh_count (var_hash);
-
- if ( cmd.sbc_statistics )
+ npar_specs.vv = (const struct variable *const *) const_hsh_data (var_hash);
+ npar_specs.n_vars = const_hsh_count (var_hash);
+
+ if ( cmd.sbc_statistics )
{
int i;
- for ( i = 0 ; i < NPAR_ST_count; ++i )
+ for ( i = 0 ; i < NPAR_ST_count; ++i )
{
- if ( cmd.a_statistics[i] )
+ if ( cmd.a_statistics[i] )
{
- switch ( i )
+ switch ( i )
{
case NPAR_ST_DESCRIPTIVES:
npar_specs.descriptives = true;
casefilter_destroy (npar_specs.filter);
- hsh_destroy (var_hash);
+ const_hsh_destroy (var_hash);
pool_destroy (npar_specs.pool);
((struct npar_test *)tp)->execute = chisquare_execute;
((struct npar_test *)tp)->insert_variables = one_sample_insert_variables;
- if (!parse_variables_pool (lexer, specs->pool, dataset_dict (ds),
+ if (!parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
&tp->vars, &tp->n_vars,
PV_NO_SCRATCH | PV_NO_DUPLICATE))
{
if ( lex_match (lexer, '=') )
{
- if (parse_variables_pool (lexer, specs->pool, dataset_dict (ds),
+ if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
&tp->vars, &tp->n_vars,
PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
{
int n = 0;
bool paired = false;
bool with = false;
- struct variable **vlist1;
+ const struct variable **vlist1;
size_t n_vlist1;
- struct variable **vlist2;
+ const struct variable **vlist2;
size_t n_vlist2;
- if (!parse_variables_pool (lexer, pool,
+ if (!parse_variables_const_pool (lexer, pool,
dict,
&vlist1, &n_vlist1,
PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
if ( lex_match(lexer, T_WITH))
{
with = true;
- if ( !parse_variables_pool (lexer, pool, dict,
+ if ( !parse_variables_const_pool (lexer, pool, dict,
&vlist2, &n_vlist2,
PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
return false;
/* Insert the variables for TEST into VAR_HASH */
void
one_sample_insert_variables (const struct npar_test *test,
- struct hsh_table *var_hash)
+ struct const_hsh_table *var_hash)
{
int i;
struct one_sample_test *ost = (struct one_sample_test *) test;
- for ( i = 0 ; i < ost->n_vars ; ++i )
- hsh_insert (var_hash, ost->vars[i]);
+ for ( i = 0 ; i < ost->n_vars ; ++i )
+ const_hsh_insert (var_hash, ost->vars[i]);
}