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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include <gsl/gsl_cdf.h>
#include <stdlib.h>
#include <math.h>
#include "alloc.h"
-#include "str.h"
#include "case.h"
+#include "casefile.h"
#include "command.h"
#include "dictionary.h"
-#include "lexer.h"
#include "error.h"
+#include "group_proc.h"
+#include "hash.h"
+#include "levene.h"
+#include "lexer.h"
#include "magic.h"
#include "misc.h"
-#include "tab.h"
+#include "size_max.h"
#include "som.h"
+#include "str.h"
+#include "tab.h"
#include "value-labels.h"
#include "var.h"
#include "vfm.h"
-#include "hash.h"
-#include "group_proc.h"
-#include "casefile.h"
-#include "levene.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* (headers) */
/* (specification)
/* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func *value_is_missing;
/* Variable for the GROUPS subcommand, if given. */
static struct variable *indep_var;
static void group_postcalc (struct cmd_t_test *);
-static int compare_var_name (const void *a_, const void *b_, void *v_ UNUSED);
-static unsigned hash_var_name (const void *a_, void *v_ UNUSED);
-
static void calculate(const struct casefile *cf, void *_mode);
static int mode;
msg(SE,
_("TESTVAL, GROUPS and PAIRS subcommands are mutually exclusive.")
);
+ free_t_test(&cmd);
return CMD_FAILURE;
}
}
if (cmd.sbc_variables)
{
msg(SE, _("VARIABLES subcommand is not appropriate with PAIRS"));
+ free_t_test(&cmd);
return CMD_FAILURE;
}
else
struct hsh_table *hash;
struct variable *v;
- hash=hsh_create(n_pairs,compare_var_name,hash_var_name,0,0);
+ hash = hsh_create (n_pairs, compare_var_names, hash_var_name, 0, 0);
for (i=0; i < n_pairs; ++i)
{
assert(cmd.n_variables == 0);
cmd.n_variables = hsh_count(hash);
- cmd.v_variables = xrealloc(cmd.v_variables,
- sizeof(struct variable) * cmd.n_variables);
+ cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables,
+ sizeof *cmd.v_variables);
/* Iterate through the hash */
for (i=0,v = (struct variable *) hsh_first(hash,&hi);
v != 0;
else if ( !cmd.sbc_variables)
{
msg(SE, _("One or more VARIABLES must be specified."));
+ free_t_test(&cmd);
return CMD_FAILURE;
}
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == TTS_INCLUDE )
- value_is_missing = is_system_missing;
+ value_is_missing = mv_is_value_system_missing;
else
- value_is_missing = is_missing;
+ value_is_missing = mv_is_value_missing;
bad_weight_warn = 1;
for (v = 0 ; v < cmd.n_variables ; ++v )
{
struct group_proc *grpp = group_proc_get (cmd.v_variables[v]);
- free(grpp->group_hash);
+ hsh_destroy (grpp->group_hash);
}
}
+ free_t_test(&cmd);
return CMD_SUCCESS;
}
lex_match('=');
- if (token != T_ALL &&
- (token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
- )
- {
- msg(SE,_("`%s' is not a variable name"),tokid);
- return 0;
- }
-
indep_var = parse_variable ();
if (!indep_var)
{
tts_custom_pairs (struct cmd_t_test *cmd UNUSED)
{
struct variable **vars;
- int n_vars;
- int n_pairs_local;
+ size_t n_vars;
+ size_t n_pairs_local;
- int n_before_WITH ;
- int n_after_WITH = -1;
+ size_t n_before_WITH;
+ size_t n_after_WITH = SIZE_MAX;
int paired ; /* Was the PAIRED keyword given ? */
lex_match('=');
- if ((token != T_ID || dict_lookup_var (default_dict, tokid) == NULL)
- && token != T_ALL)
- {
- msg(SE,_("`%s' is not a variable name"),tokid);
- return 0;
- }
-
n_vars=0;
if (!parse_variables (default_dict, &vars, &n_vars,
PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH))
}
assert (n_vars);
- n_before_WITH=0;
+ n_before_WITH = 0;
if (lex_match (T_WITH))
{
n_before_WITH = n_vars;
n_before_WITH, n_after_WITH );
return 0;
}
- n_pairs_local=n_before_WITH;
+ n_pairs_local = n_before_WITH;
}
else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
{
- n_pairs_local=n_before_WITH * n_after_WITH ;
+ n_pairs_local = n_before_WITH * n_after_WITH ;
}
else /* Neither WITH nor PAIRED keyword given */
{
}
/* how many ways can you pick 2 from n_vars ? */
- n_pairs_local = n_vars * (n_vars -1 ) /2 ;
+ n_pairs_local = n_vars * (n_vars - 1) / 2;
}
/* Allocate storage for the pairs */
- pairs = xrealloc(pairs, sizeof(struct pair) * (n_pairs + n_pairs_local) );
+ pairs = xnrealloc (pairs, n_pairs + n_pairs_local, sizeof *pairs);
/* Populate the pairs with the appropriate variables */
if ( paired )
{
int i;
- assert(n_pairs_local == n_vars/2);
- for (i = 0; i < n_pairs_local ; ++i)
+ assert(n_pairs_local == n_vars / 2);
+ for (i = 0; i < n_pairs_local; ++i)
{
- pairs[i].v[n_pairs+0] = vars[i];
- pairs[i].v[n_pairs+1] = vars[i+n_pairs_local];
+ pairs[i].v[n_pairs] = vars[i];
+ pairs[i].v[n_pairs + 1] = vars[i + n_pairs_local];
}
}
else if (n_before_WITH > 0) /* WITH keyword given, but not PAIRED keyword */
{
int i,j;
- int p=n_pairs;
+ size_t p = n_pairs;
for(i=0 ; i < n_before_WITH ; ++i )
{
}
else /* Neither WITH nor PAIRED given */
{
- int i,j;
- int p=n_pairs;
+ size_t i,j;
+ size_t p=n_pairs;
for(i=0 ; i < n_vars ; ++i )
{
/* Implementation of the Test Results box struct */
-void trbox_base_init(struct trbox *self,int n_vars, int cols);
+void trbox_base_init(struct trbox *self,size_t n_vars, int cols);
void trbox_base_finalize(struct trbox *trb);
void trbox_independent_samples_init(struct trbox *trb,
/* Base initializer for the generalized trbox */
void
-trbox_base_init(struct trbox *self, int data_rows, int cols)
+trbox_base_init(struct trbox *self, size_t data_rows, int cols)
{
- const int rows = 3 + data_rows;
+ const size_t rows = 3 + data_rows;
self->finalize = trbox_base_finalize;
self->t = tab_create (cols, rows, 0);
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- if (value_is_missing(val,v) )
+ if (value_is_missing(&v->miss, val) )
{
return 0;
}
if ( cmd->sbc_groups )
{
const union value *gv = case_data (c, indep_var->fv);
- if ( value_is_missing(gv,indep_var) )
+ if ( value_is_missing(&indep_var->miss, gv) )
{
return 0;
}
gs= &group_proc_get (cmd->v_variables[i])->ugs;
- if (! value_is_missing(val,v) )
+ if (! value_is_missing(&v->miss, val) )
{
gs->n+=weight;
gs->sum+=weight * val->f;
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- if (value_is_missing(val,v) )
+ if (value_is_missing(&v->miss, val) )
{
return 0;
}
gs= &group_proc_get (cmd->v_variables[i])->ugs;
- if ( ! value_is_missing(val,v))
+ if ( ! value_is_missing(&v->miss, val))
gs->sum_diff += weight * (val->f - cmd->n_testval[0]);
}
-static int
-compare_var_name (const void *a_, const void *b_, void *v_ UNUSED)
-{
- const struct variable *a = a_;
- const struct variable *b = b_;
-
- return strcmp(a->name,b->name);
-}
-
-static unsigned
-hash_var_name (const void *a_, void *v_ UNUSED)
-{
- const struct variable *a = a_;
-
- return hsh_hash_bytes (a->name, strlen(a->name));
-}
-
-
-
static void
paired_precalc (struct cmd_t_test *cmd UNUSED)
{
const union value *val0 = case_data (c, v0->fv);
const union value *val1 = case_data (c, v1->fv);
- if ( value_is_missing(val0,v0) ||
- value_is_missing(val1,v1) )
+ if ( value_is_missing(&v0->miss, val0) ||
+ value_is_missing(&v1->miss, val1) )
{
return 0;
}
const union value *val0 = case_data (c, v0->fv);
const union value *val1 = case_data (c, v1->fv);
- if ( ( !value_is_missing(val0,v0) && !value_is_missing(val1,v1) ) )
+ if ( ( !value_is_missing(&v0->miss, val0)
+ && !value_is_missing(&v1->miss, val1) ) )
{
pairs[i].n += weight;
pairs[i].sum[0] += weight * val0->f;
for (j=0 ; j < 2 ; ++j)
{
- struct group_statistics *gs = (struct group_statistics *)
- xmalloc (sizeof(struct group_statistics));
+ struct group_statistics *gs = xmalloc (sizeof *gs);
gs->sum = 0;
gs->n = 0;
const double weight = dict_get_case_weight(default_dict,c,&bad_weight_warn);
- if ( value_is_missing(gv,indep_var) )
+ if ( value_is_missing(&indep_var->miss, gv) )
{
return 0;
}
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- if (value_is_missing(val,v) )
+ if (value_is_missing(&v->miss, val) )
{
return 0;
}
if ( ! gs )
return 0;
- if ( !value_is_missing(val,var) )
+ if ( !value_is_missing(&var->miss, val) )
{
gs->n+=weight;
gs->sum+=weight * val->f;
}
+short which_group(const struct group_statistics *g,
+ const struct group_properties *p);
/* Return -1 if the id of a is less than b; +1 if greater than and
0 if equal */
const struct group_statistics *b,
const struct group_properties *p)
{
-
short flag_a;
short flag_b;
-
+
if ( p->criterion == CMP_LE )
{
+ /* less-than-or-equal comparision is not meaningfull for
+ alpha variables, so we shouldn't ever arrive here */
assert(p->indep_width == 0 ) ;
+
flag_a = ( a->id.f < p->v.critical_value ) ;
flag_b = ( b->id.f < p->v.critical_value ) ;
}
else
{
- flag_a = ( a->id.f == p->v.critical_value ) ;
- flag_b = ( b->id.f == p->v.critical_value ) ;
+ flag_a = which_group(a, p);
+ flag_b = which_group(b, p);
}
- if ( flag_a == flag_b)
- return 0 ;
-
- return ( flag_a < flag_b);
+ if (flag_a < flag_b )
+ return -1;
+
+ return (flag_a > flag_b);
}
/* This is a degenerate case of a hash, since it can only return three possible
}
else if ( p->criterion == CMP_EQ)
{
- if ( 0 == compare_values (&g->id, &p->v.g_value[0], p->indep_width ))
- flag = 0 ;
- else if ( 0 == compare_values (&g->id, &p->v.g_value[1], p->indep_width ))
- flag = 1 ;
- else
- flag = 2 ;
+ flag = which_group(g,p);
}
else
assert(0);
return flag;
}
+
+/* return 0 if G belongs to group 0,
+ 1 if it belongs to group 1,
+ 2 if it belongs to neither group */
+short
+which_group(const struct group_statistics *g,
+ const struct group_properties *p)
+{
+
+ if ( 0 == compare_values (&g->id, &p->v.g_value[0], p->indep_width))
+ return 0;
+
+ if ( 0 == compare_values (&g->id, &p->v.g_value[1], p->indep_width))
+ return 1;
+
+ return 2;
+}
+
projects / pspp-builds.git / blobdiff