Improve math.js

Author: ishii-norimi

lib/model/label_propagation.js

@@ -46,7 +46,7 @@ export default class LabelPropagation {
 		}
 
 		if (this._affinity === 'rbf') {
-			return distances.copyMap((v, i) => (con.at(...i) > 0 ? Math.exp(-(v ** 2) / this._sigma ** 2) : 0))
+			return distances.copyMap((v, i) => (con.at(i) > 0 ? Math.exp(-(v ** 2) / this._sigma ** 2) : 0))
 		} else if (this._affinity === 'knn') {
 			return con.copyMap(v => (v > 0 ? 1 : 0))
 		}

lib/model/label_spreading.js

@@ -47,7 +47,7 @@ export default class LabelSpreading {
 		}
 
 		if (this._affinity === 'rbf') {
-			return distances.copyMap((v, i) => (con.at(...i) > 0 ? Math.exp(-(v ** 2) / this._sigma ** 2) : 0))
+			return distances.copyMap((v, i) => (con.at(i) > 0 ? Math.exp(-(v ** 2) / this._sigma ** 2) : 0))
 		} else if (this._affinity === 'knn') {
 			return con.copyMap(v => (v > 0 ? 1 : 0))
 		}

lib/model/laplacian_eigenmaps.js

@@ -54,7 +54,7 @@ export class LaplacianEigenmaps {
 
 		let W
 		if (this._affinity === 'rbf') {
-			W = distances.copyMap((v, i) => (con.at(...i) > 0 ? Math.exp(-(v ** 2) / this._sigma ** 2) : 0))
+			W = distances.copyMap((v, i) => (con.at(i) > 0 ? Math.exp(-(v ** 2) / this._sigma ** 2) : 0))
 		} else if (this._affinity === 'knn') {
 			W = con.copyMap(v => (v > 0 ? 1 : 0))
 		}

lib/model/layer/base.js

@@ -57,17 +57,17 @@ export default class Layer {
 
 	/**
 	 * Returns calculated values.
-	 * @param {Matrix | Tensor} x
+	 * @param {...(Matrix | Tensor)} x
 	 */
-	calc(x) {
+	calc(...x) {
 		throw new NeuralnetworkException('Not impleneted', this)
 	}
 
 	/**
 	 * Returns gradient values.
-	 * @param {Matrix | Tensor} bo
+	 * @param {...(Matrix | Tensor)} bo
 	 */
-	grad(bo) {
+	grad(...bo) {
 		throw new NeuralnetworkException('Not impleneted', this)
 	}
 

lib/model/layer/cond.js

@@ -7,13 +7,13 @@ export default class CondLayer extends Layer {
 		const t = x[1]
 		const f = x[2]
 		this._o = new Matrix(this._cond.rows, this._cond.cols)
-		this._o.map((v, i) => (this._cond.at(...i) ? t.at(...i) : f.at(...i)))
+		this._o.map((v, i) => (this._cond.at(i) ? t.at(i) : f.at(i)))
 		return this._o
 	}
 
 	grad(bo) {
 		const bi = [null, bo.copy(), bo.copy()]
-		this._cond.forEach((v, i) => (v ? bi[2].set(...i, 0) : bi[1].set(...i, 0)))
+		this._cond.forEach((v, i) => (v ? bi[2].set(i, 0) : bi[1].set(i, 0)))
 		return bi
 	}
 }

lib/model/layer/huber.js

@@ -15,14 +15,14 @@ export default class HuberLayer extends LossLayer {
 			err.cols,
 			err.value.map(v => v < 1.0)
 		)
-		err.map((v, i) => (this._cond.at(...i) ? 0.5 * v * v : v - 0.5))
+		err.map((v, i) => (this._cond.at(i) ? 0.5 * v * v : v - 0.5))
 		return new Matrix(1, 1, err.sum())
 	}
 
 	grad() {
 		this._bi = this._cond.copy()
 		this._bi.map((c, i) =>
-			c ? this._i.at(...i) - this._t.at(...i) : Math.sign(this._i.at(...i) - this._t.at(...i))
+			c ? this._i.at(i) - this._t.at(i) : Math.sign(this._i.at(i) - this._t.at(i))
 		)
 		return this._bi
 	}

lib/model/polynomial_histogram.js

@@ -77,7 +77,7 @@ export default class PolynomialHistogram {
 				})
 				this._a[0] = b.copy()
 				this._a[0].map((v, i) => {
-					const a = (4 + 5 * this._d) / 4 - (15 / this._h ** 2) * s2.at(...i).trace()
+					const a = (4 + 5 * this._d) / 4 - (15 / this._h ** 2) * s2.at(i).trace()
 					return (a * v) / x.length / this._h ** this._d
 				})
 				this._a[1] = b.copy()
@@ -101,7 +101,7 @@ export default class PolynomialHistogram {
 							}
 						}
 					}
-					v.mult(b.at(...i) / x.length / this._h ** (this._d + 2))
+					v.mult(b.at(i) / x.length / this._h ** (this._d + 2))
 					return v
 				})
 			}
@@ -130,7 +130,7 @@ export default class PolynomialHistogram {
 				p.push(0)
 				continue
 			}
-			const a = this._a.map(v => v.at(...idx))
+			const a = this._a.map(v => v.at(idx))
 			const xi = Matrix.fromArray(x[i])
 			const m = Matrix.fromArray(this._ranges.map((r, k) => (r[idx[k] + 1] + r[idx[k]]) / 2))
 			xi.sub(m)

lib/util/math.js

@@ -528,6 +528,9 @@ export class Tensor {
 	 * @returns {number | Tensor}
 	 */
 	at(...i) {
+		if (Array.isArray(i[0])) {
+			i = i[0]
+		}
 		if (i.length === this.dimension) {
 			return this._value[this._to_position(...i)]
 		}
@@ -986,23 +989,30 @@ export class Matrix {
 
 	/**
 	 * Returns a value at the position.
-	 * @param  {number} r
-	 * @param  {number} c
+	 * @param  {number | [number, number]} r
+	 * @param  {?number} c
 	 * @returns {number}
 	 */
 	at(r, c) {
+		if (Array.isArray(r)) {
+			;[r, c] = r
+		}
 		if (r < 0 || this.rows <= r || c < 0 || this.cols <= c) throw new MatrixException('Index out of bounds.')
 		return this._value[r * this.cols + c]
 	}
 
 	/**
 	 * Set a value at the position.
-	 * @param  {number} r
-	 * @param  {number} c
-	 * @param  {number | Matrix} value
+	 * @param  {number | [number, number]} r If this value is an array, the next argument should be the value to be set
+	 * @param  {number | Matrix} c
+	 * @param  {?(number | Matrix)} value
 	 * @returns {?number} Old value
 	 */
 	set(r, c, value) {
+		if (Array.isArray(r)) {
+			value = c
+			;[r, c] = r
+		}
 		if (value instanceof Matrix) {
 			if (r < 0 || this.rows <= r + value.rows - 1 || c < 0 || this.cols <= c + value.cols - 1)
 				throw new MatrixException('Index out of bounds.')