Skip to content

Commit 410e0cc

Browse files
geoffroylecontedpo
authored andcommitted
remove x0
1 parent 2dedd7d commit 410e0cc

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/qp_rand_model.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export qp_rand_model
22
using .QuadraticModels
33

44
"""
5-
model, x0 = qp_rand_model(n; dens = 1.0e-4, convex = false)
5+
model = qp_rand_model(n; dens = 1.0e-4, convex = false)
66
77
Return an instance of a `QuadraticModel` representing
88
@@ -16,20 +16,19 @@ with H = A + A' or H = A * A' (see the `convex` keyword argument) where A is a r
1616
1717
## Keyword arguments
1818
19-
* `dens :: Real`: density of `A`` used to generate the quadratic model (default: `1.0e-4`).
19+
* `dens :: Real`: density of `A` with `0 < dens ≤ 1` used to generate the quadratic model (default: `1.0e-4`).
2020
* `convex :: Bool`: true to generate positive definite `H` (default: `false`).
2121
2222
## Return Value
2323
2424
An instance of a `QuadraticModel`.
2525
"""
2626
function qp_rand_model(n::Int; dens::R = 1.0e-4, convex::Bool = false) where {R <: Real}
27+
@assert 0 < dens 1
2728
A = sprandn(R, n, n, dens)
2829
H = convex ? (A * A') : (A + A')
2930
c = randn(R, n)
3031
l = -one(R) .- rand(R, n)
3132
u = one(R) .+ rand(R, n)
32-
qp = QuadraticModel(c, H; lvar = l, uvar = u)
33-
x0 = zeros(R, n)
34-
qp, x0
33+
QuadraticModel(c, H; lvar = l, uvar = u, x0 = zeros(R, n))
3534
end

test/runtests.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@ end
154154

155155
@testset "QP-rand" begin
156156
n, dens = 100, 0.1
157-
model, x0 = qp_rand_model(n; dens = dens, convex = false)
157+
model = qp_rand_model(n; dens = dens, convex = false)
158158
@test all(-2.0 .≤ model.meta.lvar .≤ 0.0)
159159
@test all(0.0 .≤ model.meta.uvar .≤ 2.0)
160-
@test all(model.meta.x0 .== x0)
160+
@test all(model.meta.x0 .== 0)
161161

162-
model, x0 = qp_rand_model(n; dens = dens, convex = true)
162+
model = qp_rand_model(n; dens = dens, convex = true)
163163
@test all(-2.0 .≤ model.meta.lvar .≤ 0.0)
164164
@test all(0.0 .≤ model.meta.uvar .≤ 2.0)
165-
@test all(model.meta.x0 .== x0)
165+
@test all(model.meta.x0 .== 0)
166166
end

0 commit comments

Comments
 (0)