Fix deprecations (#14)

Author: femtocleaner[bot]

src/optim_tests/multivariate/more_testing.jl

@@ -69,7 +69,7 @@ function _extrosenbrockproblem(N::Int;
                         zero(T),
                         true,
                         false,
-                        MatVecHolder(Array{T}(0,0),similar(initial_x)))
+                        MatVecHolder(Array{T}(undef, 0,0),similar(initial_x)))
 end
 
 examples["Extended Rosenbrock"] = _extrosenbrockproblem(100)
@@ -162,7 +162,7 @@ function _extpowellproblem(N::Int;
                         zero(T),
                         true,
                         false,
-                        MatVecHolder(Array{T}(0,0),similar(initial_x)))
+                        MatVecHolder(Array{T}(undef, 0,0),similar(initial_x)))
 end
 
 examples["Extended Powell"] = _extpowellproblem(100)
@@ -239,7 +239,7 @@ function _penfunIproblem(N::Int;
                         fsol,
                         true,
                         false,
-                        ParaboloidStruct(Array{T}(0,0),Array{T}(0),
+                        ParaboloidStruct(Array{T}(undef, 0,0),Array{T}(undef, 0),
                                          similar(initial_x), alpha))
 end
 
@@ -307,7 +307,7 @@ function _trigonometricproblem(N::Int;
                         zero(T),
                         true,
                         false,
-                        MatVecHolder(Array{T}(0,0),similar(initial_x)))
+                        MatVecHolder(Array{T}(undef, 0,0),similar(initial_x)))
 end
 
 examples["Trigonometric"] = _trigonometricproblem(100)

src/optim_tests/multivariate/multivariate.jl

@@ -16,8 +16,8 @@ struct ConstraintData{F,J,H,Tx,Tc}
     uc::Vector{Tc}
 end
 
-immutable OptimizationProblem{P, Tfg, Tf <: Real, TS <: AbstractString,
-                              CT <:  Union{Void,ConstraintData}}
+struct OptimizationProblem{P, Tfg, Tf <: Real, TS <: AbstractString,
+                           CT <:  Union{Nothing,ConstraintData}}
     name::TS
     f::Function
     g!::Function
@@ -37,7 +37,7 @@ OptimizationProblem(name::AbstractString,
                     g!::Function,
                     fg!::Tfg,
                     h!::Function,
-                    constraints::Union{Void,ConstraintData},
+                    constraints::Union{Nothing,ConstraintData},
                     initial_x::Vector,
                     solutions::Vector,
                     minimum::Tf,
@@ -49,24 +49,24 @@ OptimizationProblem(name::AbstractString,
                                             istwicedifferentiable,
                                             nothing)
 
-objective(p::OptimizationProblem{P}) where P<:Void = p.f
-gradient(p::OptimizationProblem{P}) where P<:Void = p.g!
-objective_gradient(p::OptimizationProblem{P}) where P<:Void = p.fg!
-hessian(p::OptimizationProblem{P}) where P<:Void = p.h!
+objective(p::OptimizationProblem{P}) where P<:Nothing = p.f
+gradient(p::OptimizationProblem{P}) where P<:Nothing = p.g!
+objective_gradient(p::OptimizationProblem{P}) where P<:Nothing = p.fg!
+hessian(p::OptimizationProblem{P}) where P<:Nothing = p.h!
 
 objective(p::OptimizationProblem{P}) where P = x-> p.f(x,p.parameters)
 gradient(p::OptimizationProblem{P}) where P = (out,x)-> p.g!(out,x,p.parameters)
 objective_gradient(p::OptimizationProblem{P}) where P = (out,x)-> p.fg!(out,x,p.parameters)
 hessian(p::OptimizationProblem{P}) where P = (out,x)-> p.h!(out,x,p.parameters)
 
-function objective_gradient(p::OptimizationProblem{P,Tfg}) where P where Tfg <: Void
+function objective_gradient(p::OptimizationProblem{P,Tfg}) where P where Tfg <: Nothing
     (out,x) -> begin
         gradient(p)(out,x)
         return objective(p)(x)
     end
 end
 
-function objective_gradient(p::OptimizationProblem{P,Tfg}) where P <: Void where Tfg <: Void
+function objective_gradient(p::OptimizationProblem{P,Tfg}) where P <: Nothing where Tfg <: Nothing
     (out,x) -> begin
         gradient(p)(out,x)
         return objective(p)(x)

src/optim_tests/multivariate/quad_transforms.jl

@@ -26,8 +26,8 @@ function quad_hessian!(storage::Matrix, x::Vector, param)
     storage .= param.mat
 end
 
-immutable MatVecHolder{Tv <: AbstractVector,
-                       Tm <: AbstractArray}
+struct MatVecHolder{Tv <: AbstractVector,
+                    Tm <: AbstractArray}
     mat::Tm
     vec::Tv
 end
@@ -58,7 +58,7 @@ examples["Quadratic Diagonal"] = _quadraticproblem(100)
 # Paraboloid. Similar to Rosenbrock
 #######################
 
-immutable ParaboloidStruct{T, Tm <: AbstractArray{T,2},
+struct ParaboloidStruct{T, Tm <: AbstractArray{T,2},
                            Tv <: AbstractArray{T}} <: Any where T<:Number
     mat::Tm
     vec::Tv

src/optim_tests/univariate/bounded.jl

@@ -4,7 +4,7 @@ module UnivariateProblems
     ###
     ### [1]  http://infinity77.net/global_optimization/test_functions_1d.html
 
-    immutable UnivariateProblem
+    struct UnivariateProblem
         name::AbstractString
         f::Function
         bounds::Vector{Float64}

test/runtests.jl

@@ -1,7 +1,7 @@
 using OptimTestProblems
 using OptimTestProblems.MultivariateProblems
 
-using Base.Test
+using Test
 
 verbose = false