Skip to content

Commit 30968a4

Browse files
tmigottmigot
committed
fix conflict
1 parent bdc9424 commit 30968a4

7 files changed

Lines changed: 70 additions & 34 deletions

File tree

‎src/Meta/pinene.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ COPS 3.1 - March 2004
4141
doi = {10.2172/834714}
4242
}
4343
""",
44-
4544
)
45+
get_pinene_nvar(; n::Integer = default_nvar, kwargs...) = 50 * n + 5
4646
get_pinene_ncon(; n::Integer = default_nvar, kwargs...) = 50 * n + 0
4747
get_pinene_nlin(; n::Integer = default_nvar, kwargs...) = 35 * n + 0
4848
get_pinene_nnln(; n::Integer = default_nvar, kwargs...) = 15 * n + 0

‎src/Meta/toint.jl‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,29 @@ toint_meta = Dict(
1616
:is_feasible => true,
1717
:defined_everywhere => missing,
1818
:origin => :unknown,
19+
:url => "https://www.researchgate.net/publication/325314400_Sparse_Test_Problems_for_Unconstrained_Optimization",
20+
:notes => raw"""
21+
Toint trigonometric function
22+
""",
23+
:origin_notes => raw"""
24+
Problem 10 in
25+
L. Luksan, C. Matonoha and J. Vlcek
26+
Sparse Test Problems for Unconstrained Optimization,
27+
Technical Report 1064,
28+
Institute of Computer Science,
29+
Academy of Science of the Czech Republic
30+
""",
31+
:reference => raw"""
32+
@techreport{LuksanMatonohaVlcek2003,
33+
author = {Luksan, Ladislav and Matonoha, Cestmir and Vlcek, Jan},
34+
title = {Modified {CUTE} Problems for Sparse Unconstrained Optimization},
35+
institution = {Institute of Computer Science, Academy of Sciences of the Czech Republic},
36+
number = {1081},
37+
year = {2003},
38+
address = {Prague, Czech Republic},
39+
url = {http://www.cs.cas.cz/matonoha/download/V1081.pdf},
40+
}
41+
""",
1942
)
2043

2144
get_toint_nvar(; n::Integer = default_nvar, kwargs...) = n

‎src/Meta/trig.jl‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,29 @@ trig_meta = Dict(
1616
:is_feasible => true,
1717
:defined_everywhere => missing,
1818
:origin => :unknown,
19+
:url => "",
20+
:notes => raw"""
21+
Another trigonometric function
22+
""",
23+
:origin_notes => raw"""
24+
Problem 9 in
25+
L. Luksan, C. Matonoha and J. Vlcek
26+
Sparse Test Problems for Unconstrained Optimization,
27+
Technical Report 1064,
28+
Institute of Computer Science,
29+
Academy of Science of the Czech Republic
30+
""",
31+
:reference => raw"""
32+
@techreport{LuksanMatonohaVlcek2003,
33+
author = {Luksan, Ladislav and Matonoha, Cestmir and Vlcek, Jan},
34+
title = {Modified {CUTE} Problems for Sparse Unconstrained Optimization},
35+
institution = {Institute of Computer Science, Academy of Sciences of the Czech Republic},
36+
number = {1081},
37+
year = {2003},
38+
address = {Prague, Czech Republic},
39+
url = {http://www.cs.cas.cz/matonoha/download/V1081.pdf},
40+
}
41+
""",
1942
)
2043

2144
get_trig_nvar(; n::Integer = default_nvar, kwargs...) = n

‎src/Meta/trigb.jl‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,29 @@ trigb_meta = Dict(
1616
:is_feasible => true,
1717
:defined_everywhere => missing,
1818
:origin => :unknown,
19+
:url => "",
20+
:notes => raw"""
21+
Banded trigonometric problem
22+
""",
23+
:origin_notes => raw"""
24+
Problem 16 in
25+
L. Luksan, C. Matonoha and J. Vlcek
26+
Sparse Test Problems for Unconstrained Optimization,
27+
Technical Report 1064,
28+
Institute of Computer Science,
29+
Academy of Science of the Czech Republic
30+
""",
31+
:reference => raw"""
32+
@techreport{LuksanMatonohaVlcek2003,
33+
author = {Luksan, Ladislav and Matonoha, Cestmir and Vlcek, Jan},
34+
title = {Modified {CUTE} Problems for Sparse Unconstrained Optimization},
35+
institution = {Institute of Computer Science, Academy of Sciences of the Czech Republic},
36+
number = {1081},
37+
year = {2003},
38+
address = {Prague, Czech Republic},
39+
url = {http://www.cs.cas.cz/matonoha/download/V1081.pdf},
40+
}
41+
""",
1942
)
2043

2144
get_trigb_nvar(; n::Integer = default_nvar, kwargs...) = n

‎src/PureJuMP/toint.jl‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# Toint trigonometric function
2-
#
3-
# Problem 10 in
4-
# L. Luksan, C. Matonoha and J. Vlcek
5-
# Sparse Test Problems for Unconstrained Optimization,
6-
# Technical Report 1064,
7-
# Institute of Computer Science,
8-
# Academy of Science of the Czech Republic
9-
#
10-
# https://www.researchgate.net/publication/325314400_Sparse_Test_Problems_for_Unconstrained_Optimization
11-
#
121
export toint
132

143
function toint(args...; n::Int = default_nvar, kwargs...)

‎src/PureJuMP/trig.jl‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# Another trigonometric function
2-
#
3-
# Problem 9 in
4-
# L. Luksan, C. Matonoha and J. Vlcek
5-
# Sparse Test Problems for Unconstrained Optimization,
6-
# Technical Report 1064,
7-
# Institute of Computer Science,
8-
# Academy of Science of the Czech Republic
9-
#
10-
# https://www.researchgate.net/publication/325314400_Sparse_Test_Problems_for_Unconstrained_Optimization
11-
#
121
export trig
132

143
function trig(args...; n::Int = default_nvar, kwargs...)

‎src/PureJuMP/trigb.jl‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
## Banded trigonometric problem
2-
#
3-
# Problem 16 in
4-
# L. Luksan, C. Matonoha and J. Vlcek
5-
# Sparse Test Problems for Unconstrained Optimization,
6-
# Technical Report 1064,
7-
# Institute of Computer Science,
8-
# Academy of Science of the Czech Republic
9-
#
10-
# https://www.researchgate.net/publication/325314400_Sparse_Test_Problems_for_Unconstrained_Optimization
11-
#
121
export trigb
132

143
function trigb(args...; n::Int = default_nvar, kwargs...)

0 commit comments

Comments
 (0)