extra-rand 0.1.4 → 0.2.0

package/README.md

@@ -37,10 +37,7 @@ function randomByWeight(weights: number[]): number
 
 The function returns an index of one of weights.
 
-### Map
-These low-level methods help you to use random number generators other than `Math.random()`.
-
-#### mapToRange
+### mapToRange
 ```ts
 function mapToRange(
   value: number
@@ -49,16 +46,9 @@ function mapToRange(
 ): number
 ```
 
-#### mapToIntRange
-```ts
-function mapToIntRange(
-  value: number
-, oldMin: number, oldMax: number
-, newMin: number, newMax: number
-): number
-```
+A low-level function helps you to use random number generators other than `Math.random()`.
 
-#### mapToIndexByWeight
+### mapToIndexByWeight
 ```ts
 function mapByWeight(
   value: number
@@ -66,3 +56,5 @@ function mapByWeight(
 , weights: number[]
 ): number
 ```
+
+A low-level function helps you to use random number generators other than `Math.random()`.

package/lib/index.d.ts

@@ -3,5 +3,4 @@ export * from './random-int';
 export * from './random-int-inclusive';
 export * from './random-by-weight';
 export * from './map-to-range';
-export * from './map-to-int-range';
 export * from './map-to-index-by-weight';

package/lib/index.js

@@ -19,6 +19,5 @@ __exportStar(require("./random-int"), exports);
 __exportStar(require("./random-int-inclusive"), exports);
 __exportStar(require("./random-by-weight"), exports);
 __exportStar(require("./map-to-range"), exports);
-__exportStar(require("./map-to-int-range"), exports);
 __exportStar(require("./map-to-index-by-weight"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,+CAA4B;AAC5B,yDAAsC;AACtC,qDAAkC;AAElC,iDAA8B;AAC9B,qDAAkC;AAClC,2DAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,+CAA4B;AAC5B,yDAAsC;AACtC,qDAAkC;AAElC,iDAA8B;AAC9B,2DAAwC"}

package/lib/map-to-index-by-weight.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapToIndexByWeight = void 0;
 const map_to_range_1 = require("./map-to-range");
-const map_to_int_range_1 = require("./map-to-int-range");
 function mapToIndexByWeight(value, oldMin, oldMax, weights) {
     const newMin = 0;
     const newMax = weights.reduce((acc, cur) => acc + Math.max(cur, 0));
     if (newMax === 0) {
-        const index = (0, map_to_int_range_1.mapToIntRange)(value, oldMin, oldMax, newMin, weights.length);
+        const index = Math.floor((0, map_to_range_1.mapToRange)(value, oldMin, oldMax, newMin, weights.length));
         return index === weights.length
             ? weights.length - 1
             : index;

package/lib/map-to-index-by-weight.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-to-index-by-weight.js","sourceRoot":"","sources":["../src/map-to-index-by-weight.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAC3C,yDAAkD;AAElD,SAAgB,kBAAkB,CAChC,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,OAAiB;IAEjB,MAAM,MAAM,GAAG,CAAC,CAAA;IAChB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IACnE,IAAI,MAAM,KAAK,CAAC,EAAE;QAEhB,MAAM,KAAK,GAAG,IAAA,gCAAa,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;QAE1E,OAAO,KAAK,KAAK,OAAO,CAAC,MAAM;YAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,KAAK,CAAA;KACb;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,yBAAU,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAElE,IAAI,OAAO,GAAG,MAAM,CAAA;QACpB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG;YACjC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,MAAM,IAAI,CAAC,EAAE;gBACf,SAAQ;aACT;iBAAM;gBACL,OAAO,IAAI,MAAM,CAAA;gBACjB,IAAI,QAAQ,IAAI,OAAO,EAAE;oBACvB,OAAO,CAAC,CAAA;iBACT;aACF;SACF;QAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;KACpC;AACH,CAAC;AAhCD,gDAgCC"}
+{"version":3,"file":"map-to-index-by-weight.js","sourceRoot":"","sources":["../src/map-to-index-by-weight.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAE3C,SAAgB,kBAAkB,CAChC,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,OAAiB;IAEjB,MAAM,MAAM,GAAG,CAAC,CAAA;IAChB,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAA;IACnE,IAAI,MAAM,KAAK,CAAC,EAAE;QAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;QAEnF,OAAO,KAAK,KAAK,OAAO,CAAC,MAAM;YAC1B,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,KAAK,CAAA;KACb;SAAM;QACL,MAAM,QAAQ,GAAG,IAAA,yBAAU,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAElE,IAAI,OAAO,GAAG,MAAM,CAAA;QACpB,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG;YACjC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACzB,IAAI,MAAM,IAAI,CAAC,EAAE;gBACf,SAAQ;aACT;iBAAM;gBACL,OAAO,IAAI,MAAM,CAAA;gBACjB,IAAI,QAAQ,IAAI,OAAO,EAAE;oBACvB,OAAO,CAAC,CAAA;iBACT;aACF;SACF;QAED,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;KACpC;AACH,CAAC;AAhCD,gDAgCC"}

package/lib/random-int-inclusive.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomIntInclusive = void 0;
-const map_to_int_range_1 = require("./map-to-int-range");
+const map_to_range_1 = require("./map-to-range");
 function randomIntInclusive(min, max) {
-    return (0, map_to_int_range_1.mapToIntRange)(Math.random(), 0, 1, Math.ceil(min), Math.floor(max) + 1);
+    return Math.floor((0, map_to_range_1.mapToRange)(Math.random(), 0, 1, Math.ceil(min), Math.floor(max) + 1));
 }
 exports.randomIntInclusive = randomIntInclusive;
 //# sourceMappingURL=random-int-inclusive.js.map

package/lib/random-int-inclusive.js.map

@@ -1 +1 @@
-{"version":3,"file":"random-int-inclusive.js","sourceRoot":"","sources":["../src/random-int-inclusive.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AAElD,SAAgB,kBAAkB,CAAC,GAAW,EAAE,GAAW;IACzD,OAAO,IAAA,gCAAa,EAClB,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CACpC,CAAA;AACH,CAAC;AAND,gDAMC"}
+{"version":3,"file":"random-int-inclusive.js","sourceRoot":"","sources":["../src/random-int-inclusive.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAE3C,SAAgB,kBAAkB,CAAC,GAAW,EAAE,GAAW;IACzD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAC1B,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CACpC,CAAC,CAAA;AACJ,CAAC;AAND,gDAMC"}

package/lib/random-int.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.randomInt = void 0;
-const map_to_int_range_1 = require("./map-to-int-range");
+const map_to_range_1 = require("./map-to-range");
 function randomInt(min, max) {
-    return (0, map_to_int_range_1.mapToIntRange)(Math.random(), 0, 1, Math.ceil(min), Math.floor(max));
+    return Math.floor((0, map_to_range_1.mapToRange)(Math.random(), 0, 1, Math.ceil(min), Math.floor(max)));
 }
 exports.randomInt = randomInt;
 //# sourceMappingURL=random-int.js.map

package/lib/random-int.js.map

@@ -1 +1 @@
-{"version":3,"file":"random-int.js","sourceRoot":"","sources":["../src/random-int.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AAElD,SAAgB,SAAS,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,IAAA,gCAAa,EAClB,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAChC,CAAA;AACH,CAAC;AAND,8BAMC"}
+{"version":3,"file":"random-int.js","sourceRoot":"","sources":["../src/random-int.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAE3C,SAAgB,SAAS,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAC1B,IAAI,CAAC,MAAM,EAAE,EACb,CAAC,EAAE,CAAC,EACJ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAChC,CAAC,CAAA;AACJ,CAAC;AAND,8BAMC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "extra-rand",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Yet another random library",
   "keywords": [
     "random"
   ],
   "files": [
-    "lib"
+    "lib",
+    "src"
   ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/index.ts

@@ -0,0 +1,7 @@
+export * from './random'
+export * from './random-int'
+export * from './random-int-inclusive'
+export * from './random-by-weight'
+
+export * from './map-to-range'
+export * from './map-to-index-by-weight'

package/src/map-to-index-by-weight.ts

@@ -0,0 +1,35 @@
+import { mapToRange } from './map-to-range'
+
+export function mapToIndexByWeight(
+  value: number
+, oldMin: number, oldMax: number
+, weights: number[]
+): number {
+  const newMin = 0
+  const newMax = weights.reduce((acc, cur) => acc + Math.max(cur, 0))
+  if (newMax === 0) {
+    // 只有在所有权重都小于等于0的情况下会进入此路径, 这时将所有权重都视为1.
+    const index = Math.floor(mapToRange(value, oldMin, oldMax, newMin, weights.length))
+
+    return index === weights.length
+         ? weights.length - 1
+         : index
+  } else {
+    const newValue = mapToRange(value, oldMin, oldMax, newMin, newMax)
+
+    let remains = newMax
+    for (let i = weights.length; i--;) {
+      const weight = weights[i]
+      if (weight <= 0) {
+        continue
+      } else {
+        remains -= weight
+        if (newValue >= remains) {
+          return i
+        }
+      }
+    }
+
+    throw new Error('Impossible route')
+  }
+}

package/src/map-to-range.ts

@@ -0,0 +1,9 @@
+export function mapToRange(
+  value: number
+, oldMin: number, oldMax: number
+, newMin: number, newMax: number
+): number {
+  return (value - oldMin) / (oldMax - oldMin)
+       * (newMax - newMin)
+       + newMin
+}

package/src/random-by-weight.ts

@@ -0,0 +1,9 @@
+import { mapToIndexByWeight } from './map-to-index-by-weight'
+
+export function randomByWeight(weights: number[]): number {
+  return mapToIndexByWeight(
+    Math.random()
+  , 0, 1
+  , weights
+  )
+}

package/src/random-int-inclusive.ts

@@ -0,0 +1,9 @@
+import { mapToRange } from './map-to-range'
+
+export function randomIntInclusive(min: number, max: number): number {
+  return Math.floor(mapToRange(
+    Math.random()
+  , 0, 1
+  , Math.ceil(min), Math.floor(max) + 1
+  ))
+}

package/src/random-int.ts

@@ -0,0 +1,9 @@
+import { mapToRange } from './map-to-range'
+
+export function randomInt(min: number, max: number): number {
+  return Math.floor(mapToRange(
+    Math.random()
+  , 0, 1
+  , Math.ceil(min), Math.floor(max)
+  ))
+}

package/src/random.ts

@@ -0,0 +1,9 @@
+import { mapToRange } from './map-to-range'
+
+export function random(min: number, max: number): number {
+  return mapToRange(
+    Math.random()
+  , 0, 1
+  , min, max
+  )
+}

package/lib/map-to-int-range.d.ts

@@ -1 +0,0 @@
-export declare function mapToIntRange(value: number, oldMin: number, oldMax: number, newMin: number, newMax: number): number;

package/lib/map-to-int-range.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapToIntRange = void 0;
-const map_to_range_1 = require("./map-to-range");
-function mapToIntRange(value, oldMin, oldMax, newMin, newMax) {
-    return Math.floor((0, map_to_range_1.mapToRange)(value, oldMin, oldMax, newMin, newMax));
-}
-exports.mapToIntRange = mapToIntRange;
-//# sourceMappingURL=map-to-int-range.js.map

package/lib/map-to-int-range.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"map-to-int-range.js","sourceRoot":"","sources":["../src/map-to-int-range.ts"],"names":[],"mappings":";;;AAAA,iDAA2C;AAE3C,SAAgB,aAAa,CAC3B,KAAa,EACb,MAAc,EAAE,MAAc,EAC9B,MAAc,EAAE,MAAc;IAE9B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,yBAAU,EAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AACtE,CAAC;AAND,sCAMC"}