projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed assignment of the intercept
[pspp-builds.git]
/
src
/
oneway.q
diff --git
a/src/oneway.q
b/src/oneway.q
index 27703055d704e709ea0d2bdcc244d0a7e46da52c..f413cda15410af5bc0bcd269cfb64c03fbd676c4 100644
(file)
--- a/
src/oneway.q
+++ b/
src/oneway.q
@@
-43,6
+43,10
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
#include "group_proc.h"
#include "group.h"
#include "levene.h"
#include "group_proc.h"
#include "group.h"
#include "levene.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* (headers) */
/* (specification)
/* (headers) */
/* (specification)
@@
-67,7
+71,7
@@
static struct cmd_oneway cmd;
static struct variable *indep_var;
/* Number of dependent variables */
static struct variable *indep_var;
/* Number of dependent variables */
-static
in
t n_vars;
+static
size_
t n_vars;
/* The dependent variables */
static struct variable **vars;
/* The dependent variables */
static struct variable **vars;
@@
-83,7
+87,7
@@
static int ostensible_number_of_groups=-1;
/* Function to use for testing for missing values */
/* Function to use for testing for missing values */
-static is_missing_func value_is_missing;
+static is_missing_func
*
value_is_missing;
static void run_oneway(const struct casefile *cf, void *_mode);
static void run_oneway(const struct casefile *cf, void *_mode);
@@
-115,9
+119,9
@@
cmd_oneway(void)
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == ONEWAY_INCLUDE )
/* If /MISSING=INCLUDE is set, then user missing values are ignored */
if (cmd.incl == ONEWAY_INCLUDE )
- value_is_missing =
is
_system_missing;
+ value_is_missing =
mv_is_value
_system_missing;
else
else
- value_is_missing =
is
_missing;
+ value_is_missing =
mv_is_value
_missing;
/* What statistics were requested */
if ( cmd.sbc_statistics )
/* What statistics were requested */
if ( cmd.sbc_statistics )
@@
-150,11
+154,10
@@
cmd_oneway(void)
void
output_oneway(void)
{
void
output_oneway(void)
{
-
- int i;
+ size_t i;
short *bad_contrast ;
short *bad_contrast ;
- bad_contrast = x
malloc ( sizeof (short) * cmd.sbc_contrast
);
+ bad_contrast = x
nmalloc (cmd.sbc_contrast, sizeof *bad_contrast
);
/* Check the sanity of the given contrast values */
for (i = 0 ; i < cmd.sbc_contrast ; ++i )
/* Check the sanity of the given contrast values */
for (i = 0 ; i < cmd.sbc_contrast ; ++i )
@@
-254,9
+257,9
@@
oneway_custom_variables(struct cmd_oneway *cmd UNUSED)
static void
show_anova_table(void)
{
static void
show_anova_table(void)
{
-
in
t i;
+
size_
t i;
int n_cols =7;
int n_cols =7;
-
in
t n_rows = n_vars * 3 + 1;
+
size_
t n_rows = n_vars * 3 + 1;
struct tab_table *t;
struct tab_table *t;
@@
-360,7
+363,7
@@
show_anova_table(void)
static void
show_descriptives(void)
{
static void
show_descriptives(void)
{
-
in
t v;
+
size_
t v;
int n_cols =10;
struct tab_table *t;
int row;
int n_cols =10;
struct tab_table *t;
int row;
@@
-423,7
+426,7
@@
show_descriptives(void)
const char *s = var_to_string(vars[v]);
const char *s = var_to_string(vars[v]);
- struct group_statistics **gs_array = hsh_sort(gp->group_hash);
+ struct group_statistics *
const
*gs_array = hsh_sort(gp->group_hash);
int count = 0;
tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s);
int count = 0;
tab_text (t, 0, row, TAB_LEFT | TAT_TITLE, s);
@@
-507,9
+510,9
@@
show_descriptives(void)
static void
show_homogeneity(void)
{
static void
show_homogeneity(void)
{
-
in
t v;
+
size_
t v;
int n_cols = 5;
int n_cols = 5;
-
in
t n_rows = n_vars + 1;
+
size_
t n_rows = n_vars + 1;
struct tab_table *t;
struct tab_table *t;
@@
-574,7
+577,7
@@
show_contrast_coeffs(short *bad_contrast)
int n_rows = 2 + cmd.sbc_contrast;
union value *group_value;
int count = 0 ;
int n_rows = 2 + cmd.sbc_contrast;
union value *group_value;
int count = 0 ;
- void **group_values ;
+ void *
const
*group_values ;
struct tab_table *t;
struct tab_table *t;
@@
-646,9
+649,9
@@
show_contrast_coeffs(short *bad_contrast)
static void
show_contrast_tests(short *bad_contrast)
{
static void
show_contrast_tests(short *bad_contrast)
{
-
in
t v;
+
size_
t v;
int n_cols = 8;
int n_cols = 8;
-
in
t n_rows = 1 + n_vars * 2 * cmd.sbc_contrast;
+
size_
t n_rows = 1 + n_vars * 2 * cmd.sbc_contrast;
struct tab_table *t;
struct tab_table *t;
@@
-699,7
+702,7
@@
show_contrast_tests(short *bad_contrast)
struct group_proc *grp_data = group_proc_get (vars[v]);
struct hsh_table *group_hash = grp_data->group_hash;
struct group_proc *grp_data = group_proc_get (vars[v]);
struct hsh_table *group_hash = grp_data->group_hash;
- void **group_stat_array;
+ void *
const
*group_stat_array;
double T;
double std_error_contrast ;
double T;
double std_error_contrast ;
@@
-853,7
+856,7
@@
static void precalc ( struct cmd_oneway *cmd UNUSED );
static void
precalc ( struct cmd_oneway *cmd UNUSED )
{
static void
precalc ( struct cmd_oneway *cmd UNUSED )
{
-
in
t i=0;
+
size_
t i=0;
for(i=0; i< n_vars ; ++i)
{
for(i=0; i< n_vars ; ++i)
{
@@
-901,7
+904,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
casereader_read (r, &c) ;
case_destroy (&c))
{
casereader_read (r, &c) ;
case_destroy (&c))
{
-
in
t i;
+
size_
t i;
const double weight =
dict_get_case_weight(default_dict,&c,&bad_weight_warn);
const double weight =
dict_get_case_weight(default_dict,&c,&bad_weight_warn);
@@
-909,7
+912,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
const union value *indep_val = case_data (&c, indep_var->fv);
/* Deal with missing values */
const union value *indep_val = case_data (&c, indep_var->fv);
/* Deal with missing values */
- if ( value_is_missing(
indep_val,indep_var
) )
+ if ( value_is_missing(
&indep_var->miss, indep_val
) )
continue;
/* Skip the entire case if /MISSING=LISTWISE is set */
continue;
/* Skip the entire case if /MISSING=LISTWISE is set */
@@
-920,7
+923,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
const struct variable *v = vars[i];
const union value *val = case_data (&c, v->fv);
const struct variable *v = vars[i];
const union value *val = case_data (&c, v->fv);
- if (value_is_missing(
val,v
) )
+ if (value_is_missing(
&v->miss, val
) )
break;
}
if ( i != n_vars )
break;
}
if ( i != n_vars )
@@
-946,9
+949,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
if ( ! gs )
{
if ( ! gs )
{
- gs = (struct group_statistics *)
- xmalloc (sizeof(struct group_statistics));
-
+ gs = xmalloc (sizeof *gs);
gs->id = *indep_val;
gs->sum=0;
gs->n=0;
gs->id = *indep_val;
gs->sum=0;
gs->n=0;
@@
-960,7
+961,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
hsh_insert ( group_hash, (void *) gs );
}
hsh_insert ( group_hash, (void *) gs );
}
- if (! value_is_missing(
val,v
) )
+ if (! value_is_missing(
&v->miss, val
) )
{
struct group_statistics *totals = &gp->ugs;
{
struct group_statistics *totals = &gp->ugs;
@@
-1012,7
+1013,7
@@
run_oneway(const struct casefile *cf, void *cmd_)
void
postcalc ( struct cmd_oneway *cmd UNUSED )
{
void
postcalc ( struct cmd_oneway *cmd UNUSED )
{
-
in
t i=0;
+
size_
t i=0;
for(i = 0; i < n_vars ; ++i)
for(i = 0; i < n_vars ; ++i)