Remove dependency upon ResumableFunctions

Author: Frankie Robertson

Project.toml

@@ -62,7 +62,6 @@ PrecompileTools = "1.2.1"
 PsychometricsBazaarBase = "^0.8.1"
 Random = "^1.11"
 Reexport = "1"
-ResumableFunctions = "^0.6, 1"
 Setfield = "^1"
 SparseArrays = "^1.11"
 StaticArrays = "1"
@@ -75,8 +74,7 @@ julia = "^1.11"
 Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"
-ResumableFunctions = "c5292f4c-5179-55e1-98c5-05642aab7184"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Aqua", "JET", "Optim", "ResumableFunctions", "Test"]
+test = ["Aqua", "JET", "Optim", "Test"]

test/compat.jl

@@ -11,7 +11,6 @@
     using ComputerAdaptiveTesting.ItemBanks: LogItemBank
     using ComputerAdaptiveTesting.NextItemRules: best_item
     using ComputerAdaptiveTesting: Compat
-    using ResumableFunctions
     using Test: @test, @testset
 
     #include("./dummy.jl")

test/dummy.jl

@@ -10,7 +10,6 @@ using PsychometricsBazaarBase.Integrators
 using PsychometricsBazaarBase.Optimizers
 using Optim
 using Random
-using ResumableFunctions
 
 struct DummyAbilityEstimator <: AbilityEstimator
     val::Any
@@ -24,7 +23,7 @@ const optimizers_1d = [
     FunctionOptimizer(OneDimOptimOptimizer(-6.0, 6.0, NelderMead()))
 ]
 const integrators_1d = [
-    FunctionIntegrator(QuadGKIntegrator(-6, 6, 5)),
+    FunctionIntegrator(QuadGKIntegrator(lo=-6.0, hi=6.0, order=5)),
     FunctionIntegrator(FixedGKIntegrator(-6, 6, 80))
 ]
 const ability_estimators_1d = [
@@ -46,47 +45,39 @@ const criteria_1d = [
     ((), (stuff) -> RandomNextItemRule())
 ]
 
-@resumable function _get_stuffs(needed)
+function _get_stuffs(needed)
     if :est in needed
-        for (extra_needed, mk_est) in ability_estimators_1d
+        return (
+            (; stuff..., est = mk_est(stuff))
+            for (extra_needed, mk_est) in ability_estimators_1d
             for stuff in _get_stuffs(setdiff(needed, Set((:est,))) ∪ extra_needed)
-                x = (; stuff..., est = mk_est(stuff))
-                @yield x
-            end
-        end
-        return
+        )
     end
     if :integrator in needed
-        for new_integrator in integrators_1d
+        return (
+            (; stuff..., integrator = new_integrator)
+            for new_integrator in integrators_1d
             for stuff in _get_stuffs(setdiff(needed, Set((:integrator,))))
-                x = (; stuff..., integrator = new_integrator)
-                @yield x
-            end
-        end
-        return
+        )
     end
     if :optimizer in needed
-        pop!(needed, :optimizer)
-        for new_optimizer in optimizers_1d
+        return (
+            (; stuff..., optimizer = new_optimizer)
+            for new_optimizer in optimizers_1d
             for stuff in _get_stuffs(setdiff(needed, Set((:optimizer,))))
-                x = (; stuff..., optimizer = new_optimizer)
-                @yield x
-            end
-        end
-        return
+        )
     end
-    x = NamedTuple()
-    @yield x
-    return
+    return [NamedTuple()]
 end
 
-@resumable function get_stuffs(needed)
-    add_dummy_est = !(:est in needed)
-    for stuff in _get_stuffs(needed)
-        if add_dummy_est
-            stuff = (; stuff..., est = DummyAbilityEstimator(0.0))
-        end
-        @yield stuff
+function get_stuffs(needed)
+    if !(:est in needed)
+        return (
+            (; stuff..., est = DummyAbilityEstimator(0.0))
+            for stuff in _get_stuffs(needed)
+        )
+    else
+        return _get_stuffs(needed)
     end
 end
 

test/runtests.jl

@@ -17,7 +17,6 @@ using Distributions
 using Distributions: ZeroMeanIsoNormal, Zeros, ScalMat
 using Optim
 using Random
-using ResumableFunctions
 
 using Test
 

test/stateful.jl

@@ -7,7 +7,6 @@
     using ComputerAdaptiveTesting.NextItemRules: RandomNextItemRule
     using ComputerAdaptiveTesting: Stateful
     using ComputerAdaptiveTesting: require_testext
-    using ResumableFunctions
     using Test: @test, @testset
 
     include("./dummy.jl")