Remove variables assigned to but never used.

[pspp] / src / language / stats / quick-cluster.c

diff --git a/src/language/stats/quick-cluster.c b/src/language/stats/quick-cluster.c
index 10572cee5e260a8a1590c56742489586741f1053..bc66cce795caf06932ed3da6269b306bd0a6cd52 100644 (file)
--- a/src/language/stats/quick-cluster.c
+++ b/src/language/stats/quick-cluster.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012 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
@@ -227,11 +227,12 @@ kmeans_recalculate_centers (struct Kmeans *kmeans, const struct casereader *read
        {
          const union value *val = case_data (c, qc->vars[v]);
          double x = val->f * weight;
+         double curval;
 
          if ( var_is_value_missing (qc->vars[v], val, qc->exclude))
            continue;
 
-         double curval = gsl_matrix_get (kmeans->centers, index, v);
+         curval = gsl_matrix_get (kmeans->centers, index, v);
          gsl_matrix_set (kmeans->centers, index, v, curval + x);
        }
       i++;
@@ -389,11 +390,10 @@ static void
 quick_cluster_show_centers (struct Kmeans *kmeans, bool initial, const struct qc *qc)
 {
   struct tab_table *t;
-  int nc, nr, heading_columns, currow;
+  int nc, nr, currow;
   int i, j;
   nc = qc->ngroups + 1;
   nr = qc->n_vars + 4;
-  heading_columns = 1;
   t = tab_create (nc, nr);
   tab_headers (t, 0, nc - 1, 0, 1);
   currow = 0;
@@ -528,6 +528,10 @@ cmd_quick_cluster (struct lexer *lexer, struct dataset *ds)
                {
                  qc.exclude = MV_SYSTEM;
                }
+             else if (lex_match_id (lexer, "EXCLUDE"))
+               {
+                 qc.exclude = MV_ANY;
+               }
              else
                goto error;
            }