Merge pull request #218 from labmlai/compare-fix

Compare fix

Author: lakshith-403

app/ui/src/components/charts/spark_lines/chart.ts

@@ -35,9 +35,6 @@ export class SparkLines {
     uniqueItems: Map<string, number>
     onlySelected: boolean
 
-    private readonly currentSmoothedValues: number[][]
-    private readonly baseSmoothedValues: number[][]
-
     constructor(opt: CompareSparkLinesOptions) {
         this.currentSeries = opt.series
         this.baseSeries = opt.baseSeries ?? []
@@ -59,17 +56,16 @@ export class SparkLines {
         const margin = Math.floor(opt.width / 64)
         this.rowWidth = Math.min(450, opt.width - Math.max(3 * margin, 60))
 
-        this.currentSmoothedValues = []
-        this.baseSmoothedValues = []
         let [smoothWindow, _] = getSmoothWindow(this.currentSeries, this.baseSeries, opt.smoothValue)
-        for (let i = 0; i < this.currentSeries.length; i++) {
-            let smoothedSeries = smoothSeries(this.currentSeries[i].series, smoothWindow[0][i])
-            this.currentSmoothedValues.push(smoothedSeries.map(d => d.smoothed))
-        }
-        for (let i = 0; i < this.baseSeries.length; i++) {
-            let smoothedSeries = smoothSeries(this.baseSeries[i].series, smoothWindow[0][1])
-            this.baseSmoothedValues.push(smoothedSeries.map(d => d.smoothed))
-        }
+
+        this.currentSeries = this.currentSeries.map((s, i) => {
+            s.series = smoothSeries(s.series, smoothWindow[0][i])
+            return s
+        })
+        this.baseSeries = this.baseSeries.map((s, i) => {
+            s.series = smoothSeries(s.series, smoothWindow[1][i])
+            return s
+        })
 
         this.stepExtent = getExtent(this.currentSeries.concat(this.baseSeries).map(s => s.series), d => d.step)
 
@@ -104,7 +100,6 @@ export class SparkLines {
                     onClick: onClick,
                     color: this.chartColors.getColor(this.uniqueItems.get(s.name)),
                     isMouseMoveOpt: this.isMouseMoveOpt,
-                    smoothedValues: this.currentSmoothedValues[i],
                     isComparison: this.baseSeries.length > 0
                 })
                 this.sparkLines.push(sparkLine)
@@ -130,7 +125,6 @@ export class SparkLines {
                     isMouseMoveOpt: this.isMouseMoveOpt,
                     isBase: true,
                     isComparison: this.baseSeries.length > 0,
-                    smoothedValues: this.baseSmoothedValues[i]
                 })
                 this.sparkLines.push(sparkLine)
             })

app/ui/src/components/charts/spark_lines/spark_line.ts

@@ -17,7 +17,6 @@ export interface SparkLineOptions {
     color: string
     isComparison?: boolean
     isBase?: boolean
-    smoothedValues: number[]
 }
 
 export class SparkLine {
@@ -37,16 +36,13 @@ export class SparkLine {
     bisect: d3.Bisector<number, number>
     linePlot: LinePlot
     isBase: boolean
-    smoothedValues: number[]
     isComparison: boolean
 
     constructor(opt: SparkLineOptions) {
         this.series = opt.series
-        this.smoothedValues = opt.smoothedValues
 
         if (opt.selected == -1) {
             this.series = [this.series[this.series.length - 1]]
-            this.smoothedValues = [this.smoothedValues[this.smoothedValues.length - 1]]
         }
         this.name = opt.name
         this.selected = opt.selected
@@ -86,14 +82,13 @@ export class SparkLine {
         const index = this.isSelected ?
             getSelectedIdx(this.series, this.bisect, cursorStep) : this.series.length - 1
         const last = this.series[index]
-        const lastSmoothed = this.smoothedValues[index]
 
-        if (Math.abs(last.value - lastSmoothed) > Math.abs(last.value) / 1e6) {
+        if (Math.abs(last.value - last.smoothed) > Math.abs(last.value) / 1e6) {
             this.secondaryElem.textContent = formatFixed(last.value, 6)
         } else {
             this.secondaryElem.textContent = ''
         }
-        this.primaryElem.textContent = formatFixed(lastSmoothed, 6)
+        this.primaryElem.textContent = formatFixed(last.smoothed, 6)
     }
 
     render($: WeyaElementFunction) {