Skip to content

Commit

Permalink
update alpha schedule
Browse files Browse the repository at this point in the history
  • Loading branch information
chriscoey committed Apr 1, 2021
1 parent 6a5fcd5 commit 3f95237
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Solvers/search.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ mutable struct StepSearcher{T <: Real}
step_searcher.cone_order = collect(1:length(cones))
step_searcher.min_nbhd = T(0.01) # TODO tune
step_searcher.max_nbhd = T(0.99) # TODO tune, maybe should be different for cones without third order correction
step_searcher.alpha_sched = T[0.9999, 0.999, 0.99, 0.97, 0.95, 0.9, 0.85, 0.8, 0.7, 0.6, 0.5, 0.3, 0.1] # TODO tune
step_searcher.alpha_sched = T[0.9999, 0.999, 0.99, 0.97, 0.95, 0.9, 0.85, 0.8, 0.7, 0.6, 0.5, 0.3, 0.1, 0.05, 0.01, 0.005, 0.001, 0.0005] # TODO tune
step_searcher.prev_sched = 0
return step_searcher
end
Expand Down
2 changes: 1 addition & 1 deletion test/runconetests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ real_types = [
end
end

println("\nstarting allocation tests")
println("\nstarting time/allocation measurements")
@testset "allocation tests" begin
real_types = [
Float64,
Expand Down
8 changes: 4 additions & 4 deletions test/runexamplestests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ script_verbose = false

# default options to solvers
default_options = (
verbose = false,
# verbose = true,
# verbose = false,
verbose = true,
default_tol_relax = 10,
# stepper = Solvers.CombinedStepper{Float64}(),
# stepper = Solvers.PredOrCentStepper{Float64}(),
Expand All @@ -27,7 +27,7 @@ instance_sets = [
("minimal", Float64, 60),
# ("minimal", Float32, 60),
# ("minimal", BigFloat, 60),
# ("fast", Float64, 60),
("fast", Float64, 60),
# ("slow", Float64, 120),
]

Expand Down Expand Up @@ -100,7 +100,7 @@ for (inst_set, real_T, time_limit) in instance_sets
new_default_options = (; default_options..., time_limit = time_limit)
ex_type_T = ex_type{real_T}

println("\nstarting $ex_type_T $inst_set tests")
println("\nstarting $ex_type_T $inst_set tests\n")
@testset "$ex_type_T $inst_set" begin
run_instance_set(inst_subset, ex_type_T, info_perf, new_default_options, script_verbose, perf, results_path)
end
Expand Down

0 comments on commit 3f95237

Please sign in to comment.