projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
math
/
levene.c
diff --git
a/src/math/levene.c
b/src/math/levene.c
index 4a9f130734dcceb18988182ea02b777983b77cb4..7bd582105f940c28ffeb26506d4c5fe941ff728d 100644
(file)
--- a/
src/math/levene.c
+++ b/
src/math/levene.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004
, 2009
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-25,13
+25,14
@@
#include <libpspp/str.h>
#include <data/variable.h>
#include <data/procedure.h>
#include <libpspp/str.h>
#include <data/variable.h>
#include <data/procedure.h>
-#include <libpspp/alloc.h>
#include <libpspp/misc.h>
#include "group.h"
#include <math.h>
#include <stdlib.h>
#include <libpspp/misc.h>
#include "group.h"
#include <math.h>
#include <stdlib.h>
+#include "xalloc.h"
+
/* This module calculates the Levene statistic for variables.
/* This module calculates the Levene statistic for variables.
@@
-117,7
+118,7
@@
levene(const struct dictionary *dict,
enum mv_class exclude)
{
struct casereader *pass1, *pass2;
enum mv_class exclude)
{
struct casereader *pass1, *pass2;
- struct ccase c;
+ struct ccase
*
c;
struct levene_info l;
l.n_dep = n_dep;
struct levene_info l;
l.n_dep = n_dep;
@@
-130,14
+131,14
@@
levene(const struct dictionary *dict,
casereader_split (reader, &pass1, &pass2);
levene_precalc (&l);
casereader_split (reader, &pass1, &pass2);
levene_precalc (&l);
- for (;
casereader_read (pass1, &c); case_destroy (&
c))
- levene_calc (dict,
&
c, &l);
+ for (;
(c = casereader_read (pass1)) != NULL; case_unref (
c))
+ levene_calc (dict, c, &l);
casereader_destroy (pass1);
levene_postcalc (&l);
levene2_precalc(&l);
casereader_destroy (pass1);
levene_postcalc (&l);
levene2_precalc(&l);
- for (;
casereader_read (pass2, &c); case_destroy (&
c))
- levene2_calc (dict,
&
c, &l);
+ for (;
(c = casereader_read (pass2)) != NULL; case_unref (
c))
+ levene2_calc (dict, c, &l);
casereader_destroy (pass2);
levene2_postcalc (&l);
casereader_destroy (pass2);
levene2_postcalc (&l);