X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fglm.q;h=fd36041636e5ad25d619ceffee2ea42824b7aa8f;hb=68e2517340f67e4378ce87d4be2dd4501a6b2200;hp=26b903651eea06771c7b90799f9700162a9fb478;hpb=14aac9fe7a7efbb6c9bded2ed5969a643cb76645;p=pspp-builds.git

diff --git a/src/language/stats/glm.q b/src/language/stats/glm.q
index 26b90365..fd360416 100644
--- a/src/language/stats/glm.q
+++ b/src/language/stats/glm.q
@@ -53,6 +53,7 @@
 /* (specification)
    "GLM" (glm_):
    *dependent=custom;
+   design=custom;
    by=varlist;
    with=varlist.
 */
@@ -60,6 +61,7 @@
 /* (functions) */
 static struct cmd_glm cmd;
 
+
 /*
   Moments for each of the variables used.
  */
@@ -83,19 +85,63 @@ static const struct variable **v_dependent;
  */
 static size_t n_dependent;
 
-#if 0
-/*
-  Return value for the procedure.
- */
-static int pspp_glm_rc = CMD_SUCCESS;
-#else
+size_t n_inter; /* Number of interactions. */
+size_t n_members; /* Number of memebr variables in an interaction. */ 
+
+struct interaction_variable **interactions;
+
 int cmd_glm (struct lexer *lexer, struct dataset *ds);
-#endif
 
 static bool run_glm (struct casereader *,
 		     struct cmd_glm *,
 		     const struct dataset *);
-
+/*
+  If the DESIGN subcommand was not specified, specify all possible
+  two-way interactions.
+ */
+static void
+check_interactions (struct dataset *ds, struct cmd_glm *cmd)
+{
+  size_t i;
+  size_t j;
+  size_t k = 0;
+  struct variable **interaction_vars;
+
+  /* 
+     User did not specify the design matrix, so we 
+     specify it here.
+  */
+  n_inter = (cmd->n_by + cmd->n_with) * (cmd->n_by + cmd->n_with - 1) / 2;
+  interactions = xnmalloc (n_inter, sizeof (*interactions));
+  interaction_vars = xnmalloc (2, sizeof (*interaction_vars));
+  for (i = 0; i < cmd->n_by; i++)
+    {
+      for (j = i + 1; j < cmd->n_by; j++)
+	{
+	  interaction_vars[0] = cmd->v_by[i];
+	  interaction_vars[1] = cmd->v_by[j];
+	  interactions[k] = interaction_variable_create (interaction_vars, 2);
+	  k++;
+	}
+      for (j = 0; j < cmd->n_with; j++)
+	{
+	  interaction_vars[0] = cmd->v_by[i];
+	  interaction_vars[1] = cmd->v_with[j];
+	  interactions[k] = interaction_variable_create (interaction_vars, 2);
+	  k++;
+	}
+    }
+  for (i = 0; i < cmd->n_with; i++)
+    {
+      for (j = i + 1; j < cmd->n_with; j++)
+	{
+	  interaction_vars[0] = cmd->v_with[i];
+	  interaction_vars[1] = cmd->v_with[j];
+	  interactions[k] = interaction_variable_create (interaction_vars, 2);
+	  k++;
+	}
+    }
+}
 int
 cmd_glm (struct lexer *lexer, struct dataset *ds)
 {
@@ -107,7 +153,11 @@ cmd_glm (struct lexer *lexer, struct dataset *ds)
   if (!parse_glm (lexer, ds, &cmd, NULL))
     return CMD_FAILURE;
 
-  /* Data pass. */
+  if (!lex_match_id (lexer, "DESIGN"))
+    {
+      check_interactions (ds, &cmd);
+    }
+   /* Data pass. */
   grouper = casegrouper_create_splits (proc_open (ds), dataset_dict (ds));
   while (casegrouper_get_next_group (grouper, &group))
     {
@@ -120,6 +170,58 @@ cmd_glm (struct lexer *lexer, struct dataset *ds)
   return ok ? CMD_SUCCESS : CMD_FAILURE;
 }
 
+static int
+parse_interactions (struct lexer *lexer, const struct variable **interaction_vars, int n_members,
+		    int max_members, struct dataset *ds)
+{
+  if (lex_match (lexer, '*'))
+    {
+      if (n_members > max_members)
+	{
+	  max_members *= 2;
+	  xnrealloc (interaction_vars, max_members, sizeof (*interaction_vars));
+	}
+      interaction_vars[n_members] = parse_variable (lexer, dataset_dict (ds));
+      parse_interactions (lexer, interaction_vars, n_members++, max_members, ds);
+    }
+  return n_members;
+}
+/* Parser for the design subcommand. */
+static int
+glm_custom_design (struct lexer *lexer, struct dataset *ds,
+		   struct cmd_glm *cmd UNUSED, void *aux UNUSED)
+{
+  size_t n_allocated = 2;
+  size_t n_members;
+  struct variable **interaction_vars;
+  struct variable *this_var;
+
+  interactions = xnmalloc (n_allocated, sizeof (*interactions));
+  n_inter = 1;
+  while (lex_token (lexer) != T_STOP && lex_token (lexer) != '.')
+    {
+      this_var = parse_variable (lexer, dataset_dict (ds));
+      if (lex_match (lexer, '('))
+	{
+	  lex_force_match (lexer, ')');
+	}
+      else if (lex_match (lexer, '*'))
+	{
+	  interaction_vars = xnmalloc (2 * n_inter, sizeof (*interaction_vars));
+	  n_members = parse_interactions (lexer, interaction_vars, 1, 2 * n_inter, ds);
+	  if (n_allocated < n_inter)
+	    {
+	      n_allocated *= 2;
+	      xnrealloc (interactions, n_allocated, sizeof (*interactions));
+	    }
+	  interactions [n_inter - 1] = 
+	    interaction_variable_create (interaction_vars, n_members);
+	  n_inter++;
+	  free (interaction_vars);
+	}
+    }
+  return 1;
+}
 /* Parser for the dependent sub command */
 static int
 glm_custom_dependent (struct lexer *lexer, struct dataset *ds,
@@ -236,26 +338,17 @@ run_glm (struct casereader *input,
 	if (var_is_alpha (all_vars[i]))
 	  cat_stored_values_create (all_vars[i]);
       
-      cov = covariance_matrix_init (n_all_vars, all_vars, ONE_PASS, PAIRWISE, MV_ANY);
       reader = casereader_create_counter (reader, &row, -1);
+
+      for (i = 0; i < n_inter; i++)
       for (; (c = casereader_read (reader)) != NULL; case_unref (c))
 	{
 	  /* 
 	     Accumulate the covariance matrix.
 	  */
-	  covariance_matrix_accumulate (cov, c, NULL, 0);
 	  n_data++;
 	}
-      covariance_matrix_compute (cov);
-
-      for (i = 0; i < n_dependent; i++)
-	{
-	  model = fit_model (cov, v_dependent[i], indep_vars, n_data, n_indep);
-	  pspp_linreg_cache_free (model);
-	}
-
       casereader_destroy (reader);
-      covariance_matrix_destroy (cov);
     }
   else
     {