Rename interval & builtIn eval imports

Author: mauriciopoppe

src/external.d.ts

@@ -7,7 +7,7 @@ declare module 'interval-arithmetic-eval' {
   export class Interval {
     lo: number
     hi: number
-
+    constructor(lo: number | Interval, hi?: number)
     static isEmpty(n: Interval | number): boolean
     static isWhole(n: Interval | number): boolean
     static intervalsOverlap(n: Interval, r: Interval): boolean

src/samplers/builtIn.ts

@@ -1,5 +1,5 @@
 import { linspace, sgn, infinity, clamp, space, isValidNumber } from '../utils.mjs'
-import { builtIn as evaluate } from './eval.mjs'
+import { builtIn as builtInEvaluate, interval as intervalEvaluate } from './eval.mjs'
 
 import type { FunctionPlotDatum, FunctionPlotScale, PointFunction, VectorFunction } from '../types.js'
 import type { SamplerParams, SamplerFn, BuiltInSamplerResult, BuiltInSamplerResultGroup } from './types.js'
@@ -27,7 +27,7 @@ function checkAsymptote(
   let oldY: number, oldX: number
   for (let i = 0; i < n; i += 1) {
     const x = samples[i]
-    const y = evaluate(d, 'fn', { x })
+    const y = builtInEvaluate(d, 'fn', { x })
 
     if (oldY) {
       const deltaY = y - oldY
@@ -120,13 +120,15 @@ function linear(samplerParams: SamplerParams): BuiltInSamplerResult {
   const yMin = yDomain[0] - infinity()
   const yMax = yDomain[1] + infinity()
   const data: Array<[number, number]> = []
+  let oldY: number
   for (let i = 0; i < allX.length; i += 1) {
     const x = allX[i]
-    let y = evaluate(samplerParams.d, 'fn', { x })
+    let y = builtInEvaluate(samplerParams.d, 'fn', { x })
     if (isValidNumber(x) && isValidNumber(y)) {
       y = clamp(y, yMin, yMax)
       data.push([x, y])
     }
+    oldY = y
   }
   const splitData = split(samplerParams.d, data, samplerParams.yScale)
   return splitData
@@ -140,8 +142,8 @@ function parametric(samplerParams: SamplerParams): BuiltInSamplerResult {
   const samples: BuiltInSamplerResultGroup = []
   for (let i = 0; i < tCoords.length; i += 1) {
     const t = tCoords[i]
-    const x = evaluate(samplerParams.d, 'x', { t })
-    const y = evaluate(samplerParams.d, 'y', { t })
+    const x = builtInEvaluate(samplerParams.d, 'x', { t })
+    const y = builtInEvaluate(samplerParams.d, 'y', { t })
     samples.push([x, y])
   }
   return [samples]
@@ -155,7 +157,7 @@ function polar(samplerParams: SamplerParams): BuiltInSamplerResult {
   const samples: BuiltInSamplerResultGroup = []
   for (let i = 0; i < thetaSamples.length; i += 1) {
     const theta = thetaSamples[i]
-    const r = evaluate(samplerParams.d, 'r', { theta })
+    const r = builtInEvaluate(samplerParams.d, 'r', { theta })
     const x = r * Math.cos(theta)
     const y = r * Math.sin(theta)
     samples.push([x, y])

src/samplers/interval.ts

@@ -1,6 +1,6 @@
 import intervalArithmeticEval, { Interval } from 'interval-arithmetic-eval'
 
-import { interval as evaluate } from './eval.mjs'
+import { interval as intervalEvaluate, builtIn as builtInEvaluate } from './eval.mjs'
 import { infinity, space, interval2dTypedArray } from '../utils.mjs'
 import globals from '../globals.mjs'
 
@@ -120,19 +120,22 @@ async function asyncInterval1d({
   return [samples]
 }
 
-function interval1d({ d, xAxis, range, nSamples, xScale, yScale }: SamplerParams): IntervalSamplerResult {
+function interval1d({ d, xAxis, yAxis, range, nSamples, xScale, yScale }: SamplerParams): IntervalSamplerResult {
   const xCoords = space(xAxis, range, nSamples)
   const samples: IntervalSamplerResultGroup = []
+  let oldYBuiltIn: number
   for (let i = 0; i < xCoords.length - 1; i += 1) {
     const x = { lo: xCoords[i], hi: xCoords[i + 1] }
-    const y = evaluate(d, 'fn', { x })
+    const y = intervalEvaluate(d, 'fn', { x })
+    const yBuiltIn = builtInEvaluate(d, 'fn', { x: xCoords[i + 1] })
     if (!Interval.isEmpty(y) && !Interval.isWhole(y)) {
       samples.push([x, y])
     }
     if (Interval.isWhole(y)) {
       // means that the next and prev intervals need to be fixed
       samples.push(null)
     }
+    oldYBuiltIn = yBuiltIn
   }
 
   // asymptote determination
@@ -179,7 +182,7 @@ function smallRect(x: Interval, _: Interval) {
 }
 
 function quadTree(x: Interval, y: Interval, d: FunctionPlotDatum) {
-  const sample = evaluate(d, 'fn', { x, y })
+  const sample = intervalEvaluate(d, 'fn', { x, y })
   const fulfills = Interval.zeroIn(sample)
   if (!fulfills) {
     return this