lexer: Fix GCC warning for unhandled TOKEN_N_TYPES in lex_token_name().

[pspp-builds.git] / src / language / stats / regression.q

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index 6dc10821e5788a14753e6c6ad7060b2c2b03f6f1..b6ee6aaada8cb551f95a436fba119621076b620e 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005, 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
@@ -206,7 +206,7 @@ reg_stats_coeff (linreg * c, void *aux_)
   tab_double (t, 4, 1, 0, 0.0, NULL);
   t_stat = linreg_intercept (c) / std_err;
   tab_double (t, 5, 1, 0, t_stat, NULL);
-  pval = 2 * gsl_cdf_tdist_Q (fabs (t_stat), 1.0);
+  pval = 2 * gsl_cdf_tdist_Q (fabs (t_stat), (double) (linreg_n_obs (c) - linreg_n_coeffs (c)));
   tab_double (t, 6, 1, 0, pval, NULL);
   for (j = 0; j < linreg_n_coeffs (c); j++)
     {
@@ -752,10 +752,10 @@ regression_custom_variables (struct lexer *lexer, struct dataset *ds,
 {
   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_tokid (lexer)) == NULL)
+       || dict_lookup_var (dict, lex_tokcstr (lexer)) == NULL)
       && lex_token (lexer) != T_ALL)
     return 2;
 
@@ -810,7 +810,7 @@ fill_covariance (gsl_matrix *cov, struct covariance *all_cov,
   size_t dep_subscript;
   size_t *rows;
   const gsl_matrix *ssizes;
-  const gsl_matrix *cm;
+  gsl_matrix *cm;
   const gsl_matrix *mean_matrix;
   const gsl_matrix *ssize_matrix;
   double result = 0.0;
@@ -862,6 +862,7 @@ fill_covariance (gsl_matrix *cov, struct covariance *all_cov,
   gsl_matrix_set (cov, cov->size1 - 1, cov->size1 - 1, 
                  gsl_matrix_get (cm, dep_subscript, dep_subscript));
   free (rows);
+  gsl_matrix_free (cm);
   return result;
 }
 static size_t
@@ -928,7 +929,7 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
   const struct variable *dep_var;
   struct casereader *reader;
   const struct dictionary *dict;
-  gsl_matrix *this_cm;
+  size_t n_all_vars;
 
   assert (models != NULL);
 
@@ -955,7 +956,7 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
     {
       dict_get_vars (dict, &v_variables, &n_variables, 0);
     }
-  size_t n_all_vars = get_n_all_vars (cmd);
+  n_all_vars = get_n_all_vars (cmd);
   all_vars = xnmalloc (n_all_vars, sizeof (*all_vars));
   fill_all_vars (all_vars, cmd);
   vars = xnmalloc (n_variables, sizeof (*vars));
@@ -973,6 +974,7 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
   
   for (k = 0; k < cmd->n_dependent; k++)
     {
+      gsl_matrix *this_cm;
       dep_var = cmd->v_dependent[k];
       n_indep = identify_indep_vars (vars, dep_var);
       
@@ -1014,6 +1016,7 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
          linreg_free (models[k]);
          models[k] = NULL;
        }
+      gsl_matrix_free (this_cm);
     }
   
   casereader_destroy (reader);