QUICK CLUSTER: Fold quick-cluster.h into quick-cluster.c.

It's unusual to put 'static' function prototypes into a header file:
header files are usually used to export declarations for use by other
source files, but 'static' functions cannot be called outside their
own source files.

diff --git a/src/language/stats/automake.mk b/src/language/stats/automake.mk
index b53127828cef9feec298c40cc30bc093945dd317..7b2022f02e068c67bc9feb839451fb9549bb4232 100644 (file)
--- a/src/language/stats/automake.mk
+++ b/src/language/stats/automake.mk
@@ -38,7 +38,6 @@ language_stats_sources = \
        src/language/stats/npar-summary.h \
        src/language/stats/oneway.c \
        src/language/stats/quick-cluster.c \
-       src/language/stats/quick-cluster.h \
        src/language/stats/reliability.c \
        src/language/stats/roc.c \
        src/language/stats/roc.h \

diff --git a/src/language/stats/quick-cluster.c b/src/language/stats/quick-cluster.c
index 4dc3a2ff5a923f82c94205bd55c42cd734d3e69a..f22658cd194012351e9cc488909276c1a4cd4808 100644 (file)
--- a/src/language/stats/quick-cluster.c
+++ b/src/language/stats/quick-cluster.c
@@ -54,8 +54,6 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#include "quick-cluster.h"
-
 /*
 Struct KMeans:
 Holds all of the information for the functions.
@@ -81,6 +79,32 @@ struct Kmeans
   const struct variable *wv;   //Weighting variable
 };
 
+static struct Kmeans *kmeans_create (struct casereader *cs,
+                                    const struct variable **variables,
+                                    int m, int ngroups, int maxiter);
+
+static void kmeans_randomize_centers (struct Kmeans *kmeans);
+
+static int kmeans_get_nearest_group (struct Kmeans *kmeans, struct ccase *c);
+
+static void kmeans_recalculate_centers (struct Kmeans *kmeans);
+
+static int
+kmeans_calculate_indexes_and_check_convergence (struct Kmeans *kmeans);
+
+static void kmeans_order_groups (struct Kmeans *kmeans);
+
+static void kmeans_cluster (struct Kmeans *kmeans);
+
+static void quick_cluster_show_centers (struct Kmeans *kmeans, bool initial);
+
+static void quick_cluster_show_number_cases (struct Kmeans *kmeans);
+
+static void quick_cluster_show_results (struct Kmeans *kmeans);
+
+int cmd_quick_cluster (struct lexer *lexer, struct dataset *ds);
+
+static void kmeans_destroy (struct Kmeans *kmeans);
 
 /*
 Creates and returns a struct of Kmeans with given casereader 'cs', parsed variables 'variables',

diff --git a/src/language/stats/quick-cluster.h b/src/language/stats/quick-cluster.h
deleted file mode 100644 (file)
index 9c7d1b9..0000000
--- a/src/language/stats/quick-cluster.h
+++ /dev/null
@@ -1,26 +0,0 @@
-static struct Kmeans *kmeans_create (struct casereader *cs,
-                                    const struct variable **variables,
-                                    int m, int ngroups, int maxiter);
-
-static void kmeans_randomize_centers (struct Kmeans *kmeans);
-
-static int kmeans_get_nearest_group (struct Kmeans *kmeans, struct ccase *c);
-
-static void kmeans_recalculate_centers (struct Kmeans *kmeans);
-
-static int
-kmeans_calculate_indexes_and_check_convergence (struct Kmeans *kmeans);
-
-static void kmeans_order_groups (struct Kmeans *kmeans);
-
-static void kmeans_cluster (struct Kmeans *kmeans);
-
-static void quick_cluster_show_centers (struct Kmeans *kmeans, bool initial);
-
-static void quick_cluster_show_number_cases (struct Kmeans *kmeans);
-
-static void quick_cluster_show_results (struct Kmeans *kmeans);
-
-int cmd_quick_cluster (struct lexer *lexer, struct dataset *ds);
-
-static void kmeans_destroy (struct Kmeans *kmeans);