xy-scale 1.4.38 → 1.4.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/datasets.js +33 -21
- package/src/validators.js +1 -1
package/package.json
CHANGED
package/src/datasets.js
CHANGED
|
@@ -243,24 +243,30 @@ export const parseTrainingXY = ({
|
|
|
243
243
|
let Y = [];
|
|
244
244
|
const sourceIndexes = [];
|
|
245
245
|
|
|
246
|
-
validateArray(arrObj, { min:
|
|
246
|
+
validateArray(arrObj, { min: 2 }, 'parseTrainingXY');
|
|
247
247
|
validateFirstRow(arrObj[0]);
|
|
248
248
|
|
|
249
249
|
for (let x = 0; x < arrObj.length; x++) {
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
250
|
+
|
|
251
|
+
try {
|
|
252
|
+
if (!validateRows({ objRow: arrObj, index: x, state })) continue;
|
|
253
|
+
|
|
254
|
+
const parsedX = xCallbackFunc({ objRow: arrObj, index: x, state });
|
|
255
|
+
const parsedY = yCallbackFunc({ objRow: arrObj, index: x, state });
|
|
256
|
+
|
|
257
|
+
if (
|
|
258
|
+
typeof parsedX !== 'undefined' &&
|
|
259
|
+
parsedX !== null &&
|
|
260
|
+
typeof parsedY !== 'undefined' &&
|
|
261
|
+
parsedY !== null
|
|
262
|
+
) {
|
|
263
|
+
X.push(parsedX);
|
|
264
|
+
Y.push(parsedY);
|
|
265
|
+
sourceIndexes.push(x);
|
|
266
|
+
}
|
|
267
|
+
} catch(err) {
|
|
268
|
+
console.error(`[BUG] - Skipped row index=${x}: ${err.message}`)
|
|
269
|
+
continue
|
|
264
270
|
}
|
|
265
271
|
}
|
|
266
272
|
|
|
@@ -416,7 +422,7 @@ export const parseProductionX = ({
|
|
|
416
422
|
let X = [];
|
|
417
423
|
let sourceIndexes = [];
|
|
418
424
|
|
|
419
|
-
validateArray(arrObj, { min:
|
|
425
|
+
validateArray(arrObj, { min: 1 }, 'parseProductionX');
|
|
420
426
|
validateFirstRow(arrObj[0]);
|
|
421
427
|
|
|
422
428
|
if(yCallbackFunc != null) {
|
|
@@ -424,13 +430,19 @@ export const parseProductionX = ({
|
|
|
424
430
|
}
|
|
425
431
|
|
|
426
432
|
for (let x = 0; x < arrObj.length; x++) {
|
|
427
|
-
if (!validateRows({ objRow: arrObj, index: x, state })) continue;
|
|
428
433
|
|
|
429
|
-
|
|
434
|
+
try {
|
|
435
|
+
if (!validateRows({ objRow: arrObj, index: x, state })) continue;
|
|
430
436
|
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
437
|
+
const parsedX = xCallbackFunc({ objRow: arrObj, index: x, state });
|
|
438
|
+
|
|
439
|
+
if (typeof parsedX !== 'undefined' && parsedX !== null && parsedX !== false) {
|
|
440
|
+
X.push(parsedX);
|
|
441
|
+
sourceIndexes.push(x);
|
|
442
|
+
}
|
|
443
|
+
} catch(err) {
|
|
444
|
+
console.error(`[BUG] - Skipped row index=${x}: ${err.message}`)
|
|
445
|
+
continue
|
|
434
446
|
}
|
|
435
447
|
}
|
|
436
448
|
|
package/src/validators.js
CHANGED
|
@@ -23,7 +23,7 @@ export const validateArray = (arr, {min = -Infinity, max = Infinity}, paramName)
|
|
|
23
23
|
|
|
24
24
|
if(arr.length < min)
|
|
25
25
|
{
|
|
26
|
-
throw new Error(`Invalid property value. Array "${paramName}" expected at least ${
|
|
26
|
+
throw new Error(`Invalid property value. Array "${paramName}" expected at least ${min} items.`)
|
|
27
27
|
}
|
|
28
28
|
if(arr.length > max)
|
|
29
29
|
{
|