Imported Upstream version 1.01.003

1 files changed, 58 insertions, 72 deletions

diff --git a/makeweights.c b/makeweights.c
index 9263711..cbe1866 100644
--- a/makeweights.c
+++ b/makeweights.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: makeweights.c,v 1.23 2009/02/23 20:21:53 Superfly_Jon Exp $
+ * $Id: makeweights.c,v 1.24 2013/06/16 02:16:18 mdpetch Exp $
  */
 
 #include "config.h"
@@ -26,95 +26,81 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <locale.h>
-#include "eval.h" /* for WEIGHTS_VERSION */
+#include "eval.h"               /* for WEIGHTS_VERSION */
 
-static void 
-usage (char *prog) {
-  fprintf (stderr, "Usage: %s [[-f] outputfile [inputfile]]\n"
-	  "  outputfile: Output to file instead of stdout\n"
-	  "  inputfile: Input from file instead of stdin\n",
-	   prog);
+static void
+usage(char *prog)
+{
+    fprintf(stderr, "Usage: %s [[-f] outputfile [inputfile]]\n"
+            "  outputfile: Output to file instead of stdout\n" "  inputfile: Input from file instead of stdin\n", prog);
 
-  exit (1);
+    exit(1);
 }
 
-extern int main( int argc, /*lint -e{818}*/char *argv[] )
+extern int
+main(int argc, /*lint -e{818} */ char *argv[])
 {
     neuralnet nn;
-    char szFileVersion[ 16 ];
-    static float ar[ 2 ] = { WEIGHTS_MAGIC_BINARY, WEIGHTS_VERSION_BINARY };
+    char szFileVersion[16];
+    static float ar[2] = { WEIGHTS_MAGIC_BINARY, WEIGHTS_VERSION_BINARY };
     int c;
     FILE *input = stdin, *output = stdout;
 
-	if (argc > 1)
-	{
-		int arg = 1;
-		if (!StrCaseCmp (argv[1], "-f"))
-			arg++;	/* Skip */
-
-		if (argc > arg + 2)
-			usage (argv[0]);
-		if ((output = g_fopen (argv[arg], "wb")) == 0)
-		{
-			perror ("Can't open output file");
-			exit (1);
-		}
-		if (argc == arg + 2)
-		{
-			if ((input = g_fopen(argv[arg + 1], "r")) == 0)
-			{
-				perror ("Can't open input file");
-				exit (1);
-			}
-		}
+    if (argc > 1) {
+        int arg = 1;
+        if (!StrCaseCmp(argv[1], "-f"))
+            arg++;              /* Skip */
+
+        if (argc > arg + 2)
+            usage(argv[0]);
+        if ((output = g_fopen(argv[arg], "wb")) == 0) {
+            perror("Can't open output file");
+            exit(1);
+        }
+        if (argc == arg + 2) {
+            if ((input = g_fopen(argv[arg + 1], "r")) == 0) {
+                perror("Can't open input file");
+                exit(1);
+            }
+        }
     }
 
-    if (!setlocale (LC_ALL, "C") || 
-		!bindtextdomain (PACKAGE, LOCALEDIR) || 
-		!textdomain (PACKAGE))
-	{
-		perror ("seting locale failed");
-		exit (1);
-	}
+    if (!setlocale(LC_ALL, "C") || !bindtextdomain(PACKAGE, LOCALEDIR) || !textdomain(PACKAGE)) {
+        perror("seting locale failed");
+        exit(1);
+    }
 
     /* generate weights */
-    
-    if (fscanf(input, "GNU Backgammon %15s\n", szFileVersion ) != 1)
-	{
-		fprintf( stderr, _("%s: invalid weights file\n"), argv[ 0 ] );
-		return EXIT_FAILURE;
+
+    if (fscanf(input, "GNU Backgammon %15s\n", szFileVersion) != 1) {
+        fprintf(stderr, _("%s: invalid weights file\n"), argv[0]);
+        return EXIT_FAILURE;
     }
 
-    if (StrCaseCmp( szFileVersion, WEIGHTS_VERSION ) )
-	{
-		fprintf( stderr, _("%s: incorrect weights version\n"
-							"(version %s is required, "
-							"but these weights are %s)\n" ),
-				argv[ 0 ], WEIGHTS_VERSION, szFileVersion );
-		return EXIT_FAILURE;
+    if (StrCaseCmp(szFileVersion, WEIGHTS_VERSION)) {
+        fprintf(stderr, _("%s: incorrect weights version\n"
+                          "(version %s is required, "
+                          "but these weights are %s)\n"), argv[0], WEIGHTS_VERSION, szFileVersion);
+        return EXIT_FAILURE;
     }
-	
-    if (fwrite( ar, sizeof( ar[ 0 ] ), 2, output ) != 2)
-    {
-	    fprintf(stderr, "Failed to write neural net!");
-	    return EXIT_FAILURE;
+
+    if (fwrite(ar, sizeof(ar[0]), 2, output) != 2) {
+        fprintf(stderr, "Failed to write neural net!");
+        return EXIT_FAILURE;
+    }
+
+    for (c = 0; !feof(input); c++) {
+        if (NeuralNetLoad(&nn, input) == -1) {
+            fprintf(stderr, "Failed to load neural net!");
+            return EXIT_FAILURE;
+        }
+        if (NeuralNetSaveBinary(&nn, output) == -1) {
+            fprintf(stderr, "Failed to save neural net!");
+            return EXIT_FAILURE;
+        }
     }
 
-    for( c = 0; !feof(input); c++ )
-	{
-		if (NeuralNetLoad( &nn, input ) == -1)
-		{
-			fprintf(stderr, "Failed to load neural net!");
-			return EXIT_FAILURE;
-		}
-		if( NeuralNetSaveBinary( &nn, output ) == -1 )
-		{
-			fprintf(stderr, "Failed to save neural net!");
-			return EXIT_FAILURE;
-		}
-	}
-
-    fprintf( stderr, _("%d nets converted\n"), c );
+    fprintf(stderr, _("%d nets converted\n"), c);
 
     return EXIT_SUCCESS;