clusttool: Remove unused code and some global functions

* WriteProtoList is unused. Remove it.

* ReadNFloats, WriteNFloats and WriteProtoStyle are only used locally,
  so make them local.

Signed-off-by: Stefan Weil <sw@weilnetz.de>

src/classify/clusttool.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************
- ** Filename: clustertool.c
+ ** Filename: clusttool.cpp
  ** Purpose:  Misc. tools for use with the clustering routines
  ** Author:   Dan Johnson
  **
@@ -17,9 +17,8 @@
 
 //--------------------------Include Files----------------------------------
 #include "clusttool.h"
-#include "emalloc.h"
-#include <cstdio>
 #include <cmath>
+#include "emalloc.h"
 
 using tesseract::TFile;
 
@@ -28,6 +27,87 @@ using tesseract::TFile;
 #define QUOTED_TOKENSIZE "79"
 #define MAXSAMPLESIZE 65535  ///< max num of dimensions in feature space
 
+/**
+ * This routine reads N floats from the specified text file
+ * and places them into Buffer.  If Buffer is nullptr, a buffer
+ * is created and passed back to the caller.  If EOF is
+ * encountered before any floats can be read, nullptr is
+ * returned.
+ * @param fp open text file to read floats from
+ * @param N number of floats to read
+ * @param Buffer pointer to buffer to place floats into
+ * @return Pointer to buffer holding floats or nullptr if EOF
+ * @note Globals: None
+ */
+static float *ReadNFloats(TFile *fp, uint16_t N, float Buffer[]) {
+  const int kMaxLineSize = 1024;
+  char line[kMaxLineSize];
+  if (fp->FGets(line, kMaxLineSize) == nullptr) {
+    tprintf("Hit EOF in ReadNFloats!\n");
+    return nullptr;
+  }
+  bool needs_free = false;
+
+  if (Buffer == nullptr) {
+    Buffer = static_cast<float *>(Emalloc(N * sizeof(float)));
+    needs_free = true;
+  }
+
+  char *startptr = line;
+  for (int i = 0; i < N; i++) {
+    char *endptr;
+    Buffer[i] = strtof(startptr, &endptr);
+    if (endptr == startptr) {
+      tprintf("Read of %d floats failed!\n", N);
+      if (needs_free) Efree(Buffer);
+      return nullptr;
+    }
+    startptr = endptr;
+  }
+  return Buffer;
+}
+
+/**
+ * This routine writes a text representation of N floats from
+ * an array to a file.  All of the floats are placed on one line.
+ * @param File open text file to write N floats to
+ * @param N number of floats to write
+ * @param Array array of floats to write
+ * @return None
+ * @note Globals: None
+ */
+static void WriteNFloats(FILE * File, uint16_t N, float Array[]) {
+  for (int i = 0; i < N; i++)
+    fprintf(File, " %9.6f", Array[i]);
+  fprintf(File, "\n");
+}
+
+/**
+ * This routine writes to the specified text file a word
+ * which represents the ProtoStyle.  It does not append
+ * a carriage return to the end.
+ * @param File open text file to write prototype style to
+ * @param ProtoStyle prototype style to write
+ * @return None
+ * @note Globals: None
+ */
+static void WriteProtoStyle(FILE *File, PROTOSTYLE ProtoStyle) {
+  switch (ProtoStyle) {
+    case spherical:
+      fprintf (File, "spherical");
+      break;
+    case elliptical:
+      fprintf (File, "elliptical");
+      break;
+    case mixed:
+      fprintf (File, "mixed");
+      break;
+    case automatic:
+      fprintf (File, "automatic");
+      break;
+  }
+}
+
 /**
  * This routine reads a single integer from the specified
  * file and checks to ensure that it is between 0 and
@@ -159,46 +239,6 @@ PROTOTYPE *ReadPrototype(TFile *fp, uint16_t N) {
   return Proto;
 }
 
-/**
- * This routine reads N floats from the specified text file
- * and places them into Buffer.  If Buffer is nullptr, a buffer
- * is created and passed back to the caller.  If EOF is
- * encountered before any floats can be read, nullptr is
- * returned.
- * @param fp open text file to read floats from
- * @param N number of floats to read
- * @param Buffer pointer to buffer to place floats into
- * @return Pointer to buffer holding floats or nullptr if EOF
- * @note Globals: None
- */
-float *ReadNFloats(TFile *fp, uint16_t N, float Buffer[]) {
-  const int kMaxLineSize = 1024;
-  char line[kMaxLineSize];
-  if (fp->FGets(line, kMaxLineSize) == nullptr) {
-    tprintf("Hit EOF in ReadNFloats!\n");
-    return nullptr;
-  }
-  bool needs_free = false;
-
-  if (Buffer == nullptr) {
-    Buffer = static_cast<float *>(Emalloc(N * sizeof(float)));
-    needs_free = true;
-  }
-
-  char *startptr = line;
-  for (int i = 0; i < N; i++) {
-    char *endptr;
-    Buffer[i] = strtof(startptr, &endptr);
-    if (endptr == startptr) {
-      tprintf("Read of %d floats failed!\n", N);
-      if (needs_free) Efree(Buffer);
-      return nullptr;
-    }
-    startptr = endptr;
-  }
-  return Buffer;
-}
-
 /**
  * This routine writes an array of dimension descriptors to
  * the specified text file.
@@ -273,78 +313,3 @@ void WritePrototype(FILE *File, uint16_t N, PROTOTYPE *Proto) {
       WriteNFloats (File, N, Proto->Variance.Elliptical);
   }
 }
-
-/**
- * This routine writes a text representation of N floats from
- * an array to a file.  All of the floats are placed on one line.
- * @param File open text file to write N floats to
- * @param N number of floats to write
- * @param Array array of floats to write
- * @return None
- * @note Globals: None
- */
-void WriteNFloats(FILE * File, uint16_t N, float Array[]) {
-  for (int i = 0; i < N; i++)
-    fprintf(File, " %9.6f", Array[i]);
-  fprintf(File, "\n");
-}
-
-/**
- * This routine writes to the specified text file a word
- * which represents the ProtoStyle.  It does not append
- * a carriage return to the end.
- * @param File open text file to write prototype style to
- * @param ProtoStyle prototype style to write
- * @return None
- * @note Globals: None
- */
-void WriteProtoStyle(FILE *File, PROTOSTYLE ProtoStyle) {
-  switch (ProtoStyle) {
-    case spherical:
-      fprintf (File, "spherical");
-      break;
-    case elliptical:
-      fprintf (File, "elliptical");
-      break;
-    case mixed:
-      fprintf (File, "mixed");
-      break;
-    case automatic:
-      fprintf (File, "automatic");
-      break;
-  }
-}
-
-/**
- * This routine writes a textual description of each prototype
- * in the prototype list to the specified file.  It also
- * writes a file header which includes the number of dimensions
- * in feature space and the descriptions for each dimension.
- * @param File open text file to write prototypes to
- * @param N number of dimensions in feature space
- * @param ParamDesc descriptions for each dimension
- * @param ProtoList list of prototypes to be written
- * @param WriteSigProtos true to write out significant prototypes
- * @param WriteInsigProtos true to write out insignificants
- * @note Globals: None
- * @return None
- */
-
-void WriteProtoList(FILE* File, uint16_t N, PARAM_DESC* ParamDesc,
-                    LIST ProtoList, bool WriteSigProtos,
-                    bool WriteInsigProtos) {
-  PROTOTYPE *Proto;
-
-  /* write file header */
-  fprintf(File,"%0d\n",N);
-  WriteParamDesc(File,N,ParamDesc);
-
-  /* write prototypes */
-  iterate(ProtoList)
-    {
-      Proto = reinterpret_cast<PROTOTYPE *>first_node (ProtoList);
-      if ((Proto->Significant && WriteSigProtos) ||
-          (!Proto->Significant && WriteInsigProtos))
-        WritePrototype(File, N, Proto);
-    }
-}

src/classify/clusttool.h

@@ -32,18 +32,8 @@ PARAM_DESC *ReadParamDesc(tesseract::TFile *fp, uint16_t N);
 
 PROTOTYPE *ReadPrototype(tesseract::TFile *fp, uint16_t N);
 
-float *ReadNFloats(tesseract::TFile *fp, uint16_t N, float Buffer[]);
-
 void WriteParamDesc(FILE *File, uint16_t N, const PARAM_DESC ParamDesc[]);
 
 void WritePrototype(FILE *File, uint16_t N, PROTOTYPE *Proto);
 
-void WriteNFloats (FILE * File, uint16_t N, float Array[]);
-
-void WriteProtoStyle(FILE *File, PROTOSTYLE ProtoStyle);
-
-void WriteProtoList(FILE* File, uint16_t N, PARAM_DESC* ParamDesc,
-                    LIST ProtoList, bool WriteSigProtos,
-                    bool WriteInsigProtos);
-
 #endif  // TESSERACT_CLASSIFY_CLUSTTOOL_H_