Skip to content

Commit f382f9c

Browse files
antoine-levittanriseth
authored andcommitted
vector -> array (#55)
1 parent 32f5337 commit f382f9c

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

src/backtracking.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ end
2323

2424

2525
function _backtracking!{T}(df,
26-
x::Vector{T},
27-
s::Vector,
28-
x_scratch::Vector,
26+
x::Array{T},
27+
s::Array{T},
28+
x_scratch::Array{T},
2929
lsr::LineSearchResults,
3030
alpha::Real = 1.0,
3131
mayterminate::Bool = false,

src/basic.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ end
1414
_static!(df, x, s, x_scratch, lsr, ls.alpha, mayterminate)
1515

1616
function _static!{T}(df,
17-
x::Vector{T},
18-
s::Vector,
19-
x_scratch::Vector,
17+
x::Array{T},
18+
s::Array{T},
19+
x_scratch::Array{T},
2020
lsr::LineSearchResults,
2121
alpha::Real = 1.0,
2222
mayterminate::Bool = false)

src/hagerzhang.jl

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ end
8080

8181
function _hagerzhang!{T}(df,
8282
x::Array{T},
83-
s::Array,
84-
xtmp::Array,
83+
s::Array{T},
84+
xtmp::Array{T},
8585
lsr::LineSearchResults{T},
8686
c::Real,
8787
mayterminate::Bool,

src/morethuente.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,9 @@ end
148148
stpmax=ls.stpmax, maxfev=ls.maxfev)
149149

150150
function _morethuente!{T}(df,
151-
x::Vector,
152-
s::Vector,
153-
x_new::Vector,
151+
x::Array{T},
152+
s::Array{T},
153+
x_new::Array{T},
154154
lsr::LineSearchResults{T},
155155
stp::Real,
156156
mayterminate::Bool;

src/strongwolfe.jl

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ end
2424
_strongwolfe!(args...; c1=ls.c1, c2=ls.c2, rho=ls.rho)
2525

2626
function _strongwolfe!{T}(df,
27-
x::Vector,
28-
p::Vector,
29-
x_new::Vector,
27+
x::Array{T},
28+
p::Array{T},
29+
x_new::Array{T},
3030
lsr::LineSearchResults{T},
3131
alpha0::Real,
3232
mayterminate::Bool;
@@ -107,9 +107,9 @@ function zoom(a_lo::Real,
107107
phiprime_0::Real,
108108
phi_0::Real,
109109
df,
110-
x::Vector,
111-
p::Vector,
112-
x_new::Vector,
110+
x::Array,
111+
p::Array,
112+
x_new::Array,
113113
c1::Real = 1e-4,
114114
c2::Real = 0.9)
115115

0 commit comments

Comments
 (0)