Skip to content

Commit 4d1e1ad

Browse files
author
Frankie Robertson
committed
Vendorize version of Parameters.jl with @kw_only
See: mauro3/Parameters.jl#147
1 parent 4a86ceb commit 4d1e1ad

File tree

6 files changed

+750
-6
lines changed

6 files changed

+750
-6
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Mmap = "a63ad114-7e13-5084-954f-fe012c677804"
2424
MonteCarloIntegration = "4886b29c-78c9-11e9-0a6e-41e1f4161f7b"
2525
NLSolversBase = "d41bc354-129a-5804-8e4c-c37616107c6c"
2626
Optim = "429524aa-4258-5aef-a3af-852621145aeb"
27-
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
27+
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
2828
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
2929
QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
3030
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -39,6 +39,7 @@ StatFiles = "1463e38c-9381-5320-bcd4-4134955f093a"
3939
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
4040
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
4141
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
42+
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
4243

4344
[compat]
4445
ArgParse = "1"
@@ -57,7 +58,6 @@ MacroTools = "0.5"
5758
Measurements = "2"
5859
NLSolversBase = "7"
5960
Optim = "1"
60-
Parameters = "0.12"
6161
QuadGK = "2.5.0"
6262
Reexport = "1"
6363
Requires = "1"

src/CatConfig.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module CatConfig
22

33
export CatRules, CatLoopConfig
44

5-
using Parameters
5+
using ComputerAdaptiveTesting.Parameters
66

77
using ..Aggregators: AbilityEstimator, AbilityTracker, NullAbilityTracker
88
using ..NextItemRules: NextItemRule
@@ -21,7 +21,7 @@ needed to actually run the CAT.
2121
This may be more a more convenient layer to integrate than CatLoopConfig if you
2222
want to write your own CAT loop rather than using hooks.
2323
"""
24-
@with_kw struct CatRules <: CatConfigBase
24+
@kw_only struct CatRules <: CatConfigBase
2525
"""
2626
The rule to choose the next item in the CAT given the current state.
2727
"""

src/ComputerAdaptiveTesting.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ export ExtraDistributions, IntegralCoeffs, Integrators, Interpolators, Optimizer
77
export ConfigBase, Responses, ItemBanks, Aggregators, NextItemRules, TerminationConditions
88
export CatConfig, Sim, DummyData
99

10+
# Vendored dependencies
11+
include("./vendor/Parameters.jl")
12+
1013
# Config base
1114
include("./ConfigBase.jl")
1215

src/maths/Optimizers.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export
5454
using ..ConfigBase
5555

5656
using Optim
57-
using Parameters
57+
using ComputerAdaptiveTesting.Parameters
5858

5959
abstract type Optimizer end
6060
function Optimizer(bits...)

src/next_item_rules/NextItemRules.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Springer, New York, NY.
1111
module NextItemRules
1212

1313
using Reexport
14-
using Parameters
14+
using ComputerAdaptiveTesting.Parameters
1515
using LinearAlgebra
1616

1717
using ..Responses: Response

0 commit comments

Comments
 (0)