categoricals.c (struct payload): Rename destroy to calculate

diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c
index fc67ffaf2a4daba6a56d7f778292867e3f7aa059..4e4790eb3293382dc8acad7bef1ec772c1961f19 100644 (file)
--- a/src/language/stats/examine.c
+++ b/src/language/stats/examine.c
@@ -1803,7 +1803,7 @@ run_examine (struct examine *cmd, struct casereader *input)
   struct payload payload;
   payload.create = create_n;
   payload.update = update_n;
-  payload.destroy = calculate_n;
+  payload.calculate = calculate_n;
   
   cmd->wv = dict_get_weight (cmd->dict);
 

diff --git a/src/language/stats/means.c b/src/language/stats/means.c
index f5e03c16f1d11de2110132ecae7a2d2928463455..c048161ca1bfda424298884664d45e2edc8e8639 100644 (file)
--- a/src/language/stats/means.c
+++ b/src/language/stats/means.c
@@ -938,7 +938,7 @@ run_means (struct means *cmd, struct casereader *input,
   struct payload payload;
   payload.create = create_n;
   payload.update = update_n;
-  payload.destroy = calculate_n;
+  payload.calculate = calculate_n;
   
   for (t = 0; t < cmd->n_tables; ++t)
   {

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index 4fd027e2995115d12862221160eea15791fb76a1..08449103c522f92e834ffda095404780729614b4 100644 (file)
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -690,7 +690,7 @@ run_oneway (const struct oneway_spec *cmd,
       struct payload payload;
       payload.create = makeit;
       payload.update = updateit;
-      payload.destroy = NULL;
+      payload.calculate = NULL;
 
       ws.vws[v].cat = categoricals_create (&inter, 1, cmd->wv,
                                            cmd->exclude, cmd->exclude);

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index ba88227864c5fc363a02b921125f44a3d7c2243e..2bc2b626b0636c36c59a77fe0fb290738b87ead5 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -591,8 +591,8 @@ categoricals_done (const struct categoricals *cat_)
              const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
              iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
            }
-         if (cat->payload && cat->payload->destroy)
-           cat->payload->destroy (cat->aux1, cat->aux2, iv->user_data);
+         if (cat->payload && cat->payload->calculate)
+           cat->payload->calculate (cat->aux1, cat->aux2, iv->user_data);
        }
     }
 

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 28e0f5f1df98fc422d2fbae13296c4003f794cdf..11d64d02296d1ff58952ef33aa7cea3ccc76befe 100644 (file)
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -106,7 +106,7 @@ struct payload
 {
   void* (*create)  (const void *aux1, void *aux2);
   void (*update)  (const void *aux1, void *aux2, void *user_data, const struct ccase *, double weight);
-  void (*destroy) (const void *aux1, void *aux2, void *user_data);
+  void (*calculate) (const void *aux1, void *aux2, void *user_data);
 };