Converted to display percentages.

diff --git a/deal.c b/deal.c
index 25e3e065204a2d162d2cdd302d55b359a7daf932..eda4fc97e8a3529f73fb7fadc9750840cf79d13f 100644 (file)
--- a/deal.c
+++ b/deal.c
@@ -1,5 +1,7 @@
 #include <math.h>
 
+#define MAXCOLS        8
+
 main(argc, argv)
     int argc;
     char **argv;
@@ -22,25 +24,29 @@ main(argc, argv)
         }
         columns = atoi(argv[4]);
         if (columns > special-1) {
-            printf("using %d columns because can only have\n",special+1);
+            printf("using %d columns because can only have ",special+1);
             printf("0 to %d specials\n",special);
             columns = special+1;
         }
                 
         printf("%d special cards out of %d total; %d turns, %d columns\n",special,total,turns,columns);
 
-        printf("       |  Prob of this number of specials\n");
-        printf("Turn # | ");
+        printf("     |  %% chance of this number of specials\n");
+        printf("Turn | ");
+        for (j = 0; j < columns; j++)
+            printf("%2d ",j);
+        printf("\n");
+        printf("-----+");
         for (j = 0; j < columns; j++)
-            printf("  %2d   ",j);
+            printf("---",j);
         printf("\n");
 
         for (i = 1; i < turns+1; i++) {
-            printf("%2d     | ",i);
-            for (j = 0; (j < columns) && (j < i+8) && (j < special+1); j++)
-                printf("%5.4f ",hyper_prob(j,i+7,special,total));
-            for (j= i+8; j < columns; j++)
-                printf("   *   ");
+            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++)
+                printf(" * ");
             printf("\n");
         }
     }