projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change type of variables whose addresses are passed to dict_get_vars()
[pspp]
/
src
/
frequencies.q
diff --git
a/src/frequencies.q
b/src/frequencies.q
index b5da79bde62b83545e563e5bbd0fde8a5bde8171..0ca83a45b29e95f866aaedc8d521c81b234ced19 100644
(file)
--- a/
src/frequencies.q
+++ b/
src/frequencies.q
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
/*
TODO:
/*
TODO:
@@
-51,6
+51,11
@@
#include "vfm.h"
#include "settings.h"
#include "chart.h"
#include "vfm.h"
#include "settings.h"
#include "chart.h"
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
/* (headers) */
#include "debug-print.h"
/* (headers) */
#include "debug-print.h"
@@
-627,7
+632,7
@@
postcalc (void *aux UNUSED)
dump_statistics (v, !dumped_freq_tab);
dump_statistics (v, !dumped_freq_tab);
-#ifndef NO_CHARTS
+
if ( chart == GFT_HIST)
{
double d[frq_n_stats];
if ( chart == GFT_HIST)
{
double d[frq_n_stats];
@@
-653,7
+658,7
@@
postcalc (void *aux UNUSED)
{
do_piechart(v_variables[i], ft);
}
{
do_piechart(v_variables[i], ft);
}
-#endif
+
cleanup_freq_tab (v);
cleanup_freq_tab (v);
@@
-692,7
+697,7
@@
not_missing (const void *f_, void *v_)
const struct freq *f = f_;
struct variable *v = v_;
const struct freq *f = f_;
struct variable *v = v_;
- return !
is_missing (&f->v,
v);
+ return !
mv_is_value_missing (&v->miss, &f->
v);
}
/* Summarizes the frequency table data for variable V. */
}
/* Summarizes the frequency table data for variable V. */
@@
-702,7
+707,7
@@
postprocess_freq_tab (struct variable *v)
hsh_compare_func *compare;
struct freq_tab *ft;
size_t count;
hsh_compare_func *compare;
struct freq_tab *ft;
size_t count;
- void **data;
+ void *
const
*data;
struct freq *freqs, *f;
size_t i;
struct freq *freqs, *f;
size_t i;
@@
-868,7
+873,7
@@
frq_custom_grouped (struct cmd_frequencies *cmd UNUSED)
{
nl = ml = 0;
dl = NULL;
{
nl = ml = 0;
dl = NULL;
- while (
token == T_NUM
)
+ while (
lex_integer ()
)
{
if (nl >= ml)
{
{
if (nl >= ml)
{
@@
-1559,7
+1564,7
@@
freq_tab_to_hist(const struct freq_tab *ft, const struct variable *var)
/* Find out the extremes of the x value */
for ( frq = hsh_first(fh, &hi); frq != 0; frq = hsh_next(fh, &hi) )
{
/* Find out the extremes of the x value */
for ( frq = hsh_first(fh, &hi); frq != 0; frq = hsh_next(fh, &hi) )
{
- if (
is_missing(&frq->v, var
))
+ if (
mv_is_value_missing(&var->miss, &frq->v
))
continue;
if ( frq->v.f < x_min ) x_min = frq->v.f ;
continue;
if ( frq->v.f < x_min ) x_min = frq->v.f ;
@@
-1614,7
+1619,7
@@
freq_tab_to_slice_array(const struct freq_tab *frq_tab,
-#ifndef NO_CHARTS
+
static void
do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
{
static void
do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
{
@@
-1627,7
+1632,7
@@
do_piechart(const struct variable *var, const struct freq_tab *frq_tab)
free(slices);
}
free(slices);
}
-#endif
+
/*
Local Variables:
/*
Local Variables: