Get rid of HillClimbAsync.swift

valeriyvan · Jul 23, 2024 · 7f274ea · 7f274ea
1 parent 9e83bdd
commit 7f274ea
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 174 deletions.
diff --git a/Sources/geometrize/GeometrizeModelHillClimb.swift b/Sources/geometrize/GeometrizeModelHillClimb.swift
@@ -64,18 +64,24 @@ class GeometrizeModelHillClimb: GeometrizeModelBase {
             for _ in 0..<maxThreads {
                 let seed = UInt64(baseRandomSeed + randomSeedOffset) // TODO: fix
                 randomSeedOffset += 1
-                taskGroup.addTask {
-                    let state = await bestHillClimbStateAsync(
-                        shapeCreator: shapeCreator,
-                        alpha: alpha,
-                        n: shapeCount,
-                        age: maxShapeMutations,
-                        target: target,
-                        current: current,
-                        lastScore: lastScore,
-                        energyFunction: energyFunction,
-                        seed: seed
-                    )
+                taskGroup.addTask { [current] in
+                    var generator = SplitMix64(seed: seed)
+                    let state = await withCheckedContinuation { continuation in
+                        var buffer = current
+                        let state = bestHillClimbState(
+                            shapeCreator: shapeCreator,
+                            alpha: alpha,
+                            n: shapeCount,
+                            age: maxShapeMutations,
+                            target: target,
+                            current: current,
+                            buffer: &buffer,
+                            lastScore: lastScore,
+                            energyFunction: energyFunction,
+                            using: &generator
+                        )
+                        continuation.resume(returning: state)
+                    }
                     return state
                 }
             }

diff --git a/Sources/geometrize/HillClimbAsync.swift b/Sources/geometrize/HillClimbAsync.swift
diff --git a/Sources/geometrize/SVGAsyncIterator.swift b/Sources/geometrize/SVGAsyncIterator.swift
@@ -116,6 +116,23 @@ public struct SVGAsyncIterator: AsyncIteratorProtocol {
             if verbose {
                 print("Step \(stepCounter)", terminator: "")
             }
+            let stepResult = await withCheckedContinuation { continuation in
+                var buffer = current
+                let state = bestHillClimbState(
+                    shapeCreator: shapeCreator,
+                    alpha: alpha,
+                    n: shapeCount,
+                    age: maxShapeMutations,
+                    target: target,
+                    current: current,
+                    buffer: &buffer,
+                    lastScore: lastScore,
+                    energyFunction: energyFunction,
+                    using: &generator
+                )
+                continuation.resume(returning: state)
+            }
+
             let stepResult = await runner.stepAsync(
                 options: runnerOptions,
                 energyFunction: defaultEnergyFunction,