Simpla still

Sources/Lotsawa/Chart.swift

@@ -295,29 +295,8 @@ extension Chart {
 
 extension Chart {
 
-  struct Predictions: RandomAccessCollection {
-    typealias Base = PredictionSet
-
-    let earleme: UInt32
-    let base: Base
-
-    typealias Element = Chart.ItemID
-    typealias Index = Base.Index
-    var startIndex: Index { base.startIndex }
-    var endIndex: Index { base.endIndex }
-
-    subscript(p: Base.Index) -> Element {
-      var i = base[p]
-      i.origin = earleme
-      return i
-    }
-  }
-
-  func predictions(startingWith transitionSymbol: Symbol, inEarleySet origin: UInt32) -> Predictions {
-    Predictions(
-      earleme: origin,
-      base: predictionMemo.predictions(
-        inEarleme: Int(origin), startingWith: transitionSymbol))
+  func predictions(startingWith transitionSymbol: Symbol, inEarleySet origin: UInt32) -> PredictionSet {
+      predictionMemo.predictions(inEarleme: Int(origin), startingWith: transitionSymbol)
   }
 
 }

Sources/Lotsawa/Recognizer.swift

@@ -97,7 +97,8 @@ extension Recognizer {
 
       // The set containing potential mainstem derivations to be paired with the one for s.
       let predictions = chart.predictions(startingWith: s, inEarleySet: origin)
-      for m in predictions {
+      for var m in predictions {
+        m.origin = origin
         derive(.init(item: m.advanced(in: g), mainstemIndex: nil))
       }