Skip to content

Commit ff6d56a

Browse files
authored
Move dummy_solver to src folder (#54)
* Move `dummy_solver` to src folder
1 parent 3b106e2 commit ff6d56a

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ uuid = "ff4d7338-4cf1-434d-91df-b86cb86fb843"
33
version = "0.3.2"
44

55
[deps]
6+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
67
NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
78
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
89

src/SolverCore.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
module SolverCore
22

33
# stdlib
4-
using Printf
4+
using LinearAlgebra, Printf
55

66
# our packages
77
using NLPModels
88

99
include("logger.jl")
1010
include("stats.jl")
1111
include("solver.jl")
12+
include("dummy_solver.jl")
1213

1314
end

test/runtests.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ using ADNLPModels, NLPModels
77
# stdlib
88
using LinearAlgebra, Logging, Test
99

10-
include("dummy_solver.jl")
11-
1210
include("test_logging.jl")
1311
include("test_stats.jl")
1412
include("test_callback.jl")

test/test_callback.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
set_status!(stats, :user)
77
end
88
end
9-
stats = dummy_solver(nlp, max_eval = 20, callback = callback)
9+
stats = SolverCore.dummy_solver(nlp, max_eval = 20, callback = callback)
1010
@test stats.iter == 3
1111
end

test/test_logging.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function test_logging()
1212

1313
with_logger(ConsoleLogger()) do
1414
@info "Testing dummy solver with logger"
15-
dummy_solver(nlps[1], max_eval = 20)
15+
SolverCore.dummy_solver(nlps[1], max_eval = 20)
1616
reset!.(nlps)
1717
end
1818
end

test/test_restart.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@testset "test restart" begin
22
nlp = ADNLPModel(x -> dot(x, x) / 2, ones(2), x -> [sum(x .^ 3) - 1], [0.0], [0.0])
3-
solver = DummySolver(nlp)
3+
solver = SolverCore.DummySolver(nlp)
44
stats = GenericExecutionStats(nlp)
55
solve!(solver, nlp, stats, verbose = false)
66
@test stats.status == :first_order

test/test_stats.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function test_stats()
6666
@testset "Testing Dummy Solver with multi-precision" begin
6767
for T in (Float16, Float32, Float64, BigFloat)
6868
nlp = ADNLPModel(x -> dot(x, x), ones(T, 2))
69-
solver = DummySolver(nlp)
69+
solver = SolverCore.DummySolver(nlp)
7070

7171
stats = with_logger(NullLogger()) do
7272
solve!(solver, nlp)
@@ -80,7 +80,7 @@ function test_stats()
8080
@test eltype(stats.multipliers_U) == T
8181

8282
nlp = ADNLPModel(x -> dot(x, x), ones(T, 2), x -> [sum(x) - 1], T[0], T[0])
83-
solver = DummySolver(nlp)
83+
solver = SolverCore.DummySolver(nlp)
8484
stats = GenericExecutionStats(nlp)
8585

8686
with_logger(NullLogger()) do

0 commit comments

Comments
 (0)