X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcorrelations.q;h=5d543098ec986b8737a8c0cd30e198d7cdea0ce9;hb=75a80e71a0d3a08f4bc561f16702c36d45e32c31;hp=59f06e48d08ac9ed42df89069512d36d102643a2;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp-builds.git diff --git a/src/language/stats/correlations.q b/src/language/stats/correlations.q index 59f06e48..5d543098 100644 --- a/src/language/stats/correlations.q +++ b/src/language/stats/correlations.q @@ -1,53 +1,55 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . - 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include + #include -#include "alloc.h" -#include "compiler.h" -#include "dictionary.h" -#include "file-handle-def.h" -#include "command.h" -#include "lexer.h" -#include "variable.h" -/* (headers) */ -#include "debug-print.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "xalloc.h" + +/* (headers) */ struct cor_set { struct cor_set *next; - struct variable **v1, **v2; + const struct variable **v1, **v2; size_t nv1, nv2; }; -struct cor_set *cor_list, *cor_last; +static struct cor_set *cor_list, *cor_last; -struct file_handle *matrix_file; +static struct file_handle *matrix_file; static void free_correlations_state (void); -static int internal_cmd_correlations (void); +static int internal_cmd_correlations (struct lexer *lexer, struct dataset *ds); int -cmd_correlations (void) +cmd_correlations (struct lexer *lexer, struct dataset *ds) { - int result = internal_cmd_correlations (); + int result = internal_cmd_correlations (lexer, ds); free_correlations_state (); return result; } @@ -55,8 +57,8 @@ cmd_correlations (void) /* (specification) "CORRELATIONS" (cor_): *variables=custom; - +missing=miss:!pairwise/listwise, - inc:include/exclude; + missing=miss:!pairwise/listwise, + inc:include/exclude; +print=tail:!twotail/onetail, sig:!sig/nosig; +format=fmt:!matrix/serial; @@ -67,41 +69,46 @@ cmd_correlations (void) /* (functions) */ int -internal_cmd_correlations (void) +internal_cmd_correlations (struct lexer *lexer, struct dataset *ds) { struct cmd_correlations cmd; cor_list = cor_last = NULL; matrix_file = NULL; - if (!parse_correlations (&cmd)) - return CMD_FAILURE; + if (!parse_correlations (lexer, ds, &cmd, NULL)) + { + fh_unref (matrix_file); + return CMD_FAILURE; + } + free_correlations (&cmd); + fh_unref (matrix_file); return CMD_SUCCESS; } static int -cor_custom_variables (struct cmd_correlations *cmd UNUSED) +cor_custom_variables (struct lexer *lexer, struct dataset *ds, struct cmd_correlations *cmd UNUSED, void *aux UNUSED) { - struct variable **v1, **v2; + const struct variable **v1, **v2; size_t nv1, nv2; struct cor_set *cor; /* Ensure that this is a VARIABLES subcommand. */ - if (!lex_match_id ("VARIABLES") - && (token != T_ID || dict_lookup_var (default_dict, tokid) != NULL) - && token != T_ALL) + if (!lex_match_id (lexer, "VARIABLES") + && (lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) != NULL) + && lex_token (lexer) != T_ALL) return 2; - lex_match ('='); + lex_match (lexer, '='); - if (!parse_variables (default_dict, &v1, &nv1, + if (!parse_variables_const (lexer, dataset_dict (ds), &v1, &nv1, PV_NO_DUPLICATE | PV_NUMERIC)) return 0; - - if (lex_match (T_WITH)) + + if (lex_match (lexer, T_WITH)) { - if (!parse_variables (default_dict, &v2, &nv2, + if (!parse_variables_const (lexer, dataset_dict (ds), &v2, &nv2, PV_NO_DUPLICATE | PV_NUMERIC)) { free (v1); @@ -124,26 +131,27 @@ cor_custom_variables (struct cmd_correlations *cmd UNUSED) cor_last = cor_last->next = cor; else cor_list = cor_last = cor; - + return 1; } static int -cor_custom_matrix (struct cmd_correlations *cmd UNUSED) +cor_custom_matrix (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_correlations *cmd UNUSED, void *aux UNUSED) { - if (!lex_force_match ('(')) + if (!lex_force_match (lexer, '(')) return 0; - - if (lex_match ('*')) + + if (lex_match (lexer, '*')) matrix_file = NULL; - else + else { - matrix_file = fh_parse (FH_REF_FILE); + fh_unref (matrix_file); + matrix_file = fh_parse (lexer, FH_REF_FILE); if (matrix_file == NULL) - return 0; + return 0; } - if (!lex_force_match (')')) + if (!lex_force_match (lexer, ')')) return 0; return 1;