Skip to content

Commit b30294d

Browse files
author
Frankie Robertson
committed
Remove broken EnumerationOptimizer for now
1 parent 63d5a13 commit b30294d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/aggregators/Aggregators.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ export PointAbilityEstimator, PriorAbilityEstimator, LikelihoodAbilityEstimator
3434
export ModeAbilityEstimator, MeanAbilityEstimator
3535
export Speculator, replace_speculation!, normdenom, maybe_tracked_ability_estimate
3636
export AbilityIntegrator, AbilityOptimizer
37-
export FunctionOptimizer, EnumerationOptimizer, FunctionIntegrator
37+
export FunctionOptimizer, FunctionIntegrator
3838
export DistributionAbilityEstimator
3939
export variance, variance_given_mean, mean_1d
4040
export RiemannEnumerationIntegrator
41+
# export EnumerationOptimizer
4142

4243
# Basic types
4344
# XXX: Does having a common supertype of DistributionAbilityEstimator and PointAbilityEstimator make sense?
@@ -129,10 +130,10 @@ end
129130
abstract type AbilityOptimizer end
130131
function AbilityOptimizer(bits...; ability_estimator = nothing)
131132
@returnsome find1_instance(AbilityOptimizer, bits)
132-
zero_arg_optimizers = find1_type(EnumerationOptimizer, bits)
133+
#=zero_arg_optimizers = find1_type(EnumerationOptimizer, bits)
133134
if (zero_arg_optimizers !== nothing)
134135
return EnumerationOptimizer()
135-
end
136+
end=#
136137
@returnsome Optimizer(bits...) optimizer->FunctionOptimizer(optimizer)
137138
end
138139

src/aggregators/optimizers.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ function (optim::FunctionOptimizer)(f::F,
1010
optim.optim(comp_f)
1111
end
1212

13+
#=
1314
"""
1415
Argmax + max over the ability likihood given a set of responses with a given
1516
coefficient using exhaustive search.
@@ -40,6 +41,7 @@ function (optim::EnumerationOptimizer)(f::F,
4041
end
4142
(cur_argmax[], cur_max[])
4243
end
44+
=#
4345

4446
function (optim::AbilityOptimizer)(f::F,
4547
est,

0 commit comments

Comments
 (0)