X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdata-io%2Fmatrix-data.c;h=97d14739b3a56ab2b8ef7f1cc38ad137ddf911d4;hb=8d6bfdd2a100bf8166b3b0b3f006d46f3e7a59e9;hp=752a0be3d26105c5930aa8e1b15b0b093ffcebd1;hpb=b4e3d932f4dfbdf3e51c81b78daabb40e23528b2;p=pspp

diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c
index 752a0be3d2..97d14739b3 100644
--- a/src/language/data-io/matrix-data.c
+++ b/src/language/data-io/matrix-data.c
@@ -77,6 +77,7 @@ struct matrix_format
   int n_continuous_vars;
   struct variable **split_vars;
   size_t n_split_vars;
+  long n;
 };
 
 /*
@@ -124,8 +125,7 @@ preprocess (struct casereader *casereader0, const struct dictionary *dict, void
 {
   struct matrix_format *mformat = aux;
   const struct caseproto *proto = casereader_get_proto (casereader0);
-  struct casewriter *writer;
-  writer = autopaging_writer_create (proto);
+  struct casewriter *writer = autopaging_writer_create (proto);
   struct ccase *prev_case = NULL;
   double **matrices = NULL;
   size_t n_splits = 0;
@@ -175,6 +175,8 @@ preprocess (struct casereader *casereader0, const struct dictionary *dict, void
 	      msg (SE,
 		   _("There are %d variable declared but the data has at least %d matrix rows."),
 		   mformat->n_continuous_vars, row + 1);
+	      case_unref (c);
+	      casereader_destroy (pass0);
 	      goto error;
 	    }
 	  int col;
@@ -206,6 +208,24 @@ preprocess (struct casereader *casereader0, const struct dictionary *dict, void
   const int idx = var_get_dict_index (mformat->varname);
   row = 0;
 
+  if (mformat->n >= 0)
+    {
+      int col;
+      struct ccase *outcase = case_create (proto);
+      union value *v = case_data_rw (outcase, mformat->rowtype);
+      uint8_t *n = value_str_rw (v, ROWTYPE_WIDTH);
+      strncpy ((char *) n, "N        ", ROWTYPE_WIDTH);
+      blank_varname_column (outcase, mformat->varname);
+      for (col = 0; col < mformat->n_continuous_vars; ++col)
+	{
+	  union value *dest_val =
+	    case_data_rw_idx (outcase,
+			      1 + col + var_get_dict_index (mformat->varname));
+	  dest_val->f = mformat->n;
+	}
+      casewriter_write (writer, outcase);
+    }
+
   prev_split_hash = 1;
   n_splits = 0;
   for (; (c = casereader_read (casereader0)) != NULL; prev_case = c)
@@ -225,12 +245,23 @@ preprocess (struct casereader *casereader0, const struct dictionary *dict, void
 	}
 
       prev_split_hash = split_hash;
-
       case_unref (prev_case);
-      struct ccase *outcase = case_create (proto);
-      case_copy (outcase, 0, c, 0, caseproto_get_n_widths (proto));
       const union value *v = case_data (c, mformat->rowtype);
       const char *val = (const char *) value_str (v, ROWTYPE_WIDTH);
+      if (mformat->n >= 0)
+	{
+	  if (0 == strncasecmp (val, "n       ", ROWTYPE_WIDTH) ||
+	      0 == strncasecmp (val, "n_vector", ROWTYPE_WIDTH))
+	    {
+	      msg (SW,
+		   _("The N subcommand was specified, but a N record was also found in the data.  The N record will be ignored."));
+	      continue;
+	    }
+	}
+
+      struct ccase *outcase = case_create (proto);
+      case_copy (outcase, 0, c, 0, caseproto_get_n_widths (proto));
+
       if (0 == strncasecmp (val, "corr    ", ROWTYPE_WIDTH) ||
 	  0 == strncasecmp (val, "cov     ", ROWTYPE_WIDTH))
 	{
@@ -316,6 +347,7 @@ error:
     free (matrices[i]);
   free (matrices);
   casereader_destroy (casereader0);
+  casewriter_destroy (writer);
   return NULL;
 }
 
@@ -336,6 +368,7 @@ cmd_matrix (struct lexer *lexer, struct dataset *ds)
   mformat.diagonal = DIAGONAL;
   mformat.n_split_vars = 0;
   mformat.split_vars = NULL;
+  mformat.n = -1;
 
   dict = (in_input_program ()
           ? dataset_dict (ds)
@@ -406,7 +439,22 @@ cmd_matrix (struct lexer *lexer, struct dataset *ds)
       if (! lex_force_match (lexer, T_SLASH))
 	goto error;
 
-      if (lex_match_id (lexer, "FORMAT"))
+      if (lex_match_id (lexer, "N"))
+	{
+	  lex_match (lexer, T_EQUALS);
+
+	  if (! lex_force_int (lexer))
+	    goto error;
+
+	  mformat.n = lex_integer (lexer);
+	  if (mformat.n < 0)
+	    {
+	      msg (SE, _("%s must not be negative."), "N");
+	      goto error;
+	    }
+	  lex_get (lexer);
+	}
+      else if (lex_match_id (lexer, "FORMAT"))
 	{
 	  lex_match (lexer, T_EQUALS);
 
@@ -512,7 +560,8 @@ cmd_matrix (struct lexer *lexer, struct dataset *ds)
     }
   else
     {
-      data_parser_make_active_file (parser, ds, reader, dict, preprocess, &mformat);
+      data_parser_make_active_file (parser, ds, reader, dict, preprocess,
+				    &mformat);
     }
 
   fh_unref (fh);
@@ -524,7 +573,7 @@ cmd_matrix (struct lexer *lexer, struct dataset *ds)
  error:
   data_parser_destroy (parser);
   if (!in_input_program ())
-    dict_destroy (dict);
+    dict_unref (dict);
   fh_unref (fh);
   free (encoding);
   free (mformat.split_vars);