projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: Change the functions for retrieving token strings.
[pspp]
/
src
/
language
/
stats
/
examine.q
diff --git
a/src/language/stats/examine.q
b/src/language/stats/examine.q
index 4ca3af966505080338b2ff85679885ed1bd7a963..aa578e1e2d6907be4bbe1044fc61b7ebb76ac4e4 100644
(file)
--- a/
src/language/stats/examine.q
+++ b/
src/language/stats/examine.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2008, 2009
, 2010
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
@@
-17,7
+17,6
@@
#include <config.h>
#include <gsl/gsl_cdf.h>
#include <config.h>
#include <gsl/gsl_cdf.h>
-#include <libpspp/message.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
@@
-43,15
+42,14
@@
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <libpspp/compiler.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <math/moments.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <math/moments.h>
+#include <output/chart-item.h>
#include <output/charts/boxplot.h>
#include <output/charts/np-plot.h>
#include <output/charts/boxplot.h>
#include <output/charts/np-plot.h>
-#include <output/manager.h>
-#include <output/table.h>
+#include <output/tab.h>
#include "minmax.h"
#include "xalloc.h"
#include "minmax.h"
#include "xalloc.h"
@@
-61,9
+59,7
@@
#define N_(msgid) msgid
/* (headers) */
#define N_(msgid) msgid
/* (headers) */
-#include <output/chart.h>
#include <output/charts/plot-hist.h>
#include <output/charts/plot-hist.h>
-#include <output/charts/plot-chart.h>
#include <math/histogram.h>
/* (specification)
#include <math/histogram.h>
/* (specification)
@@
-339,7
+335,7
@@
show_npplot (const struct variable **dependent_var,
struct string label;
const struct factor_result *result =
ll_data (ll, struct factor_result, ll);
struct string label;
const struct factor_result *result =
ll_data (ll, struct factor_result, ll);
- struct chart *npp, *dnpp;
+ struct chart
_item
*npp, *dnpp;
struct casereader *reader;
struct np *np;
struct casereader *reader;
struct np *np;
@@
-357,16
+353,17
@@
show_npplot (const struct variable **dependent_var,
if (npp == NULL || dnpp == NULL)
{
msg (MW, _("Not creating NP plot because data set is empty."));
if (npp == NULL || dnpp == NULL)
{
msg (MW, _("Not creating NP plot because data set is empty."));
- chart_unref (npp);
- chart_unref (dnpp);
+ chart_
item_
unref (npp);
+ chart_
item_
unref (dnpp);
}
else
{
}
else
{
- chart_submit (npp);
- chart_submit (dnpp);
+ chart_
item_
submit (npp);
+ chart_
item_
submit (dnpp);
}
statistic_destroy (&np->parent.parent);
}
statistic_destroy (&np->parent.parent);
+ casereader_destroy (reader);
}
}
}
}
}
}
@@
-406,8
+403,9
@@
show_histogram (const struct variable **dependent_var,
moments1_calculate (result->metrics[v].moments,
&n, &mean, &var, NULL, NULL);
moments1_calculate (result->metrics[v].moments,
&n, &mean, &var, NULL, NULL);
- chart_submit (histogram_chart_create (histogram, ds_cstr (&str),
- n, mean, sqrt (var), false));
+ chart_item_submit (histogram_chart_create (histogram->gsl_hist,
+ ds_cstr (&str), n, mean,
+ sqrt (var), false));
ds_destroy (&str);
}
ds_destroy (&str);
}
@@
-471,7
+469,7
@@
show_boxplot_groups (const struct variable **dependent_var,
ds_destroy (&str);
}
ds_destroy (&str);
}
-
chart_submit (boxplot_get_chart (boxplot)
);
+
boxplot_submit (boxplot
);
}
}
}
}
@@
-519,7
+517,7
@@
show_boxplot_variables (const struct variable **dependent_var,
metrics->box_whisker = NULL;
}
metrics->box_whisker = NULL;
}
-
chart_submit (boxplot_get_chart (boxplot)
);
+
boxplot_submit (boxplot
);
}
}
}
}
@@
-589,9
+587,9
@@
static int
xmn_custom_percentiles (struct lexer *lexer, struct dataset *ds UNUSED,
struct cmd_examine *p UNUSED, void *aux UNUSED)
{
xmn_custom_percentiles (struct lexer *lexer, struct dataset *ds UNUSED,
struct cmd_examine *p UNUSED, void *aux UNUSED)
{
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
- lex_match (lexer,
'('
);
+ lex_match (lexer,
T_LPAREN
);
while ( lex_is_number (lexer) )
{
while ( lex_is_number (lexer) )
{
@@
-599,11
+597,11
@@
xmn_custom_percentiles (struct lexer *lexer, struct dataset *ds UNUSED,
lex_get (lexer);
lex_get (lexer);
- lex_match (lexer,
','
) ;
+ lex_match (lexer,
T_COMMA
) ;
}
}
- lex_match (lexer,
')'
);
+ lex_match (lexer,
T_RPAREN
);
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if ( lex_match_id (lexer, "HAVERAGE"))
percentile_algorithm = PC_HAVERAGE;
if ( lex_match_id (lexer, "HAVERAGE"))
percentile_algorithm = PC_HAVERAGE;
@@
-675,9
+673,9
@@
xmn_custom_variables (struct lexer *lexer, struct dataset *ds,
void *aux UNUSED)
{
const struct dictionary *dict = dataset_dict (ds);
void *aux UNUSED)
{
const struct dictionary *dict = dataset_dict (ds);
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
- if ( (lex_token (lexer) != T_ID || dict_lookup_var (dict, lex_tok
id
(lexer)) == NULL)
+ if ( (lex_token (lexer) != T_ID || dict_lookup_var (dict, lex_tok
cstr
(lexer)) == NULL)
&& lex_token (lexer) != T_ALL)
{
return 2;
&& lex_token (lexer) != T_ALL)
{
return 2;
@@
-721,7
+719,7
@@
examine_parse_independent_vars (struct lexer *lexer,
ll_init (&sf->result_list);
if ( (lex_token (lexer) != T_ID ||
ll_init (&sf->result_list);
if ( (lex_token (lexer) != T_ID ||
- dict_lookup_var (dict, lex_tok
id
(lexer)) == NULL)
+ dict_lookup_var (dict, lex_tok
cstr
(lexer)) == NULL)
&& lex_token (lexer) != T_ALL)
{
free ( sf ) ;
&& lex_token (lexer) != T_ALL)
{
free ( sf ) ;
@@
-736,7
+734,7
@@
examine_parse_independent_vars (struct lexer *lexer,
lex_match (lexer, T_BY);
if ( (lex_token (lexer) != T_ID ||
lex_match (lexer, T_BY);
if ( (lex_token (lexer) != T_ID ||
- dict_lookup_var (dict, lex_tok
id
(lexer)) == NULL)
+ dict_lookup_var (dict, lex_tok
cstr
(lexer)) == NULL)
&& lex_token (lexer) != T_ALL)
{
free (sf);
&& lex_token (lexer) != T_ALL)
{
free (sf);
@@
-750,9
+748,9
@@
examine_parse_independent_vars (struct lexer *lexer,
else
ll_push_tail (&factor_list, &sf->ll);
else
ll_push_tail (&factor_list, &sf->ll);
- lex_match (lexer,
','
);
+ lex_match (lexer,
T_COMMA
);
- if ( lex_token (lexer) ==
'.' || lex_token (lexer) == '/'
)
+ if ( lex_token (lexer) ==
T_ENDCMD || lex_token (lexer) == T_SLASH
)
return 1;
success = examine_parse_independent_vars (lexer, dict, cmd);
return 1;
success = examine_parse_independent_vars (lexer, dict, cmd);
@@
-1135,8
+1133,6
@@
show_summary (const struct variable **dependent_var, int n_dep_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
@@
-1372,8
+1368,6
@@
show_descriptives (const struct variable **dependent_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
@@
-1684,8
+1678,6
@@
show_extremes (const struct variable **dependent_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
@@
-1888,8
+1880,6
@@
show_percentiles (const struct variable **dependent_var,
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
tbl = tab_create (n_cols, n_rows);
tab_headers (tbl, heading_columns, 0, heading_rows, 0);
- tab_dim (tbl, tab_natural_dimensions, NULL, NULL);
-
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,
/* Outline the box */
tab_box (tbl,
TAL_2, TAL_2,