Skip to content

Cleanup imports deps #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ Lazy = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
LogarithmicNumbers = "aa2f6b4e-9042-5d33-9679-40d3a6b85899"
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
PsychometricsBazaarBase = "b0d9cada-d963-45e9-a4c6-4746243987f1"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Expand All @@ -33,11 +30,10 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"

[compat]
Accessors = "^0.1.12"
Aqua = "0.5.5, 0.6.5"
Aqua = "0.8"
AutoHashEquals = "2"
ConstructionBase = "^1.2"
DataFrames = "1.6.1"
Expand All @@ -46,26 +42,27 @@ DocStringExtensions = " ^0.9"
EffectSizes = "^1.0.1"
FillArrays = "0.13, 1.5.0"
FittedItemBanks = "^0.6.3"
ForwardDiff = "0.10.24"
ForwardDiff = "1"
HypothesisTests = "^0.10.12, ^0.11.0"
Interpolations = "^0.14, ^0.15"
JET = "^0.9"
Lazy = "0.15"
LinearAlgebra = "^1.11"
LogarithmicNumbers = "1"
MacroTools = "^0.5.6"
Measurements = "^2.10.0"
Mmap = "^1.11"
Optim = "1.7.3"
OrderedCollections = "^1.6"
PrecompileTools = "1.2.1"
PsychometricsBazaarBase = "^0.8.1"
Random = "^1.11"
Reexport = "1"
ResumableFunctions = "^0.6"
Setfield = "^1"
SparseArrays = "^1.11"
StaticArrays = "1"
StatsBase = "^0.34"
StatsFuns = "^0.9.15, ^1"
Test = "^1.11"
UnPack = "1"
julia = "^1.11"

[extras]
Expand Down
3 changes: 1 addition & 2 deletions src/CatConfig.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ module CatConfig

export CatRules, CatLoopConfig

using DocStringExtensions

using DocStringExtensions: FUNCTIONNAME, TYPEDEF, TYPEDFIELDS
using PsychometricsBazaarBase.Parameters

using ..Aggregators: AbilityEstimator, AbilityTracker, ConsAbilityTracker,
Expand Down
13 changes: 6 additions & 7 deletions src/Comparison.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ module Comparison
# TODO: We are overlapping a bit with CatRecorder here
# Should be kept in mind and kept distinct or code reuse

using StatsBase
using FittedItemBanks: AbstractItemBank, ResponseType, subset
using ..Responses
using ..CatConfig: CatLoopConfig, CatRules
using ..Aggregators: TrackedResponses, add_response!, Speculator, Aggregators, track!,
pop_response!
using ..DecisionTree: TreePosition, next!
using ..Aggregators: TrackedResponses, Aggregators
using Base: Iterators

using HypothesisTests
using EffectSizes
using EffectSizes: CohenD, effectsize
using HypothesisTests: ExactSignedRankTest, SignTest, UnequalVarianceTTest,
pvalue
using StatsBase: median, sample!

using DataFrames: DataFrame
using ComputerAdaptiveTesting: Stateful

Expand Down
3 changes: 1 addition & 2 deletions src/ComputerAdaptiveTesting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ module ComputerAdaptiveTesting

include("./hacks.jl")

using Pkg
using Reexport
using Reexport: Reexport, @reexport

# Modules
export ConfigBase, Responses, Aggregators
Expand Down
4 changes: 2 additions & 2 deletions src/ConfigBase.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module ConfigBase

using Accessors
using DocStringExtensions
using Accessors: PropertyLens, opcompose
using DocStringExtensions: TYPEDEF

export CatConfigBase, walk

Expand Down
4 changes: 2 additions & 2 deletions src/Responses.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module Responses
using FittedItemBanks: AbstractItemBank,
BooleanResponse, MultinomialResponse, ResponseType, ItemResponse,
resp,
DichotomousPointsItemBank, item_xs, item_ys
using AutoHashEquals
DichotomousPointsItemBank, item_ys
using AutoHashEquals: @auto_hash_equals

export Response, BareResponses, AbilityLikelihood, function_xs, function_ys

Expand Down
2 changes: 1 addition & 1 deletion src/Sim.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ using StatsBase
using FittedItemBanks: AbstractItemBank, ResponseType
using ..Responses
using ..CatConfig: CatLoopConfig, CatRules
using ..Aggregators: TrackedResponses, add_response!, Speculator, Aggregators
using ..Aggregators: TrackedResponses, add_response!, Aggregators
using ..NextItemRules: compute_criteria, best_item

export run_cat, prompt_response, auto_responder
Expand Down
4 changes: 2 additions & 2 deletions src/TerminationConditions.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module TerminationConditions

using DocStringExtensions
using DocStringExtensions: TYPEDEF, TYPEDFIELDS
using FittedItemBanks: AbstractItemBank
using ..Aggregators: TrackedResponses
using ..ConfigBase
using PsychometricsBazaarBase.ConfigTools
using PsychometricsBazaarBase.ConfigTools: @returnsome, find1_instance
using FittedItemBanks

export TerminationCondition,
Expand Down
20 changes: 15 additions & 5 deletions src/aggregators/Aggregators.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,24 @@ using Distributions: Distribution, Normal, Distributions
using Base.Threads
using ForwardDiff: ForwardDiff

using FittedItemBanks
using FittedItemBanks: AbstractItemBank, ContinuousDomain,
DichotomousSmoothedItemBank, DiscreteIndexableDomain,
DomainType, ItemResponse, OneDimContinuousDomain,
PointsItemBank, ResponseType, VectorContinuousDomain,
domdims, item_params, resp, resp_vec, responses
using ..Responses
using ..Responses: concrete_response_type, function_xs, function_ys
using ..ConfigBase
using PsychometricsBazaarBase.ConfigTools
using PsychometricsBazaarBase.Integrators
using PsychometricsBazaarBase: Integrators
using PsychometricsBazaarBase.Optimizers
using PsychometricsBazaarBase.ConfigTools: @requiresome, @returnsome,
find1_instance, find1_type,
find1_type_sloppy
using PsychometricsBazaarBase.Integrators: Integrators,
BareIntegrationResult,
FixedGridIntegrator, IntReturnType,
IntValue, Integrator,
PreallocatedFixedGridIntegrator,
normdenom
using PsychometricsBazaarBase.Optimizers: OneDimOptimOptimizer, Optimizer
using PsychometricsBazaarBase.ConstDistributions: std_normal, std_mv_normal

import FittedItemBanks
Expand Down
5 changes: 2 additions & 3 deletions src/decision_tree/DecisionTree.jl
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
module DecisionTree

using Mmap
using Mmap: mmap

using ComputerAdaptiveTesting.ConfigBase: CatConfigBase
using ComputerAdaptiveTesting.PushVectors
using ComputerAdaptiveTesting.NextItemRules
using ComputerAdaptiveTesting.Aggregators
using ComputerAdaptiveTesting.Responses: BareResponses, Response
using FittedItemBanks
using FittedItemBanks.DummyData: std_mv_normal
using FittedItemBanks: AbstractItemBank, BooleanResponse, ResponseType

# TODO: Remove ability tracking from here?
Base.@kwdef struct AgendaItem
Expand Down
4 changes: 2 additions & 2 deletions src/hacks.jl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ function moneypatch_broadcast()
methods(Base.Broadcast._broadcast_getindex)...,
methods(Base.Broadcast.materialize)...,
methods(Base.Broadcast.materialize!)...,
methods(Base.Broadcast.copy)...,
methods(Base.Broadcast.copyto!)...,
methods(Base.copy)...,
methods(Base.copyto!)...,
methods(Base.getindex)...
]
m.recursion_relation = function (method1, method2, parent_sig, new_sig)
Expand Down
25 changes: 14 additions & 11 deletions src/next_item_rules/NextItemRules.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,28 @@ Springer, New York, NY.
"""
module NextItemRules

using Accessors
using DocStringExtensions
using Reexport
using PsychometricsBazaarBase.Parameters
using LinearAlgebra
using Random
using DocStringExtensions: FUNCTIONNAME, TYPEDEF, TYPEDFIELDS
using PsychometricsBazaarBase.Parameters: @with_kw
using LinearAlgebra: det, tr
using Random: AbstractRNG, Xoshiro

using ..Responses: Response, BareResponses
using ..Responses: BareResponses
using ..ConfigBase
using PsychometricsBazaarBase.ConfigTools
using PsychometricsBazaarBase.ConfigTools: @requiresome, @returnsome,
find1_instance, find1_type
using PsychometricsBazaarBase.Integrators: Integrator
using PsychometricsBazaarBase: Integrators
import PsychometricsBazaarBase.IntegralCoeffs
using FittedItemBanks
using FittedItemBanks: item_params
using FittedItemBanks: AbstractItemBank, DiscreteDomain, DomainType,
ItemResponse, OneDimContinuousDomain, domdims, item_params,
resp, resp_vec, responses
using ..Aggregators
using ..Aggregators: covariance_matrix

using Distributions, Base.Threads, Base.Order, StaticArrays
using Distributions: logccdf, logcdf, pdf
using Base.Threads
using Base.Order
using StaticArrays: SVector
using ConstructionBase: constructorof
import ForwardDiff

Expand Down
4 changes: 2 additions & 2 deletions src/precompiles.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using PrecompileTools
using PrecompileTools: @compile_workload, @setup_workload

@setup_workload begin
using PsychometricsBazaarBase: Integrators
Expand Down Expand Up @@ -28,4 +28,4 @@ using PrecompileTools
Stateful.add_response!(cat, 1, 0)
Stateful.next_item(cat)
end
end
end
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ using Test
include("./dummy.jl")
using .Dummy

@testset "test" begin
@testset verbose=true "Test ComputerAdaptiveTesting.jl" begin
include("./aqua.jl")
include("./jet.jl")
include("./ability_estimator_1d.jl")
Expand Down
Loading