Changed to a different method of generating arrays using binary numbers (#753)

Author: ishii-norimi

lib/model/bayesian_network.js

@@ -120,17 +120,13 @@ export default class BayesianNetwork {
 		for (let i = 0; i < this._n; i++) {
 			localScores[i] = new ArrayKeyMap()
 			bpss[i] = new ArrayKeyMap()
-			for (let k = 0; k < 2 ** (this._n - 1); k++) {
-				const p = k
-					.toString(2)
-					.padStart(this._n - 1, '0')
-					.split('')
-				p.splice(i, 0, '1')
-				const key = p.map(v => +v)
-				const c = p
-					.map((v, j) => [v, j])
-					.filter(v => v[0] === '1')
-					.map(v => v[1])
+			const key = Array(this._n).fill(0)
+			key[i] = 1
+			do {
+				const c = []
+				for (let j = 0; j < this._n; j++) {
+					if (key[j]) c.push(j)
+				}
 				const xi = x.map(r => c.map(idx => r[idx]))
 				const cand = c.map(idx => this._cand[idx])
 				const g = []
@@ -144,9 +140,9 @@ export default class BayesianNetwork {
 					}
 				}
 				const score = this._score(xi, g, cand)
-				localScores[i].set(key, score)
+				localScores[i].set(key.concat(), score)
 
-				let bps = [key, score]
+				let bps = [key.concat(), score]
 				for (let d = 0; d < key.length; d++) {
 					if (key[d] === 0) {
 						continue
@@ -161,17 +157,22 @@ export default class BayesianNetwork {
 						bps = bscore
 					}
 				}
-				bpss[i].set(key, bps)
-			}
+				bpss[i].set(key.concat(), bps)
+				for (let j = this._n - 1; j >= 0; j--) {
+					if (i === j) continue
+					if (!key[j]) {
+						key[j] = 1
+						break
+					}
+					key[j] = 0
+				}
+			} while (key.some((v, j) => j !== i && v === 1))
 		}
 
 		const sinkScores = new ArrayKeyMap()
-		for (let k = 1; k < 2 ** this._n; k++) {
-			const key = k
-				.toString(2)
-				.padStart(this._n, '0')
-				.split('')
-				.map(v => +v)
+		const key = Array(this._n).fill(0)
+		key[this._n - 1] = 1
+		do {
 			const m = key.reduce((s, v) => s + v, 0)
 			let sink = [null, -Infinity]
 			for (let i = 0; i < bpss.length; i++) {
@@ -189,8 +190,15 @@ export default class BayesianNetwork {
 				}
 			}
 
-			sinkScores.set(key, sink)
-		}
+			sinkScores.set(key.concat(), sink)
+			for (let j = this._n - 1; j >= 0; j--) {
+				if (!key[j]) {
+					key[j] = 1
+					break
+				}
+				key[j] = 0
+			}
+		} while (key.some(v => v === 1))
 
 		const v = Array(this._n).fill(1)
 		const order = []

lib/model/n_linear_interpolation.js

@@ -15,9 +15,17 @@ export default class NLinearInterpolation {
 		this._grids = grids
 
 		this._offset_idx = []
-		for (let k = 0; k < 2 ** this._grids.length; k++) {
-			this._offset_idx.push(k.toString(2).padStart(this._grids.length, '0').split(''))
-		}
+		const idx = Array(this._grids.length).fill(0)
+		do {
+			this._offset_idx.push(idx.concat())
+			for (let i = idx.length - 1; i >= 0; i--) {
+				if (!idx[i]) {
+					idx[i] = 1
+					break
+				}
+				idx[i] = 0
+			}
+		} while (idx.some(v => v === 1))
 	}
 
 	/**
@@ -37,7 +45,7 @@ export default class NLinearInterpolation {
 				for (let i = 0; i < this._grids[d].length && t[d] >= this._grids[d][i]; k = i++);
 				i[d] = k === this._grids[d].length - 1 ? k - 1 : k
 			}
-			const values = this._offset_idx.map(off => off.reduce((v, f, d) => v[i[d] + +f], this._v))
+			const values = this._offset_idx.map(off => off.reduce((v, f, d) => v[i[d] + f], this._v))
 
 			for (let d = 0; d < this._grids.length; d++) {
 				const v1 = this._grids[d][i[d]]

lib/model/split_merge.js

@@ -67,14 +67,17 @@ export default class SplitAndMerge {
 				const n = range.map(r => r[1] - r[0])
 				const c = n.map(v => Math.floor(v / 2))
 				const r = []
-				for (let i = 0; i < 2 ** n.length; i++) {
-					const p = i
-						.toString(2)
-						.padStart(n.length, '0')
-						.split('')
-						.map(v => !!+v)
+				const p = Array(n.length).fill(false)
+				do {
 					r.push(p.map((v, i) => (v ? [0, c[i]] : [c[i], n[i]])))
-				}
+					for (let i = 0; i < p.length; i++) {
+						if (!p[i]) {
+							p[i] = true
+							break
+						}
+						p[i] = false
+					}
+				} while (p.some(v => v))
 
 				for (const [r1, r2] of r) {
 					const d = []