Declare models in difinition of cmd_regression; free moment structure

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

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index d5008b5681178b5890584ca08b20ee04169a6e31..c10cc59e1f75409cea4bdd54153133024c0e1ff8 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -92,9 +92,6 @@ struct moments_var
   const struct variable *v;
 };
 
-/* Linear regression models. */
-static pspp_linreg_cache **models = NULL;
-
 /*
   Transformations for saving predicted values
   and residuals, etc.
@@ -122,7 +119,7 @@ static size_t n_variables;
 static struct file_handle *model_file;
 
 static bool run_regression (struct casereader *, struct cmd_regression *,
-                           struct dataset *);
+                           struct dataset *, pspp_linreg_cache **);
 
 /*
    STATISTICS subcommand output functions.
@@ -948,6 +945,7 @@ cmd_regression (struct lexer *lexer, struct dataset *ds)
 {
   struct casegrouper *grouper;
   struct casereader *group;
+  pspp_linreg_cache **models;
   bool ok;
   size_t i;
 
@@ -963,7 +961,7 @@ cmd_regression (struct lexer *lexer, struct dataset *ds)
   /* Data pass. */
   grouper = casegrouper_create_splits (proc_open (ds), dataset_dict (ds));
   while (casegrouper_get_next_group (grouper, &group))
-    run_regression (group, &cmd, ds);
+    run_regression (group, &cmd, ds, models);
   ok = casegrouper_destroy (grouper);
   ok = proc_commit (ds) && ok;
 
@@ -1021,7 +1019,19 @@ identify_indep_vars (const struct variable **indep_vars,
   for (i = 0; i < n_variables; i++)
     if (!is_depvar (i, depvar))
       indep_vars[n_indep_vars++] = v_variables[i];
-
+  if ((n_indep_vars < 2) && is_depvar (0, depvar))
+    {
+      /*
+       There is only one independent variable, and it is the same
+       as the dependent variable. Print a warning and continue.
+       */
+      msg (SE,
+          gettext ("The dependent variable is equal to the independent variable." 
+                   "The least squares line is therefore Y=X." 
+                   "Standard errors and related statistics may be meaningless."));
+      n_indep_vars = 1;
+      indep_vars[0] = v_variables[0];
+    }
   return n_indep_vars;
 }
 
@@ -1036,6 +1046,9 @@ prepare_categories (struct casereader *input,
   struct ccase c;
   size_t i;
 
+  assert (vars != NULL);
+  assert (mom != NULL);
+
   for (i = 0; i < n_vars; i++)
     if (var_is_alpha (vars[i]))
       cat_stored_values_create (vars[i]);
@@ -1107,7 +1120,7 @@ compute_moments (pspp_linreg_cache * c, struct moments_var *mom,
 
 static bool
 run_regression (struct casereader *input, struct cmd_regression *cmd,
-               struct dataset *ds)
+               struct dataset *ds, pspp_linreg_cache **models)
 {
   size_t i;
   int n_indep = 0;
@@ -1163,7 +1176,6 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
 
       dep_var = cmd->v_dependent[k];
       n_indep = identify_indep_vars (indep_vars, dep_var);
-
       reader = casereader_clone (input);
       reader = casereader_create_filter_missing (reader, indep_vars, n_indep,
                                                 MV_ANY, NULL);
@@ -1241,6 +1253,11 @@ run_regression (struct casereader *input, struct cmd_regression *cmd,
        }
       casereader_destroy (reader);
     }
+  for (i = 0; i < n_variables; i++)
+    {
+      moments1_destroy ((mom + i)->m);
+    }
+  free (mom);
   free (indep_vars);
   free (lopts.get_indep_mean_std);
   casereader_destroy (input);