Delete file "means.q"

This file contained only the skeleton of the parser.

diff --git a/src/language/command.def b/src/language/command.def
index 80b471b6a80c14d35a0960a8584ae41c351b09f6..6096e759cac3e21b34a67b373005ba6507191bf4 100644 (file)
--- a/src/language/command.def
+++ b/src/language/command.def
@@ -112,7 +112,6 @@ DEF_CMD (S_DATA, 0, "FILTER", cmd_filter)
 DEF_CMD (S_DATA, 0, "FLIP", cmd_flip)
 DEF_CMD (S_DATA, 0, "FREQUENCIES", cmd_frequencies)
 DEF_CMD (S_DATA, 0, "LIST", cmd_list)
-DEF_CMD (S_DATA, 0, "MEANS", cmd_means)
 DEF_CMD (S_DATA, 0, "MODIFY VARS", cmd_modify_vars)
 DEF_CMD (S_DATA, 0, "NPAR TESTS", cmd_npar_tests)
 DEF_CMD (S_DATA, 0, "ONEWAY", cmd_oneway)
@@ -198,6 +197,7 @@ UNIMPL_CMD ("MAPS", "Geographical display")
 UNIMPL_CMD ("MATRIX", "Matrix processing")
 UNIMPL_CMD ("MATRIX DATA", "Matrix data input")
 UNIMPL_CMD ("MCONVERT", "Convert covariance/correlation matrices")
+UNIMPL_CMD ("MEANS", cmd_means)
 UNIMPL_CMD ("MIXED", "Mixed linear models")
 UNIMPL_CMD ("MODEL CLOSE ", "Close server connection")
 UNIMPL_CMD ("MODEL HANDLE", "Define server connection")

diff --git a/src/language/stats/.gitignore b/src/language/stats/.gitignore
index 84bcaba8950d2fc2f3ffc62236329c500f870af3..74c55643ebc67cc9885070ac248b624917335b29 100644 (file)
--- a/src/language/stats/.gitignore
+++ b/src/language/stats/.gitignore
@@ -2,7 +2,6 @@ crosstabs.c
 examine.c
 frequencies.c
 glm.c
-means.c
 npar.c
 oneway.c
 rank.c

diff --git a/src/language/stats/automake.mk b/src/language/stats/automake.mk
index e3f0b1c1ed279efe91512c64890d79d3f75d2e3f..d963a03ba4837d8727d5db4b240079c5e878cf6e 100644 (file)
--- a/src/language/stats/automake.mk
+++ b/src/language/stats/automake.mk
@@ -7,7 +7,6 @@ src_language_stats_built_sources = \
        src/language/stats/examine.c \
        src/language/stats/frequencies.c \
        src/language/stats/glm.c \
-       src/language/stats/means.c \
        src/language/stats/npar.c \
        src/language/stats/oneway.c \
        src/language/stats/rank.c \

diff --git a/src/language/stats/means.q b/src/language/stats/means.q
deleted file mode 100644 (file)
index 75eef10..0000000
--- a/src/language/stats/means.q
+++ /dev/null
@@ -1,171 +0,0 @@
-/* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-
-#include "xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-
-/* (headers) */
-
-/* (specification)
-   means (mns_):
-     *tables=custom;
-     +format=lab:!labels/nolabels/nocatlabs,
-            name:!names/nonames,
-            val:!values/novalues,
-            fmt:!table/tree;
-     missing=miss:!table/include/dependent;
-     +cells[cl_]=default,count,sum,mean,stddev,variance,all;
-     +statistics[st_]=anova,linearity,all,none.
-*/
-/* (declarations) */
-/* (functions) */
-
-/* TABLES: Variable lists for each dimension. */
-static int n_dim;              /* Number of dimensions. */
-static size_t *nv_dim;         /* Number of variables in each dimension. */
-static const struct variable ***v_dim; /* Variables in each dimension.  */
-
-/* VARIABLES: List of variables. */
-static struct variable **v_var;
-
-/* Parses and executes the T-TEST procedure. */
-int
-cmd_means (struct lexer *lexer, struct dataset *ds)
-{
-  struct cmd_means cmd;
-  int success = CMD_FAILURE;
-
-  n_dim = 0;
-  nv_dim = NULL;
-  v_dim = NULL;
-  v_var = NULL;
-
-  if (!parse_means (lexer, ds, &cmd, NULL))
-    goto free;
-
-  if (cmd.sbc_cells)
-    {
-      int i;
-      for (i = 0; i < MNS_CL_count; i++)
-       if (cmd.a_cells[i])
-         break;
-      if (i >= MNS_CL_count)
-       cmd.a_cells[MNS_CL_ALL] = 1;
-    }
-  else
-    cmd.a_cells[MNS_CL_DEFAULT] = 1;
-  if (cmd.a_cells[MNS_CL_DEFAULT] || cmd.a_cells[MNS_CL_ALL])
-    cmd.a_cells[MNS_CL_MEAN] = cmd.a_cells[MNS_CL_STDDEV] = cmd.a_cells[MNS_CL_COUNT] = 1;
-  if (cmd.a_cells[MNS_CL_ALL])
-    cmd.a_cells[MNS_CL_SUM] = cmd.a_cells[MNS_CL_VARIANCE] = 1;
-
-  if (cmd.sbc_statistics)
-    {
-      if (!cmd.a_statistics[MNS_ST_ANOVA] && !cmd.a_statistics[MNS_ST_LINEARITY])
-       cmd.a_statistics[MNS_ST_ANOVA] = 1;
-      if (cmd.a_statistics[MNS_ST_ALL])
-       cmd.a_statistics[MNS_ST_ANOVA] = cmd.a_statistics[MNS_ST_LINEARITY] = 1;
-    }
-
-  if (!cmd.sbc_tables)
-    {
-      msg (SE, _("Missing required subcommand TABLES."));
-      goto free;
-    }
-
-  success = CMD_SUCCESS;
-
-free:
-  {
-    int i;
-
-    for (i = 0; i < n_dim; i++)
-      free (v_dim[i]);
-    free (nv_dim);
-    free (v_dim);
-    free (v_var);
-  }
-
-  return success;
-}
-
-/* Parses the TABLES subcommand. */
-static int
-mns_custom_tables (struct lexer *lexer, struct dataset *ds, struct cmd_means *cmd, void *aux UNUSED)
-{
-  struct const_var_set *var_set;
-
-  if (!lex_match_id (lexer, "TABLES")
-      && (lex_token (lexer) != T_ID || dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)
-      && lex_token (lexer) != T_ALL)
-    return 2;
-  lex_match (lexer, '=');
-
-  if (cmd->sbc_tables)
-    {
-      msg (SE, _("TABLES subcommand may not appear more "
-                "than once."));
-      return 0;
-    }
-
-  var_set = const_var_set_create_from_dict (dataset_dict (ds));
-  assert (var_set != NULL);
-
-  do
-    {
-      size_t nvl;
-      const struct variable **vl;
-
-      if (!parse_const_var_set_vars (lexer, var_set, &vl, &nvl,
-                               PV_NO_DUPLICATE | PV_NO_SCRATCH))
-        goto lossage;
-
-      n_dim++;
-      nv_dim = xnrealloc (nv_dim, n_dim, sizeof *nv_dim);
-      v_dim = xnrealloc (v_dim, n_dim, sizeof *v_dim);
-
-      nv_dim[n_dim - 1] = nvl;
-      v_dim[n_dim - 1] = vl;
-    }
-  while (lex_match (lexer, T_BY));
-
-  const_var_set_destroy (var_set);
-  return 1;
-
- lossage:
-  const_var_set_destroy (var_set);
-  return 0;
-}
-
-/*
-   Local Variables:
-   mode: c
-   End:
-*/