Skip to content

Commit

Permalink
Merge 2e04012 into e293b7b
Browse files Browse the repository at this point in the history
  • Loading branch information
bjarthur committed Mar 15, 2020
2 parents e293b7b + 2e04012 commit 3903eb3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
9 changes: 9 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name = "OptimBase"
uuid = "87e2bd06-a317-5318-96d9-3ecbac512eee"

[deps]
NLSolversBase = "d41bc354-129a-5804-8e4c-c37616107c6c"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
julia = "0.7, 1"
1 change: 0 additions & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
julia 0.7
Reexport
NLSolversBase
Compat 0.18
1 change: 0 additions & 1 deletion src/OptimBase.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module OptimBase

using Compat
using Reexport
using Printf
@reexport using NLSolversBase
Expand Down
6 changes: 3 additions & 3 deletions src/types.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@compat abstract type Optimizer end
abstract type Optimizer end
function print_header(method::Optimizer)
@printf "Iter Function value Gradient norm \n"
end
Expand Down Expand Up @@ -65,7 +65,7 @@ function Base.show(io::IO, t::OptimizationState)
return
end

@compat OptimizationTrace{T} = Vector{OptimizationState{T}}
OptimizationTrace{T} = Vector{OptimizationState{T}}
function Base.show(io::IO, tr::OptimizationTrace)
@printf io "Iter Function value Gradient norm \n"
@printf io "------ -------------- --------------\n"
Expand All @@ -75,7 +75,7 @@ function Base.show(io::IO, tr::OptimizationTrace)
return
end

@compat abstract type OptimizationResults end
abstract type OptimizationResults end
mutable struct UnivariateOptimizationResults{T,O<:Optimizer} <: OptimizationResults
method::O
initial_lower::T
Expand Down

0 comments on commit 3903eb3

Please sign in to comment.