Fix train output data of passing_bablok (#807)

Author: ishii-norimi

js/view/passing_bablok.js

@@ -1,26 +1,20 @@
 import PassingBablok from '../../lib/model/passing_bablok.js'
+import Controller from '../controller.js'
 
-var dispPB = function (elm, platform) {
-	const fitModel = cb => {
-		const dim = platform.datas.dimension
+export default function (platform) {
+	platform.setting.ml.usage = 'Click and add data point. Next, click "Fit" button.'
+	platform.setting.ml.require = {
+		dimension: 1,
+	}
+	const controller = new Controller(platform)
+	const fitModel = () => {
 		const model = new PassingBablok()
 		model.fit(
 			platform.trainInput.map(v => v[0]),
-			platform.trainInput.map(v => v[0])
+			platform.trainOutput.map(v => v[0])
 		)
 		platform.testResult(model.predict(platform.testInput(1).map(v => v[0])))
 	}
 
-	elm.append('input')
-		.attr('type', 'button')
-		.attr('value', 'Fit')
-		.on('click', () => fitModel())
-}
-
-export default function (platform) {
-	platform.setting.ml.usage = 'Click and add data point. Next, click "Fit" button.'
-	platform.setting.ml.require = {
-		dimension: 1,
-	}
-	dispPB(platform.setting.ml.configElement, platform)
+	controller.input.button('Fit').on('click', fitModel)
 }

tests/gui/view/passing_bablok.test.js

@@ -0,0 +1,41 @@
+import { getPage } from '../helper/browser'
+
+describe('regression', () => {
+	/** @type {Awaited<ReturnType<getPage>>} */
+	let page
+	beforeEach(async () => {
+		page = await getPage()
+	})
+
+	afterEach(async () => {
+		await page?.close()
+	})
+
+	// eslint-disable-next-line jest/expect-expect
+	test('initialize', async () => {
+		const taskSelectBox = await page.waitForSelector('#ml_selector dl:first-child dd:nth-child(5) select')
+		await taskSelectBox.selectOption('RG')
+		const modelSelectBox = await page.waitForSelector('#ml_selector .model_selection #mlDisp')
+		await modelSelectBox.selectOption('passing_bablok')
+		const methodMenu = await page.waitForSelector('#ml_selector #method_menu')
+		const buttons = await methodMenu.waitForSelector('.buttons')
+
+		await buttons.waitForSelector('input[value=Fit]')
+	})
+
+	test('learn', async () => {
+		const taskSelectBox = await page.waitForSelector('#ml_selector dl:first-child dd:nth-child(5) select')
+		await taskSelectBox.selectOption('RG')
+		const modelSelectBox = await page.waitForSelector('#ml_selector .model_selection #mlDisp')
+		await modelSelectBox.selectOption('passing_bablok')
+		const methodMenu = await page.waitForSelector('#ml_selector #method_menu')
+		const buttons = await methodMenu.waitForSelector('.buttons')
+
+		const fitButton = await buttons.waitForSelector('input[value=Fit]')
+		await fitButton.evaluate(el => el.click())
+
+		const svg = await page.waitForSelector('#plot-area svg')
+		await svg.waitForSelector('.tile-render image')
+		expect((await svg.$$('.tile-render image')).length).toBeGreaterThan(0)
+	})
+})