From ac31b561f664eef0b04b466834482caafd244081 Mon Sep 17 00:00:00 2001 From: "lee.hungyu" Date: Tue, 27 Jun 2023 16:33:45 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B0=B0=EC=97=B4=EC=9D=B4=20=ED=95=98?= =?UTF-8?q?=EB=82=98=EC=94=A9=20=EB=B0=80=EB=A0=A4=20=EC=9E=98=EB=AA=BB?= =?UTF-8?q?=EB=90=9C=20=EA=B2=B0=EA=B3=BC=EA=B0=92=EC=9D=B4=20=EB=B3=B4?= =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/class/source/DataTableSource.js | 6 +++++- src/playground/blocks/block_analysis.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/class/source/DataTableSource.js b/src/class/source/DataTableSource.js index ddc01edcb6..4ce5932aca 100644 --- a/src/class/source/DataTableSource.js +++ b/src/class/source/DataTableSource.js @@ -317,7 +317,11 @@ class DataTableSource { } getCoefficient(colX, colY) { - return corr(...getColumns(this.rows, [colY, colX])); + const result = corr(...getColumns(this.rows, [colY, colX])); + if (isNaN(result)) { + return 0; + } + return result; } clone() { diff --git a/src/playground/blocks/block_analysis.js b/src/playground/blocks/block_analysis.js index 9b01da483c..12f8af84ca 100644 --- a/src/playground/blocks/block_analysis.js +++ b/src/playground/blocks/block_analysis.js @@ -1035,7 +1035,7 @@ module.exports = { const x = DataTable.getColumnIndex(script.getValue('FIELD1', script)); const y = DataTable.getColumnIndex(script.getValue('FIELD2', script)); const table = DataTable.getSource(tableId, sprite); - return table.getCoefficient(x, y); + return table.getCoefficient(x - 1, y - 1); }, syntax: { js: [], From 990e00ede0a9058b19ebed04eb00a7ff435d635b Mon Sep 17 00:00:00 2001 From: "lee.hungyu" Date: Tue, 27 Jun 2023 16:35:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=EC=8B=9C=20NaN=EC=9C=BC=EB=A1=9C=20=EB=B3=B4=EC=9D=B4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=A0=81=EC=9A=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/class/source/DataTableSource.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/class/source/DataTableSource.js b/src/class/source/DataTableSource.js index 4ce5932aca..ddc01edcb6 100644 --- a/src/class/source/DataTableSource.js +++ b/src/class/source/DataTableSource.js @@ -317,11 +317,7 @@ class DataTableSource { } getCoefficient(colX, colY) { - const result = corr(...getColumns(this.rows, [colY, colX])); - if (isNaN(result)) { - return 0; - } - return result; + return corr(...getColumns(this.rows, [colY, colX])); } clone() {