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 "str.h"
#include "case.h"
#include "command.h"
+#include "dictionary.h"
#include "lexer.h"
#include "error.h"
#include "magic.h"
#include "casefile.h"
#include "levene.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
+/* (headers) */
+
/* (specification)
"T-TEST" (tts_):
+groups=custom;
- +testval=double;
+ testval=double;
variables=varlist("PV_NO_SCRATCH | PV_NUMERIC");
pairs=custom;
+missing=miss:!analysis/listwise,
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;
static int compare_group_binary(const struct group_statistics *a,
const struct group_statistics *b,
- struct group_properties *p);
+ const struct group_properties *p);
static unsigned hash_group_binary(const struct group_statistics *g,
- struct group_properties *p);
+ const struct group_properties *p);
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)
{
else if ( !cmd.sbc_variables)
{
msg(SE, _("One or more VARIABLES must be specified."));
+ free_t_test(&cmd);
return CMD_FAILURE;
}
/* Destroy any group statistics we created */
for (v = 0 ; v < cmd.n_variables ; ++v )
{
- struct group_proc *grpp = &cmd.v_variables[v]->p.grp_data;
- free(grpp->group_hash);
+ struct group_proc *grpp = group_proc_get (cmd.v_variables[v]);
+ 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)
{
}
else
{
- msg (SE, _("When applying GROUPS to a string variable, at "
- "least one value must be specified."));
+ msg (SE, _("When applying GROUPS to a string variable, two "
+ "values must be specified."));
return 0;
}
}
- if (!parse_value (&gp.v.g_value[0],indep_var->type))
+ if (!parse_value (&gp.v.g_value[0], indep_var->type))
return 0;
lex_match (',');
if (lex_match (')'))
{
+ if (indep_var->type != NUMERIC)
+ {
+
+ msg (SE, _("When applying GROUPS to a string variable, two "
+ "values must be specified."));
+ return 0;
+ }
gp.criterion = CMP_LE;
gp.v.critical_value = gp.v.g_value[0].f;
return 1;
}
- if (!parse_value (&gp.v.g_value[1],indep_var->type))
+ if (!parse_value (&gp.v.g_value[1], indep_var->type))
return 0;
n_group_values = 2;
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))
for (i=0; i < cmd->n_variables; ++i)
{
struct variable *var = cmd->v_variables[i];
- struct hsh_table *grp_hash = var->p.grp_data.group_hash;
+ struct hsh_table *grp_hash = group_proc_get (var)->group_hash;
int count=0;
tab_text (ssb->t, 0, i*2+1, TAB_LEFT, cmd->v_variables[i]->name);
{
struct group_statistics *gs;
- gs=&pairs[i].v[j]->p.grp_data.ugs;
+ gs = &group_proc_get (pairs[i].v[j])->ugs;
/* Titles */
for (i=0; i < cmd->n_variables; ++i)
{
- struct group_statistics *gs;
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ struct group_statistics *gs = &group_proc_get (cmd->v_variables[i])->ugs;
tab_text (ssb->t, 0, i+1, TAB_LEFT, cmd->v_variables[i]->name);
tab_float (ssb->t,1, i+1, TAB_RIGHT, gs->n, 2, 0);
double mean_diff;
struct variable *var = cmd->v_variables[i];
+ struct group_proc *grp_data = group_proc_get (var);
- struct hsh_table *grp_hash = var->p.grp_data.group_hash;
+ struct hsh_table *grp_hash = grp_data->group_hash;
struct group_statistics *gs0 ;
struct group_statistics *gs1 ;
tab_text (self->t, 1, i*2+3, TAB_LEFT, _("Equal variances assumed"));
- tab_float(self->t, 2, i*2+3, TAB_CENTER,
- cmd->v_variables[i]->p.grp_data.levene, 8,3);
+ tab_float(self->t, 2, i*2+3, TAB_CENTER, grp_data->levene, 8,3);
/* Now work out the significance of the Levene test */
- df1 = 1; df2 = cmd->v_variables[i]->p.grp_data.ugs.n - 2;
- q = gsl_cdf_fdist_Q(cmd->v_variables[i]->p.grp_data.levene, df1, df2);
+ df1 = 1; df2 = grp_data->ugs.n - 2;
+ q = gsl_cdf_fdist_Q(grp_data->levene, df1, df2);
tab_float(self->t, 3, i*2+3, TAB_CENTER, q, 8,3 );
tab_vline(self->t, TAL_2, 1, 0, vsize - 1);
tab_joint_text(self->t, 1, 0, hsize-1,0, TAB_CENTER | TAT_PRINTF,
- _("Test Value = %f"),cmd->n_testval);
+ _("Test Value = %f"), cmd->n_testval[0]);
tab_box(self->t, -1, -1, -1, TAL_1, 1,1,hsize-1,vsize-1);
double t;
double p,q;
double df;
- struct group_statistics *gs;
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ struct group_statistics *gs = &group_proc_get (cmd->v_variables[i])->ugs;
tab_text (trb->t, 0, i+3, TAB_LEFT, cmd->v_variables[i]->name);
- t = (gs->mean - cmd->n_testval ) * sqrt(gs->n) / gs->std_dev ;
+ t = (gs->mean - cmd->n_testval[0] ) * sqrt(gs->n) / gs->std_dev ;
tab_float (trb->t, 1, i+3, TAB_RIGHT, t, 8,3);
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ gs= &group_proc_get (cmd->v_variables[i])->ugs;
if (! value_is_missing(val,v) )
{
for(i=0; i< cmd->n_variables ; ++i)
{
struct group_statistics *gs;
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ gs= &group_proc_get (cmd->v_variables[i])->ugs;
gs->sum=0;
gs->n=0;
for(i=0; i< cmd->n_variables ; ++i)
{
struct group_statistics *gs;
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ gs= &group_proc_get (cmd->v_variables[i])->ugs;
gs->mean=gs->sum / gs->n;
gs->s_std_dev= sqrt(
struct variable *v = cmd->v_variables[i];
const union value *val = case_data (c, v->fv);
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ gs= &group_proc_get (cmd->v_variables[i])->ugs;
if ( ! value_is_missing(val,v))
- gs->sum_diff += weight * (val->f - cmd->n_testval);
+ gs->sum_diff += weight * (val->f - cmd->n_testval[0]);
}
return 0;
for(i=0; i< cmd->n_variables ; ++i)
{
struct group_statistics *gs;
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ gs= &group_proc_get (cmd->v_variables[i])->ugs;
gs->sum_diff=0;
}
for(i=0; i< cmd->n_variables ; ++i)
{
struct group_statistics *gs;
- gs= &cmd->v_variables[i]->p.grp_data.ugs;
+ gs= &group_proc_get (cmd->v_variables[i])->ugs;
gs->mean_diff = gs->sum_diff / gs->n ;
}
-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)
{
for(i=0; i< cmd->n_variables ; ++i)
{
- struct group_proc *ttpr = &cmd->v_variables[i]->p.grp_data;
+ struct group_proc *ttpr = group_proc_get (cmd->v_variables[i]);
/* There's always 2 groups for a T - TEST */
ttpr->n_groups = 2;
{
struct variable *var = cmd->v_variables[i];
const union value *val = case_data (c, var->fv);
- struct hsh_table *grp_hash = var->p.grp_data.group_hash;
+ struct hsh_table *grp_hash = group_proc_get (var)->group_hash;
struct group_statistics *gs;
gs = hsh_find(grp_hash, (void *) gv);
for(i=0; i< cmd->n_variables ; ++i)
{
struct variable *var = cmd->v_variables[i];
- struct hsh_table *grp_hash = var->p.grp_data.group_hash;
+ struct hsh_table *grp_hash = group_proc_get (var)->group_hash;
struct hsh_iterator g;
struct group_statistics *gs;
int count=0;
}
+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 */
static int
compare_group_binary(const struct group_statistics *a,
const struct group_statistics *b,
- struct group_properties *p)
+ const struct group_properties *p)
{
-
short flag_a;
short flag_b;
-
- assert(p->indep_width == 0 ) ;
-
+
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
+ values. It's really a comparison, being used as a hash function */
+
static unsigned
-hash_group_binary(const struct group_statistics *g, struct group_properties *p)
+hash_group_binary(const struct group_statistics *g,
+ const struct group_properties *p)
{
short flag = -1;
- assert(p->indep_width == 0 ) ;
-
- /* FIXME: should compare union values */
if ( p->criterion == CMP_LE )
{
+ /* Not meaningfull to do a less than compare for alpha values ? */
+ assert(p->indep_width == 0 ) ;
flag = ( g->id.f < p->v.critical_value ) ;
}
else if ( p->criterion == CMP_EQ)
{
- if ( g->id.f == p->v.g_value[0].f )
- flag = 0 ;
- else if ( g->id.f == p->v.g_value[1].f )
- 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