Move add_response!/pop_response! to Responses

Author: Frankie Robertson

src/Responses.jl

@@ -7,6 +7,7 @@ using FittedItemBanks: AbstractItemBank,
 using AutoHashEquals: @auto_hash_equals
 
 export Response, BareResponses, AbilityLikelihood, function_xs, function_ys
+export add_response!, pop_response!
 
 concrete_response_type(::BooleanResponse) = Bool
 concrete_response_type(::MultinomialResponse) = Int
@@ -69,6 +70,28 @@ function Base.iterate(::BareResponses, gen_gen_state)
     return _iter_helper(gen, iterate(gen, gen_state))
 end
 
+function Base.empty!(responses::BareResponses)
+    Base.empty!(responses.indices)
+    Base.empty!(responses.values)
+end
+
+function add_response!(responses::BareResponses, response::Response)::BareResponses
+    push!(responses.indices, response.index)
+    push!(responses.values, response.value)
+    responses
+end
+
+function pop_response!(responses::BareResponses)::BareResponses
+    pop!(responses.indices)
+    pop!(responses.values)
+    responses
+end
+
+function Base.sizehint!(bare_responses::BareResponses, n)
+    sizehint!(bare_responses.indices, n)
+    sizehint!(bare_responses.values, n)
+end
+
 struct AbilityLikelihood{ItemBankT <: AbstractItemBank, BareResponsesT <: BareResponses}
     item_bank::ItemBankT
     responses::BareResponsesT

src/Stateful.jl

@@ -10,7 +10,7 @@ using DocStringExtensions
 using FittedItemBanks: AbstractItemBank, ResponseType
 using ..Aggregators: TrackedResponses, Aggregators
 using ..CatConfig: CatLoopConfig, CatRules
-using ..Responses: BareResponses, Response
+using ..Responses: BareResponses, Response, Responses
 using ..NextItemRules: compute_criteria, best_item
 using ..Sim: Sim, item_label
 
@@ -190,13 +190,13 @@ end
 
 function add_response!(config::StatefulCatConfig, index, response)
     tracked_responses = config.tracked_responses[]
-    Aggregators.add_response!(
+    Responses.add_response!(
         tracked_responses, Response(
             ResponseType(tracked_responses.item_bank), index, response))
 end
 
 function rollback!(config::StatefulCatConfig)
-    pop_response!(config.tracked_responses[])
+    Responses.pop_response!(config.tracked_responses[])
 end
 
 function reset!(config::StatefulCatConfig)

src/aggregators/Aggregators.jl

@@ -17,7 +17,7 @@ using FittedItemBanks: AbstractItemBank, ContinuousDomain,
                        PointsItemBank, ResponseType, VectorContinuousDomain,
                        domdims, item_params, resp, resp_vec, responses
 using ..Responses
-using ..Responses: concrete_response_type, function_xs, function_ys
+using ..Responses: concrete_response_type, function_xs, function_ys, Responses
 using ..ConfigBase
 using PsychometricsBazaarBase.ConfigTools: @requiresome, @returnsome,
                                            find1_instance, find1_type,
@@ -37,8 +37,7 @@ import PsychometricsBazaarBase.IntegralCoeffs
 export AbilityEstimator, TrackedResponses
 export AbilityTracker, NullAbilityTracker, PointAbilityTracker, GriddedAbilityTracker
 export ClosedFormNormalAbilityTracker, track!
-export response_expectation,
-       add_response!, pop_response!, expectation, distribution_estimator
+export response_expectation, expectation, distribution_estimator
 export PointAbilityEstimator, PriorAbilityEstimator, LikelihoodAbilityEstimator
 export ModeAbilityEstimator, MeanAbilityEstimator
 export Speculator, replace_speculation!, normdenom, maybe_tracked_ability_estimate

src/aggregators/ability_tracker.jl

@@ -1,37 +1,19 @@
-function sizehint!(bare_responses::BareResponses, n)
-    sizehint!(bare_responses.indices, n)
-    sizehint!(bare_responses.values, n)
-end
-
 function track!(responses)
     track!(responses, responses.ability_tracker)
 end
 
-function add_response!(responses::BareResponses, response::Response)::BareResponses
-    push!(responses.indices, response.index)
-    push!(responses.values, response.value)
-    responses
-end
-
-function add_response!(tracked_responses::TrackedResponses, response::Response)
+function Responses.add_response!(tracked_responses::TrackedResponses, response::Response)
     add_response!(tracked_responses.responses, response)
     track!(tracked_responses)
 end
 
-function pop_response!(responses::BareResponses)::BareResponses
-    pop!(responses.indices)
-    pop!(responses.values)
-    responses
-end
-
-function pop_response!(tracked_responses::TrackedResponses)::TrackedResponses
+function Responses.pop_response!(tracked_responses::TrackedResponses)::TrackedResponses
     pop_response!(tracked_responses.responses)
     tracked_responses
 end
 
 function Base.empty!(tracked_responses::TrackedResponses)
-    Base.empty!(tracked_responses.responses.indices)
-    Base.empty!(tracked_responses.responses.values)
+    Base.empty!(tracked_responses.responses)
 end
 
 function response_expectation(ability_estimator::DistributionAbilityEstimator,

src/decision_tree/DecisionTree.jl

@@ -6,7 +6,7 @@ using ComputerAdaptiveTesting.ConfigBase: CatConfigBase
 using ComputerAdaptiveTesting.PushVectors
 using ComputerAdaptiveTesting.NextItemRules
 using ComputerAdaptiveTesting.Aggregators
-using ComputerAdaptiveTesting.Responses: BareResponses, Response
+using ComputerAdaptiveTesting.Responses: BareResponses, Response, add_response!, pop_response!
 using FittedItemBanks: AbstractItemBank, BooleanResponse, ResponseType
 
 # TODO: Remove ability tracking from here?