Tweaks to HighlightedAxes and predictor engine

Author: r59q

src/script/domain/stores/HighlightedAxes.ts

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-import { get, type Readable, type Unsubscriber, type Writable } from 'svelte/store';
+import { derived, get, type Readable, type Unsubscriber, type Writable } from 'svelte/store';
 import Classifier from './Classifier';
 import { type Subscriber } from 'svelte/motion';
 import SelectedModel from '../SelectedModel';
@@ -53,7 +53,9 @@ class HighlightedAxes implements Writable<Axis[]> {
     run: Subscriber<Axis[]>,
     invalidate?: (value?: Axis[]) => void,
   ): Unsubscriber {
-    return this.value.subscribe(run, invalidate);
+    return derived([this.value], ([store]) => {
+      return [...store].toSorted((a, b) => a.index - b.index)
+    }).subscribe(run, invalidate);
   }
 
   public toggleAxis(axis: Axis) {

src/script/engine/PollingPredictorEngine.ts

@@ -97,7 +97,11 @@ class PollingPredictorEngine implements Engine {
             .filter((vecVal, vecIdx) =>
               this.highlightedAxes.isAxisIndexHighlighted(vecIdx),
             ),
-          e.value.getLabels(),
+          e.value
+            .getLabels()
+            .filter((labelVal, vecIdx) =>
+              this.highlightedAxes.isAxisIndexHighlighted(vecIdx),
+            ),
         ),
     );
     return new ClassifierInput(sampleVectors);