Skip to content

Commit 3f61d15

Browse files
authored
Merge pull request #2501 from entrylabs/issue/6258
issue/6258
2 parents f1848e5 + e621bdc commit 3f61d15

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

src/class/learning/Cluster.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { kmpp } from 'skmeans/kinit';
22
// import { kmpp } from 'skmeans/dist/node/kinit';
33
import floor from 'lodash/floor';
44
import _toNumber from 'lodash/toNumber';
5+
import _isNaN from 'lodash/isNaN';
56
import LearningView from './LearningView';
67
import Chart from './Chart';
78
import DataTable from '../DataTable';
@@ -155,7 +156,7 @@ class Cluster {
155156
this.#isTrained = false;
156157
const { data, select } = this.#table;
157158
const filtered = data.filter(
158-
(row) => !select.flat().some((selected) => !_toNumber(row[selected]))
159+
(row) => !select.flat().some((selected) => _isNaN(_toNumber(row[selected])))
159160
);
160161
const [attr] = select;
161162

src/class/learning/DecisionTree.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import _max from 'lodash/max';
44
import _sum from 'lodash/sum';
55
import _mean from 'lodash/mean';
66
import _toNumber from 'lodash/toNumber';
7+
import _isNaN from 'lodash/isNaN';
78
import LearningBase from './LearningBase';
89
import { DecisionTreeClassifier as DTClassifier } from 'ml-cart';
910
import Utils from './Utils';
@@ -159,7 +160,7 @@ function getData(testRate = 0.2, data) {
159160
const { select = [[0], [1]], data: table, fields } = data;
160161
const [attr, predict] = select;
161162
const filtered = table.filter(
162-
(row) => !select[0].some((selected) => !_toNumber(row[selected]))
163+
(row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
163164
);
164165
const dataArray = filtered
165166
.map((row) => ({

src/class/learning/LearningView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const STATUS = {
1515

1616
export default class LearningView {
1717
constructor({ name = 'model name', status = STATUS.NO_MODEL, value = 0} = {}) {
18-
this.id = Entry.generateHash();
18+
this.id = Entry.generateHash();
1919
this.visible = true;
2020
this.value = value;
2121
const fontFamily = EntryStatic.fontFamily || 'NanumGothic';

src/class/learning/LogisticRegression.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import _max from 'lodash/max';
44
import _sum from 'lodash/sum';
55
import _mean from 'lodash/mean';
66
import _toNumber from 'lodash/toNumber';
7+
import _isNaN from 'lodash/isNaN';
78
import LearningBase from './LearningBase';
89
import Utils from './Utils';
910

@@ -184,7 +185,7 @@ function getData(validationRate, testRate, data, trainParam) {
184185
const { select = [[0], [1]], data: table, fields } = data;
185186
const [attr, predict] = select;
186187
const filtered = table.filter(
187-
(row) => !select[0].some((selected) => !_toNumber(row[selected]))
188+
(row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
188189
);
189190
const dataArray = filtered
190191
.map((row) => ({

src/class/learning/NumberClassification.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import _floor from 'lodash/floor';
66
import _sum from 'lodash/sum';
77
import _mean from 'lodash/mean';
88
import _toNumber from 'lodash/toNumber';
9+
import _isNaN from 'lodash/isNaN';
910
import DataTable from '../DataTable';
1011

1112
export const classes = [
@@ -334,7 +335,7 @@ function convertTableToKnnData(tableData = {}) {
334335
const { select = [[0], [1]], data: table = [] } = tableData;
335336
const [attr, predict] = select;
336337
const filtered = table.filter(
337-
(row) => !select[0].some((selected) => !_toNumber(row[selected]))
338+
(row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
338339
);
339340
return filtered.reduce(
340341
(accumulator, row) => {

src/class/learning/Regression.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Chart from './Chart';
55
import _sum from 'lodash/sum';
66
import _mean from 'lodash/mean';
77
import _toNumber from 'lodash/toNumber';
8+
import _isNaN from 'lodash/isNaN';
89
import LearningBase from './LearningBase';
910
import Utils from './Utils';
1011

@@ -224,7 +225,7 @@ function convertToTfData(data, trainParam) {
224225
const [attr, predict] = select;
225226
const { epochs = 1, batchSize = 1 } = trainParam;
226227
const filtered = table.filter(
227-
(row) => !select.flat().some((selected) => !_toNumber(row[selected]))
228+
(row) => !select.flat().some((selected) => _isNaN(_toNumber(row[selected])))
228229
);
229230
const totalDataSize = Math.ceil(filtered.length / batchSize) * epochs;
230231
return filtered.reduce(

src/class/learning/Svm.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import _max from 'lodash/max';
44
import _sum from 'lodash/sum';
55
import _mean from 'lodash/mean';
66
import _toNumber from 'lodash/toNumber';
7+
import _isNaN from 'lodash/isNaN';
78
import Utils from './Utils';
89
const { callApi } = require('../../util/common');
910
const SVM = require('libsvm-js/asm');
@@ -168,7 +169,7 @@ class Svm extends LearningBase {
168169
const { select = [[0], [1]], data: table, fields } = data;
169170
const [attr, predict] = select;
170171
const filtered = table.filter(
171-
(row) => !select[0].some((selected) => !_toNumber(row[selected]))
172+
(row) => !select[0].some((selected) => _isNaN(_toNumber(row[selected])))
172173
);
173174
const dataArray = filtered
174175
.map((row) => ({

0 commit comments

Comments
 (0)