Now rounding computed min and max.

ashleydavis · ashleydavis · commit 128a44c40628 · 2019-05-03T18:31:31.000+10:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "data-forge-plot",
-    "version": "0.3.3",
+    "version": "0.3.4",
     "description": "Plotting API for use with Data-Forge.",
     "main": "build/index.js",
     "types": "build/index.d.ts",
diff --git a/src/apply-defaults.ts b/src/apply-defaults.ts
@@ -14,12 +14,12 @@ function extractValues(data: ISerializedDataFrame, seriesConfigs: IYAxisSeriesCo
     return flattened;
 }
 
-function findMin(values: number[]): number {
-    return Math.min(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v)));
+function computeMin(values: number[]): number {
+    return Math.floor(Math.min(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v))) * 100) / 100;
 }
 
-function findMax(values: number[]): number {
-    return Math.max(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v) && Number.isFinite(v)));
+function computeMax(values: number[]): number {
+    return Math.ceil(Math.max(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v) && Number.isFinite(v))) * 100) / 100;
 }
 
 //
@@ -87,7 +87,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf
         y1Values = extractValues(chartDef.data, chartDef.axisMap.y);
 
         if (y1Values.length > 0) {        
-            chartDef.plotConfig.y.min = findMin(y1Values);
+            chartDef.plotConfig.y.min = computeMin(y1Values);
         }
     }
 
@@ -97,7 +97,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf
         }
 
         if (y1Values.length > 0) {        
-            chartDef.plotConfig.y.max = findMax(y1Values);
+            chartDef.plotConfig.y.max = computeMax(y1Values);
         }
     }
 
@@ -110,7 +110,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf
     if (chartDef.plotConfig.y2.min === undefined) {
         y2Values = extractValues(chartDef.data, chartDef.axisMap.y2);
         if (y2Values.length > 0) {
-            chartDef.plotConfig.y2.min = findMin(y2Values);
+            chartDef.plotConfig.y2.min = computeMin(y2Values);
         }
     }
 
@@ -120,7 +120,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf
         }
 
         if (y2Values.length > 0) {
-            chartDef.plotConfig.y2.max = findMax(y2Values);
+            chartDef.plotConfig.y2.max = computeMax(y2Values);
         }
     }
 
diff --git a/src/test/apply-defaults.test.ts b/src/test/apply-defaults.test.ts
@@ -464,4 +464,55 @@ describe("apply defaults", () => {
         expect(chartDef.plotConfig.y2!.min).toBeUndefined();
         expect(chartDef.plotConfig.y2!.max).toBeUndefined();
     });    
+
+    it("computed min and max are rounded", () => {
+
+        const testData = {
+            columnOrder: [ "a" ],
+            columns: {
+                a: "number",
+                b: "number",
+            },
+            index: {
+                type: "number",
+                values: [2, 3, 4],
+            },
+            values: [
+                {
+                    a: 10.123456,
+                },
+                {
+                    a: 20,
+                },
+                {
+                    a: 30.01234567,
+                },
+            ],
+        };
+    
+        const inputChartDef: any = {
+            data: testData,
+            plotConfig: {
+                y: {
+                },
+                y2: {
+                },
+            },
+            axisMap: {
+                y: [
+                    {
+                        series: "a",
+                    },
+                    {
+                        series: "b",
+                    },
+                ],
+            },
+        };
+
+        const chartDef = applyDefaults(inputChartDef);
+        expect(chartDef.plotConfig.y!.min).toBe(10.12);
+        expect(chartDef.plotConfig.y!.max).toBe(30.02);
+    });
+
 });

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "data-forge-plot",`
`3`		`- "version": "0.3.3",`
	`3`	`+ "version": "0.3.4",`
`4`	`4`	`"description": "Plotting API for use with Data-Forge.",`
`5`	`5`	`"main": "build/index.js",`
`6`	`6`	`"types": "build/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ function extractValues(data: ISerializedDataFrame, seriesConfigs: IYAxisSeriesCo`
`14`	`14`	`return flattened;`
`15`	`15`	`}`
`16`	`16`
`17`		`-function findMin(values: number[]): number {`
`18`		`- return Math.min(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v)));`
	`17`	`+function computeMin(values: number[]): number {`
	`18`	`+ return Math.floor(Math.min(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v))) * 100) / 100;`
`19`	`19`	`}`
`20`	`20`
`21`		`-function findMax(values: number[]): number {`
`22`		`- return Math.max(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v) && Number.isFinite(v)));`
	`21`	`+function computeMax(values: number[]): number {`
	`22`	`+ return Math.ceil(Math.max(...values.filter(v => v !== undefined && v !== null && !Number.isNaN(v) && Number.isFinite(v))) * 100) / 100;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`//`
`@@ -87,7 +87,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf`
`87`	`87`	`y1Values = extractValues(chartDef.data, chartDef.axisMap.y);`
`88`	`88`
`89`	`89`	`if (y1Values.length > 0) {`
`90`		`- chartDef.plotConfig.y.min = findMin(y1Values);`
	`90`	`+ chartDef.plotConfig.y.min = computeMin(y1Values);`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`@@ -97,7 +97,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (y1Values.length > 0) {`
`100`		`- chartDef.plotConfig.y.max = findMax(y1Values);`
	`100`	`+ chartDef.plotConfig.y.max = computeMax(y1Values);`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`@@ -110,7 +110,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf`
`110`	`110`	`if (chartDef.plotConfig.y2.min === undefined) {`
`111`	`111`	`y2Values = extractValues(chartDef.data, chartDef.axisMap.y2);`
`112`	`112`	`if (y2Values.length > 0) {`
`113`		`- chartDef.plotConfig.y2.min = findMin(y2Values);`
	`113`	`+ chartDef.plotConfig.y2.min = computeMin(y2Values);`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`@@ -120,7 +120,7 @@ export function applyDefaults(inputChartDef: IChartDef, plotDefaults?: IPlotConf`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if (y2Values.length > 0) {`
`123`		`- chartDef.plotConfig.y2.max = findMax(y2Values);`
	`123`	`+ chartDef.plotConfig.y2.max = computeMax(y2Values);`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`