projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Descriptives Dialog: Remove deprecated widgets
[pspp]
/
src
/
math
/
categoricals.c
diff --git
a/src/math/categoricals.c
b/src/math/categoricals.c
index d0247f6d38a453cbbf7220e04f11f879a5140d65..b621d982931c72c0eadbb04e420d943e10a5cded 100644
(file)
--- a/
src/math/categoricals.c
+++ b/
src/math/categoricals.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011, 2012
, 2014
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
@@
-19,6
+19,7
@@
#include "math/categoricals.h"
#include "math/interaction.h"
#include "math/categoricals.h"
#include "math/interaction.h"
+#include <float.h>
#include <stdio.h>
#include "data/case.h"
#include <stdio.h>
#include "data/case.h"
@@
-103,7
+104,7
@@
lookup_variable (const struct hmap *map, const struct variable *var, unsigned in
if (vn->var == var)
break;
if (vn->var == var)
break;
- fprintf (stderr, "
Warning: Hash table collision\n"
);
+ fprintf (stderr, "
%s:%d Warning: Hash table collision\n", __FILE__, __LINE__
);
}
return vn;
}
return vn;
@@
-115,7
+116,7
@@
struct interact_params
/* A map of cases indexed by a interaction_value */
struct hmap ivmap;
/* A map of cases indexed by a interaction_value */
struct hmap ivmap;
- struct interaction *iact;
+
const
struct interaction *iact;
int base_subscript_short;
int base_subscript_long;
int base_subscript_short;
int base_subscript_long;
@@
-216,7
+217,7
@@
categoricals_dump (const struct categoricals *cat)
}
printf ("\n");
}
printf ("\n");
- printf ("Number of interactions %
d
\n", cat->n_iap);
+ printf ("Number of interactions %
zu
\n", cat->n_iap);
for (i = 0 ; i < cat->n_iap; ++i)
{
int v;
for (i = 0 ; i < cat->n_iap; ++i)
{
int v;
@@
-252,7
+253,7
@@
categoricals_dump (const struct categoricals *cat)
assert (vn->var == var);
assert (vn->var == var);
- printf ("%
g(%d)"
, val->f, valn->index);
+ printf ("%
.*g(%d)", DBL_DIG + 1
, val->f, valn->index);
if (vv < iact->n_vars - 1)
printf (", ");
}
if (vv < iact->n_vars - 1)
printf (", ");
}
@@
-270,6
+271,7
@@
categoricals_destroy (struct categoricals *cat)
int i;
if (NULL == cat)
return;
int i;
if (NULL == cat)
return;
+
for (i = 0; i < cat->n_iap; ++i)
{
struct interaction_value *iv = NULL;
for (i = 0; i < cat->n_iap; ++i)
{
struct interaction_value *iv = NULL;
@@
-284,7
+286,6
@@
categoricals_destroy (struct categoricals *cat)
free (cat->iap[i].enc_sum);
free (cat->iap[i].df_prod);
hmap_destroy (&cat->iap[i].ivmap);
free (cat->iap[i].enc_sum);
free (cat->iap[i].df_prod);
hmap_destroy (&cat->iap[i].ivmap);
- interaction_destroy (cat->iap[i].iact);
}
/* Interate over each variable and delete its value map */
}
/* Interate over each variable and delete its value map */