From: Eric S. Raymond <esr@thyrsus.com>
Date: Thu, 13 Apr 1995 05:44:14 +0000 (+0000)
Subject: Cosmetic rearrangements.
X-Git-Tag: 2.0~24
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=e9a718e113c9dd7c8a2014e76eb747bb2d3c6a8d;p=deal.git

Cosmetic rearrangements.
---

diff --git a/deal.c b/deal.c
index eda4fc9..811798d 100644
--- a/deal.c
+++ b/deal.c
@@ -1,6 +1,6 @@
 #include <math.h>
 
-#define MAXCOLS	8
+#define BASEHAND	7	/* # cards in initial deal */
 
 main(argc, argv)
     int argc;
@@ -19,7 +19,7 @@ main(argc, argv)
         total = atoi(argv[2]);
         turns = atoi(argv[3]);
         if (total < special) {
-            printf("can't have more specials than total cards!\n");
+            printf("Can't have more specials than total cards!\n");
             exit(-1);
         }
         columns = atoi(argv[4]);
@@ -41,11 +41,16 @@ main(argc, argv)
             printf("---",j);
         printf("\n");
 
-        for (i = 1; i < turns+1; i++) {
+        for (i = 1; i <= turns; i++) {
             printf("%2d   | ",i);
-            for (j = 0; (j < columns) && (j < i+MAXCOLS) && (j < special+1); j++)
-                printf("%2.2d ",(int)rint(hyper_prob(j,i+7,special,total)*100));
-            for (j = i+MAXCOLS; j < columns; j++)
+            for (j = 0; (j < columns) && (j < i + (BASEHAND+1)) && (j < special+1); j++)
+	    {
+		double p = hyper_prob(j, i + BASEHAND, special, total);
+
+                printf("%2.2d ",(int)rint(p * 100));
+	    }
+
+            for (j = i + (BASEHAND+1); j < columns; j++)
                 printf(" * ");
             printf("\n");
         }