Skip to content

Commit 4f7d7db

Browse files
author
Frankie Robertson
committed
Rename PiecewiseNextItemRule => FixedRuleSequencer
1 parent cf02e11 commit 4f7d7db

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

src/next_item_rules/NextItemRules.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export RawEmpiricalInformationPointwiseItemCategoryCriterion
4747
export EmpiricalInformationPointwiseItemCategoryCriterion
4848
export TotalItemInformation
4949
export RandomNextItemRule
50-
export PiecewiseNextItemRule, MemoryNextItemRule, FixedFirstItemNextItemRule
50+
export FixedRuleSequencer, MemoryNextItemRule, FixedFirstItemNextItemRule
5151
export ExhaustiveSearch, RandomesqueStrategy
5252
export preallocate
5353
export compute_criteria, compute_criterion, compute_multi_criterion

src/next_item_rules/strategies/pointwise.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ function best_item(rule::PointwiseNextItemRule, responses::TrackedResponses, ite
1717
end
1818

1919
function PointwiseFirstNextItemRule(criterion, points, rule)
20-
PiecewiseNextItemRule((length(points),), (PointwiseNextItemRule(criterion, points), rule))
21-
end
20+
FixedRuleSequencer((length(points),), (PointwiseNextItemRule(criterion, points), rule))
21+
end

src/next_item_rules/strategies/sequential.jl

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
$(TYPEDEF)
33
$(TYPEDFIELDS)
44
5-
This is the most basic rule for choosing the next item in a CAT. It simply
6-
picks a random item from the set of items that have not yet been
7-
administered.
85
"""
9-
@kwdef struct PiecewiseNextItemRule{RulesT} <: NextItemRule
6+
@kwdef struct FixedRuleSequencer{RulesT} <: NextItemRule
107
# Tuple of Ints
118
breaks::Tuple{Int}
129
# Tuple of NextItemRules
@@ -15,7 +12,7 @@ end
1512

1613
#tuple_len(::NTuple{N, Any}) where {N} = Val{N}()
1714

18-
function current_rule(rule::PiecewiseNextItemRule, responses::TrackedResponses)
15+
function current_rule(rule::FixedRuleSequencer, responses::TrackedResponses)
1916
for brk in 1:length(rule.breaks)
2017
if length(responses) < rule.breaks[brk]
2118
return rule.rules[brk]
@@ -24,11 +21,11 @@ function current_rule(rule::PiecewiseNextItemRule, responses::TrackedResponses)
2421
return rule.rules[end]
2522
end
2623

27-
function best_item(rule::PiecewiseNextItemRule, responses::TrackedResponses, items)
24+
function best_item(rule::FixedRuleSequencer, responses::TrackedResponses, items)
2825
return best_item(current_rule(rule, responses), responses, items)
2926
end
3027

31-
function compute_criteria(rule::PiecewiseNextItemRule, responses::TrackedResponses)
28+
function compute_criteria(rule::FixedRuleSequencer, responses::TrackedResponses)
3229
return compute_criteria(current_rule(rule, responses), responses)
3330
end
3431

@@ -47,5 +44,5 @@ function best_item(rule::MemoryNextItemRule, responses::TrackedResponses, _items
4744
end
4845

4946
function FixedFirstItemNextItemRule(item_idx::Int, rule::NextItemRule)
50-
PiecewiseNextItemRule((1,), (MemoryNextItemRule((item_idx,)), rule))
47+
FixedRuleSequencer((1,), (MemoryNextItemRule((item_idx,)), rule))
5148
end

0 commit comments

Comments
 (0)