Merge branch 'master' of tronto.net:h48

1 files changed, 66 insertions, 1 deletions

diff --git a/tools/expected_distributions.h b/tools/expected_distributions.h
index 0f3fec3..202edf9 100644
--- a/tools/expected_distributions.h
+++ b/tools/expected_distributions.h
@@ -43,6 +43,71 @@ uint64_t expected_h48[12][9][21] = {
                         [3] = 41281787,
                 },
         },
+        [2] = {
+                [2] = {
+                        [0] = 6391286,
+                        [1] = 55494785,
+                        [2] = 252389935,
+                        [3] = 155993794,
+                },
+        },
+        [3] = {
+                [2] = {
+                        [0] = 6686828,
+                        [1] = 63867852,
+                        [2] = 392789689,
+                        [3] = 477195231,
+                },
+
+        },
+        [4] = {
+                [2] = {
+                        [0] = 77147213,
+                        [1] = 543379415,
+                        [2] = 1139570251,
+                        [3] = 120982321,
+                },
+        },
+        [5] = {
+                [2] = {
+                        [0] = 82471284,
+                        [1] = 687850732,
+                        [2] = 2345840746,
+                        [3] = 645995638,
+                },
+        },
+        [6] = {
+                [2] = {
+                        [0] = 85941099,
+                        [1] = 804752968,
+                        [2] = 4077248182,
+                        [3] = 2556374551,
+                },
+        },
+        [7] = {
+                [2] = {
+                        [0] = 88529761,
+                        [1] = 897323475,
+                        [2] = 6126260791,
+                        [3] = 7936519573,
+                },
+        },
+        [8] = {
+                /* Unknown */
+                [2] = {0},
+        },
+        [9] = {
+                /* Unknown */
+                [2] = {0},
+        },
+        [10] = {
+                /* Unknown */
+                [2] = {0},
+        },
+        [11] = {
+                /* Unknown */
+                [2] = {0},
+        },
 };
 
 static bool
@@ -82,7 +147,7 @@ unknown_h48(uint8_t h, uint8_t k)
         if (k == 4 && h != 0)
                 return true;
 
-        return k == 2 && h > 1;
+        return k == 2 && h > 7;
 }
 
 STATIC bool