Remove deprecated functions

dingosky · dingosky · commit 2135d4e9aa71 · 2018-03-28T12:03:11.000-07:00
diff --git a/lib/entropy.js b/lib/entropy.js
@@ -1,42 +1,17 @@
-const { log2 } = Math
-const LOG2_OF_10 = log2(10)
-
-const totalOf = (numStrings, log2Risk) => {
-  if (numStrings === 0) { return 0 }
-
-  let N
-  if (numStrings < 1000) {
-    N = log2(numStrings) + log2(numStrings - 1)
-  } else {
-    N = 2 * log2(numStrings)
-  }
-  return (N + log2Risk) - 1
-}
-
 const bits = (total, risk) => {
   if (total === 0) { return 0 }
-  return totalOf(total, log2(risk))
-}
 
-// CxTBD Mark as obsolete
-const bitsWithRiskPower = (total, rPower) => {
-  const log2Risk = LOG2_OF_10 * rPower
-  return totalOf(total, log2Risk)
-}
+  const { log2 } = Math
 
-// CxTBD Mark as obsolete
-const bitsWithPowers = (tPower, rPower) => {
-  let nBits
-  if (tPower < 4) {
-    nBits = bitsWithRiskPower(10 ** tPower, rPower)
+  let N
+  if (total < 1000) {
+    N = log2(total) + log2(total - 1)
   } else {
-    nBits = ((((2 * tPower) + rPower) * LOG2_OF_10) - 1)
+    N = 2 * log2(total)
   }
-  return nBits
+  return (N + log2(risk)) - 1
 }
 
 export default {
-  bits,
-  bitsWithRiskPower,
-  bitsWithPowers
+  bits
 }
diff --git a/test/entropy.js b/test/entropy.js
@@ -29,51 +29,6 @@ test('Bits using total, risk', (t) => {
   t.is(round(Entropy.bits(100000, 100000)), 49)
 })
 
-// CxTBD Remove bitsWithRiskPower in next release
-test('Bits using total, risk power', (t) => {
-  t.is(round(Entropy.bitsWithRiskPower(10, 3)), 15)
-  t.is(round(Entropy.bitsWithRiskPower(10, 4)), 19)
-  t.is(round(Entropy.bitsWithRiskPower(10, 5)), 22)
-
-  t.is(round(Entropy.bitsWithRiskPower(100, 3)), 22)
-  t.is(round(Entropy.bitsWithRiskPower(100, 4)), 26)
-  t.is(round(Entropy.bitsWithRiskPower(100, 5)), 29)
-
-  t.is(round(Entropy.bitsWithRiskPower(1000, 3)), 29)
-  t.is(round(Entropy.bitsWithRiskPower(1000, 4)), 32)
-  t.is(round(Entropy.bitsWithRiskPower(1000, 5)), 36)
-  t.is(round(Entropy.bitsWithRiskPower(10000, 3)), 36)
-  t.is(round(Entropy.bitsWithRiskPower(10000, 4)), 39)
-  t.is(round(Entropy.bitsWithRiskPower(10000, 5)), 42)
-
-  t.is(round(Entropy.bitsWithRiskPower(100000, 3)), 42)
-  t.is(round(Entropy.bitsWithRiskPower(100000, 4)), 46)
-  t.is(round(Entropy.bitsWithRiskPower(100000, 5)), 49)
-})
-
-// CxTBD Remove bitsWithPowers in next release
-test('Bits using total power, risk power', (t) => {
-  t.is(round(Entropy.bitsWithPowers(1, 3)), 15)
-  t.is(round(Entropy.bitsWithPowers(1, 4)), 19)
-  t.is(round(Entropy.bitsWithPowers(1, 5)), 22)
-
-  t.is(round(Entropy.bitsWithPowers(2, 3)), 22)
-  t.is(round(Entropy.bitsWithPowers(2, 4)), 26)
-  t.is(round(Entropy.bitsWithPowers(2, 5)), 29)
-
-  t.is(round(Entropy.bitsWithPowers(3, 3)), 29)
-  t.is(round(Entropy.bitsWithPowers(3, 4)), 32)
-  t.is(round(Entropy.bitsWithPowers(3, 5)), 36)
-
-  t.is(round(Entropy.bitsWithPowers(4, 3)), 36)
-  t.is(round(Entropy.bitsWithPowers(4, 4)), 39)
-  t.is(round(Entropy.bitsWithPowers(4, 5)), 42)
-
-  t.is(round(Entropy.bitsWithPowers(5, 3)), 42)
-  t.is(round(Entropy.bitsWithPowers(5, 4)), 46)
-  t.is(round(Entropy.bitsWithPowers(5, 5)), 49)
-})
-
 // preshing.com tests come from table at http://preshing.com/20110504/hash-collision-probabilities/
 test('preshing.com, 32-bit column', (t) => {
   t.is(round(Entropy.bits(30084, 10)), 32)
