X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fregression.q;h=02a675f74293cb04d11b9e95cb68b7b61f8472d2;hb=48dd2c7e82ecd7629109484ed873bcb67ec8c655;hp=196172c43424bf599b2c436e2c0334f7f7968c8c;hpb=4b334624d029ab65c22200505a1d8d814d91081f;p=pspp

diff --git a/src/regression.q b/src/regression.q
index 196172c434..02a675f742 100644
--- a/src/regression.q
+++ b/src/regression.q
@@ -26,7 +26,9 @@
 #include "case.h"
 #include "casefile.h"
 #include "cat.h"
+#include "cat-routines.h"
 #include "command.h"
+#include "design-matrix.h"
 #include "dictionary.h"
 #include "error.h"
 #include "file-handle.h"
@@ -497,7 +499,6 @@ static void
 run_regression (const struct casefile *cf, void *cmd_ UNUSED)
 {
   size_t i;
-  size_t k;
   size_t n_data = 0;
   size_t row;
   size_t case_num;
@@ -512,6 +513,7 @@ run_regression (const struct casefile *cf, void *cmd_ UNUSED)
   struct casereader *r2;
   struct ccase c;
   struct variable *v;
+  struct variable **indep_vars;
   struct design_matrix *X;
   gsl_vector *Y;
   pspp_linreg_cache *lcache;
@@ -534,29 +536,35 @@ run_regression (const struct casefile *cf, void *cmd_ UNUSED)
      Read from the active file. The first pass encodes categorical
      variables and drops cases with missing values.
    */
+  j = 0;
   for (i = 0; i < cmd.n_variables; i++)
     {
-      v = cmd.v_variables[i];
-      if (v->type == ALPHA)
+      if (!is_depvar (i))
 	{
-	  /* Make a place to hold the binary vectors 
-	     corresponding to this variable's values. */
-	  cat_stored_values_create (v);
-	}
-      for (r = casefile_get_reader (cf);
-	   casereader_read (r, &c); case_destroy (&c))
-	{
-	  row = casereader_cnum (r) - 1;
-
-	  val = case_data (&c, v->fv);
-	  cat_value_update (v, val);
-	  if (mv_is_value_missing (&v->miss, val))
+	  v = cmd.v_variables[i];
+	  indep_vars[j] = v;
+	  j++;
+	  if (v->type == ALPHA)
+	    {
+	      /* Make a place to hold the binary vectors 
+		 corresponding to this variable's values. */
+	      cat_stored_values_create (v);
+	    }
+	  for (r = casefile_get_reader (cf);
+	       casereader_read (r, &c); case_destroy (&c))
 	    {
-	      if (!is_missing_case[row])
+	      row = casereader_cnum (r) - 1;
+	      
+	      val = case_data (&c, v->fv);
+	      cat_value_update (v, val);
+	      if (mv_is_value_missing (&v->miss, val))
 		{
-		  /* Now it is missing. */
-		  n_data--;
-		  is_missing_case[row] = 1;
+		  if (!is_missing_case[row])
+		    {
+		      /* Now it is missing. */
+		      n_data--;
+		      is_missing_case[row] = 1;
+		    }
 		}
 	    }
 	}
@@ -564,7 +572,7 @@ run_regression (const struct casefile *cf, void *cmd_ UNUSED)
 
   Y = gsl_vector_alloc (n_data);
   X =
-    design_matrix_create (n_indep, (const struct variable **) cmd.v_variables,
+    design_matrix_create (n_indep, (const struct variable **) indep_vars,
 			  n_data);
   lcache = pspp_linreg_cache_alloc (X->m->size1, X->m->size2);
   lcache->indep_means = gsl_vector_alloc (X->m->size2);
@@ -578,7 +586,6 @@ run_regression (const struct casefile *cf, void *cmd_ UNUSED)
        case_destroy (&c))
     /* Iterate over the cases. */
     {
-      k = 0;
       case_num = casereader_cnum (r2) - 1;
       if (!is_missing_case[case_num])
 	{
@@ -618,8 +625,6 @@ run_regression (const struct casefile *cf, void *cmd_ UNUSED)
 		      design_matrix_set_numeric (X, row, v, val);
 		    }
 
-		  indep_vars[k] = i;
-		  k++;
 		  lopts.get_indep_mean_std[i] = 1;
 		}
 	    }