xy-scale 1.4.37 → 1.4.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xy-scale",
-  "version": "1.4.37",
+  "version": "1.4.39",
   "main": "./index.js",
   "type": "module",
   "scripts": {

package/src/datasets.js

@@ -243,7 +243,7 @@ export const parseTrainingXY = ({
     let Y = [];
     const sourceIndexes = [];
 
-    validateArray(arrObj, { min: 5 }, 'parseTrainingXY');
+    validateArray(arrObj, { min: 2 }, 'parseTrainingXY');
     validateFirstRow(arrObj[0]);
 
     for (let x = 0; x < arrObj.length; x++) {
@@ -316,9 +316,7 @@ export const parseTrainingXY = ({
         keyNames: xKeys,
     };
 
-    const configY = {
-        keyNames: yKeys,
-    };
+
 
     for (let idx = 0; idx < xLen; idx++) {
         const rowObj = X[idx];
@@ -341,12 +339,33 @@ export const parseTrainingXY = ({
         flatX[idx] = flatRow;
     }
 
+    const toLabelKey = value => Array.isArray(value)
+        ? JSON.stringify(value) 
+        : String(value);
+
+    const initLabelCounts = keyNames =>
+        Object.fromEntries(
+            keyNames.map(keyName => [keyName, ({})])
+        );
+
+    const configY = {
+        keyNames: yKeys,
+        labelCounts: initLabelCounts(yKeys),
+    };
+
     for (let idx = 0; idx < yLen; idx++) {
         const rowObj = Y[idx];
         const flatRow = new Array(yKeys.length);
 
         for (let j = 0; j < yKeys.length; j++) {
-            flatRow[j] = rowObj[yKeys[j]];
+            const keyName = yKeys[j];
+            const value = rowObj[keyName];
+
+            flatRow[j] = value;
+
+            const labelKey = toLabelKey(value);
+            configY.labelCounts[keyName][labelKey] =
+                (configY.labelCounts[keyName][labelKey] ?? 0) + 1;
         }
 
         flatY[idx] = flatRow;
@@ -397,7 +416,7 @@ export const parseProductionX = ({
     let X = [];
     let sourceIndexes = [];
 
-    validateArray(arrObj, { min: 5 }, 'parseProductionX');
+    validateArray(arrObj, { min: 1 }, 'parseProductionX');
     validateFirstRow(arrObj[0]);
 
     if(yCallbackFunc != null) {

package/src/validators.js

@@ -23,7 +23,7 @@ export const validateArray = (arr, {min = -Infinity, max = Infinity}, paramName)
 
     if(arr.length < min)
     {
-        throw new Error(`Invalid property value. Array "${paramName}" expected at least ${max} items.`)
+        throw new Error(`Invalid property value. Array "${paramName}" expected at least ${min} items.`)
     }
     if(arr.length > max)
     {

package/test/test.js

@@ -37,6 +37,7 @@ const test = async () => {
         testX,
         testY,
         configX,
+        configY
     } = parseTrainingXY({
         arrObj,
         trainingSplit: 0.50,
@@ -61,6 +62,7 @@ const test = async () => {
     console.log('row_1', {features: trainX[0], labels: trainY[0]})
 
     console.log(trainY.length, trainX.length)
+    console.log(configY)
 
     const timeSteps = arrayToTimesteps(trainX, 10)
 
@@ -87,13 +89,15 @@ const xCallbackFunc = ({ objRow, index }) => {
 //callback function used to prepare Y before flattening
 const yCallbackFunc = ({ objRow, index }) => {
 
+    const curr = objRow[index]
     const next = objRow[index + 1]
 
     //returning null or undefined will exclude current row X and Y from training
     if (typeof next === 'undefined') return null
     
     return {
-        result: Number(next.close > next.open) //the output shoud must be an array to preserve the key->value order
+        label_1: Number(next.close > next.open),
+        label_2: Number(next.close > curr.close)
     }
 }