X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fglm.c;h=2536c5f52de069c9e326f3891e18600d61394c1e;hb=7235f7f42b61c2b111174c3ee5ca72aac8815cd5;hp=f8a7f133cc254d19493c8856f16a656bee4ad935;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp

diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c
index f8a7f133cc..2536c5f52d 100644
--- a/src/language/stats/glm.c
+++ b/src/language/stats/glm.c
@@ -124,8 +124,6 @@ static void run_glm (struct glm_spec *cmd, struct casereader *input,
 
 static bool parse_design_spec (struct lexer *lexer, struct glm_spec *glm);
 
-/* Define to 1 if the /DESIGN subcommand should not be optional */
-#define DESIGN_MANDATORY 1
 
 int
 cmd_glm (struct lexer *lexer, struct dataset *ds)
@@ -283,18 +281,8 @@ cmd_glm (struct lexer *lexer, struct dataset *ds)
 	  if (! parse_design_spec (lexer, &glm))
 	    goto error;
 
-#if DESIGN_MANDATORY
-	  if ( glm.n_interactions == 0)
-	    {
-	      msg (ME, _("One or more design  variables must be given"));
-	      goto error;
-	    }
-	  
-	  design = true;
-#else
 	  if (glm.n_interactions > 0)
 	    design = true;
-#endif
 	}
       else
 	{
@@ -305,11 +293,6 @@ cmd_glm (struct lexer *lexer, struct dataset *ds)
 
   if ( ! design )
     {
-#if DESIGN_MANDATORY
-      lex_error (lexer, _("/DESIGN is mandatory in GLM"));
-      goto error;
-#endif
-
       design_full (&glm);
     }
 
@@ -351,72 +334,97 @@ error:
 static void get_ssq (struct covariance *, gsl_vector *,
 		     const struct glm_spec *);
 
-static bool
-not_dropped (size_t j, const size_t *dropped, size_t n_dropped)
+static inline bool
+not_dropped (size_t j, const bool *ff)
 {
-  size_t i;
+  return ! ff[j];
+}
 
-  for (i = 0; i < n_dropped; i++)
+static void
+fill_submatrix (const gsl_matrix * cov, gsl_matrix * submatrix, bool *dropped_f)
+{
+  size_t i;
+  size_t j;
+  size_t n = 0;
+  size_t m = 0;
+  
+  for (i = 0; i < cov->size1; i++)
     {
-      if (j == dropped[i])
-	return false;
+      if (not_dropped (i, dropped_f))
+	{	  
+	  m = 0;
+	  for (j = 0; j < cov->size2; j++)
+	    {
+	      if (not_dropped (j, dropped_f))
+		{
+		  gsl_matrix_set (submatrix, n, m,
+				  gsl_matrix_get (cov, i, j));
+		  m++;
+		}	
+	    }
+	  n++;
+	}
     }
-  return true;
 }
-
+	      
 static void
 get_ssq (struct covariance *cov, gsl_vector *ssq, const struct glm_spec *cmd)
 {
   gsl_matrix *cm = covariance_calculate_unnormalized (cov);
   size_t i;
-  size_t j;
   size_t k;
-  size_t *dropped = xcalloc (covariance_dim (cov), sizeof (*dropped));
+  bool *model_dropped = xcalloc (covariance_dim (cov), sizeof (*model_dropped));
+  bool *submodel_dropped = xcalloc (covariance_dim (cov), sizeof (*submodel_dropped));
   const struct categoricals *cats = covariance_get_categoricals (cov);
 
   for (k = 0; k < cmd->n_interactions; k++)
     {
-      size_t n = 0;
-      size_t m = 0;
-      gsl_matrix *small_cov = NULL;
-      size_t n_dropped = 0;
+      gsl_matrix *model_cov = NULL;
+      gsl_matrix *submodel_cov = NULL;
+      size_t n_dropped_model = 0;
+      size_t n_dropped_submodel = 0;
       for (i = cmd->n_dep_vars; i < covariance_dim (cov); i++)
 	{
-	  if (categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars)
-	      == cmd->interactions[k])
-	    {
-	      assert (n_dropped < covariance_dim (cov));
-	      dropped[n_dropped++] = i;
-	    }
-	}
-      small_cov =
-	gsl_matrix_alloc (cm->size1 - n_dropped, cm->size2 - n_dropped);
-      gsl_matrix_set (small_cov, 0, 0, gsl_matrix_get (cm, 0, 0));
-      for (i = 0; i < cm->size1; i++)
-	{
-	  if (not_dropped (i, dropped, n_dropped))
+	  const struct interaction * x = 
+	    categoricals_get_interaction_by_subscript (cats, i - cmd->n_dep_vars);
+
+	  model_dropped[i] = false;
+	  submodel_dropped[i] = false;
+	  if (interaction_is_subset (cmd->interactions [k], x))
 	    {
-	      m = 0;
-	      for (j = 0; j < cm->size2; j++)
+	      assert (n_dropped_submodel < covariance_dim (cov));
+	      n_dropped_submodel++;
+              submodel_dropped[i] = true;
+
+	      if ( cmd->interactions [k]->n_vars < x->n_vars)
 		{
-		  if (not_dropped (j, dropped, n_dropped))
-		    {
-		      gsl_matrix_set (small_cov, n, m,
-				      gsl_matrix_get (cm, i, j));
-		      m++;
-		    }
+		  assert (n_dropped_model < covariance_dim (cov));
+		  n_dropped_model++;
+		  model_dropped[i] = true;
 		}
-	      n++;
 	    }
 	}
-      reg_sweep (small_cov, 0);
+
+      model_cov = gsl_matrix_alloc (cm->size1 - n_dropped_model, cm->size2 - n_dropped_model);
+      gsl_matrix_set (model_cov, 0, 0, gsl_matrix_get (cm, 0, 0));
+      submodel_cov = gsl_matrix_calloc (cm->size1 - n_dropped_submodel, cm->size2 - n_dropped_submodel);
+
+      fill_submatrix (cm, model_cov,    model_dropped);
+      fill_submatrix (cm, submodel_cov, submodel_dropped);
+
+      reg_sweep (model_cov, 0);
+      reg_sweep (submodel_cov, 0);
+
       gsl_vector_set (ssq, k + 1,
-		      gsl_matrix_get (small_cov, 0, 0)
-		      - gsl_vector_get (ssq, 0));
-      gsl_matrix_free (small_cov);
+		      gsl_matrix_get (submodel_cov, 0, 0) - gsl_matrix_get (model_cov, 0, 0)
+		      );
+
+      gsl_matrix_free (model_cov);
+      gsl_matrix_free (submodel_cov);
     }
 
-  free (dropped);
+  free (model_dropped);
+  free (submodel_dropped);
   gsl_matrix_free (cm);
 }
 
@@ -535,6 +543,7 @@ output_glm (const struct glm_spec *cmd, const struct glm_workspace *ws)
   if (cmd->intercept)
     nr++;
 
+  msg (MW, "GLM is experimental.  Do not rely on these results.");
   t = tab_create (nc, nr);
   tab_title (t, _("Tests of Between-Subjects Effects"));
 
@@ -723,7 +732,6 @@ parse_design_interaction (struct lexer *lexer, struct glm_spec *glm, struct inte
 
   if ( lex_match (lexer, T_ASTERISK) || lex_match (lexer, T_BY))
     {
-      // lex_error (lexer, "Interactions are not yet implemented"); return false;
       return parse_design_interaction (lexer, glm, iact);
     }