Merge pull request #237 from grafana/js-expose-minmaxscaler

feat(js): expose `MinMaxScaler` transform
grafana · Jan 14, 2025 · 6291626 · 6291626
2 parents 22be0e3 + 1357c31
commit 6291626
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 47 deletions.
diff --git a/js/augurs-transforms-js/src/lib.rs b/js/augurs-transforms-js/src/lib.rs
@@ -5,7 +5,7 @@ use tsify_next::Tsify;
 use wasm_bindgen::prelude::*;
 
 use augurs_core_js::VecF64;
-use augurs_forecaster::transforms::{StandardScaler, Transformer, YeoJohnson};
+use augurs_forecaster::transforms::{MinMaxScaler, StandardScaler, Transformer, YeoJohnson};
 
 /// A transformation to be applied to the data.
 ///
@@ -14,6 +14,8 @@ use augurs_forecaster::transforms::{StandardScaler, Transformer, YeoJohnson};
 #[serde(rename_all = "camelCase", tag = "type")]
 #[tsify(from_wasm_abi)]
 pub enum Transform {
+    /// Scale the data to the range [0, 1].
+    MinMaxScaler,
     /// Standardize the data such that it has zero mean and unit variance.
     StandardScaler {
         /// Whether to ignore NaNs.
@@ -31,6 +33,7 @@ pub enum Transform {
 impl Transform {
     fn into_transformer(self) -> Box<dyn Transformer> {
         match self {
+            Transform::MinMaxScaler => Box::new(MinMaxScaler::new()),
             Transform::StandardScaler { ignore_nans } => {
                 Box::new(StandardScaler::new().ignore_nans(ignore_nans))
             }

diff --git a/js/testpkg/transforms.test.ts b/js/testpkg/transforms.test.ts
@@ -40,55 +40,52 @@ describe('transforms', () => {
     }
   });
 
-  describe('pipeline', () => {
-    it('works with arrays', () => {
-      const pt = new Pipeline([{ type: "standardScaler" }, { type: "yeoJohnson" }]);
-      const transformed = pt.fitTransform(y);
-      expect(transformed).toBeInstanceOf(Float64Array);
-      expect(transformed).toHaveLength(y.length);
-      const inverse = pt.inverseTransform(transformed);
-      expect(inverse).toBeInstanceOf(Float64Array);
-      expect(inverse).toHaveLength(y.length);
-      //@ts-ignore
-      expect(Array.from(inverse)).toAllBeCloseTo(y);
-    });
-
-    it('handles empty pipeline', () => {
-      const pt = new Pipeline([]);
-      expect(() => pt.fitTransform(y)).not.toThrow();
-    });
+  const testScalerPipeline = (
+    description: string,
+    inputData: number[],
+    scalerType: "standardScaler" | "minMaxScaler",
+    ignoreNaNs = false
+  ) => {
+    describe(description, () => {
+      it(`works with arrays ${scalerType}`, () => {
+        const pt = new Pipeline([
+          scalerType === "standardScaler"
+            ? { type: scalerType, ignoreNaNs }
+            : { type: scalerType },
+          { type: "yeoJohnson", ignoreNaNs }
+        ]);
+        const transformed = pt.fitTransform(inputData);
+        expect(transformed).toBeInstanceOf(Float64Array);
+        expect(transformed).toHaveLength(inputData.length);
 
-    it('handles invalid transforms', () => {
-      // @ts-ignore
-      expect(() => new Pipeline(["invalidTransform"])).toThrow();
-    });
-  });
+        const inverse = pt.inverseTransform(transformed);
+        expect(inverse).toBeInstanceOf(Float64Array);
+        expect(inverse).toHaveLength(inputData.length);
+        //@ts-ignore
+        expect(Array.from(inverse)).toAllBeCloseTo(inputData);
+      });
 
-  describe('pipeline with nans', () => {
-    const yWithNaNs = [...y];
-    yWithNaNs[10] = NaN;
-    yWithNaNs[20] = NaN;
+      it('handles empty pipeline', () => {
+        const pt = new Pipeline([]);
+        expect(() => pt.fitTransform(inputData)).not.toThrow();
+      });
 
-    it('works with arrays', () => {
-      const pt = new Pipeline([{ type: "standardScaler", ignoreNaNs: true }, { type: "yeoJohnson", ignoreNaNs: true }]);
-      const transformed = pt.fitTransform(yWithNaNs);
-      expect(transformed).toBeInstanceOf(Float64Array);
-      expect(transformed).toHaveLength(yWithNaNs.length);
-      const inverse = pt.inverseTransform(transformed);
-      expect(inverse).toBeInstanceOf(Float64Array);
-      expect(inverse).toHaveLength(yWithNaNs.length);
-      //@ts-ignore
-      expect(Array.from(inverse)).toAllBeCloseTo(yWithNaNs);
+      it('handles invalid transforms', () => {
+        // @ts-ignore
+        expect(() => new Pipeline(["invalidTransform"])).toThrow();
+      });
     });
+  };
 
-    it('handles empty pipeline', () => {
-      const pt = new Pipeline([]);
-      expect(() => pt.fitTransform(yWithNaNs)).not.toThrow();
-    });
+  // Test regular pipeline
+  testScalerPipeline('pipeline with standard scaler', y, 'standardScaler');
+  testScalerPipeline('pipeline with minmax scaler', y, 'minMaxScaler');
 
-    it('handles invalid transforms', () => {
-      // @ts-ignore
-      expect(() => new Pipeline(["invalidTransform"])).toThrow();
-    });
-  });
-})
+  // Test pipeline with NaNs
+  const yWithNaNs = [...y];
+  yWithNaNs[10] = NaN;
+  yWithNaNs[20] = NaN;
+
+  testScalerPipeline('pipeline with NaNs - standard scaler', yWithNaNs, 'standardScaler', true);
+  testScalerPipeline('pipeline with NaNs - minmax scaler', yWithNaNs, 'minMaxScaler', true);
+});