Change the convergence check of eigenJacobi (#930)

* Change the convergence check of eigenJacobi

* Extend timeout period of MDS test

Author: ishii-norimi

lib/util/matrix.js

@@ -4819,8 +4819,9 @@ export default class Matrix {
 		const P = Matrix.eye(this.rows, this.cols)
 		P.add(0)
 		const tol = 1.0e-15
-		let lastMaxValue = 0
+		const recentMaxValues = [0]
 		const n = this.rows
+		const length = this.length
 		let maxCount = maxIteration
 		while (1) {
 			let maxValue = 0
@@ -4838,13 +4839,19 @@ export default class Matrix {
 			}
 			if (maxValue < tol) {
 				break
-			} else if (maxValue === lastMaxValue) {
-				break
 			} else if (maxCount-- < 0) {
 				console.log(new MatrixException('eigenJacobi not converged.', [this, maxValue]))
 				break
 			}
-			lastMaxValue = maxValue
+			if (maxIteration - maxCount > length / 2 && recentMaxValues.length >= 12) {
+				const avg = recentMaxValues.reduce((s, v) => s + v, 0)
+				const navg = avg - recentMaxValues.pop() + maxValue
+				if (Math.abs(avg - navg) / recentMaxValues.length < tol) {
+					break
+				}
+				recentMaxValues.pop()
+			}
+			recentMaxValues.unshift(maxValue)
 			const app = a[p * n + p]
 			const apq = a[p * n + q]
 			const aqq = a[q * n + q]

tests/gui/view/mds.test.js

@@ -38,5 +38,5 @@ describe('dimensionality reduction', () => {
 		await svg.waitForSelector('.tile circle')
 		const circles = await svg.$$('.tile circle')
 		expect(circles).toHaveLength(300)
-	})
+	}, 60000)
 })

tests/lib/util/matrix.test.js

@@ -73,7 +73,7 @@ describe('Matrix', () => {
 				}
 			}
 		})
-		
+
 		test('array', () => {
 			const mat = Matrix.zeros([2, 3])
 			for (let i = 0; i < 2; i++) {
@@ -93,7 +93,7 @@ describe('Matrix', () => {
 				}
 			}
 		})
-		
+
 		test('array', () => {
 			const mat = Matrix.ones([2, 3])
 			for (let i = 0; i < 2; i++) {
@@ -7236,7 +7236,6 @@ describe('Matrix', () => {
 			let orgLog
 			beforeAll(() => {
 				orgLog = console.log
-				console.log = jest.fn()
 			})
 
 			afterAll(() => {