clean COPS test problems

Author: tmigot

src/Meta/bearing.jl

@@ -20,7 +20,8 @@ bearing_meta = Dict(
   :notes => raw"""
 Given observations of ns stages of a bearing species over n timesteps, 
 minimize the loss between the observation and the computed law of paraneters : growth, mortality and number of specimens (g,m,x) 
-
+""",
+  :origin_notes => raw"""
 This is problem 16 in the COPS (Version 3) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
@@ -32,9 +33,8 @@ Journal bearing problem
 Michael Merritt - Summer 2000
 COPS 2.0 - September 2000
 COPS 3.0 - November 2002
-COPS 3.1 - March 2004
+COPS 3.1 - March 2004  
 """,
-  :origin_notes => raw"""""",
   :reference => raw"""
 @techreport{DolanMore2004COPS,
   author       = {Dolan, Elizabeth D. and Mor{'e}, Jorge J.},

src/Meta/camshape.jl

@@ -20,22 +20,14 @@ camshape_meta = Dict(
   :notes => raw"""
 Maximize the area of the valve opening for one rotation of a convex cam 
 with constraints on the curvature and on the radius of the cam
-
+""",
+  :origin_notes => raw"""
 This is problem 3 in the COPS (Version 3) collection of 
 E. Dolan and J. More
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2004)
 
 classification LOR2-AN-V-V
-""",
-  :origin_notes => raw"""
-Problem :
-Maximize the area of the valve opening for one rotation of a convex cam 
-with constraints on the curvature and on the radius of the cam
-This is problem 4 in the COPS (Version 2) collection of 
-E. Dolan and J. More'
-see "Benchmarking Optimization Software with COPS"
-Argonne National Labs Technical Report ANL/MCS-246 (2000)
 SIF input: Nick Gould, November 2000
 classification LOR2-AN-V-V
 """,

src/Meta/catmix.jl

@@ -20,17 +20,19 @@ catmix_meta = Dict(
   :notes => raw"""
 Catalyst Mixing Problem
 Collocation formulation
-COPS 3.0 - November 2002
-COPS 3.1 - March 2004
-""",
-  :origin_notes => raw"""
-Problem :
+
 Determine the optimal mixing policy of two catalysts along the
 length of a tubular plug flow reactor involving several reactions
+""",
+  :origin_notes => raw"""
 This is problem 14 in the COPS (Version 2) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2000)
+
+COPS 3.0 - November 2002
+COPS 3.1 - March 2004
+
 SIF input: Nick Gould, November 2000
 classification OOR2-AN-V-V
 """,
@@ -44,7 +46,7 @@ classification OOR2-AN-V-V
   doi          = {10.2172/834714}
 }  
   """,
-  :lib => "CUTEst:CATMIX",
+  :lib => "CUTEst:CATMIX, COPS:14",
 )
 get_catmix_nvar(; n::Integer = default_nvar, kwargs...) = 23 * n + 2
 get_catmix_ncon(; n::Integer = default_nvar, kwargs...) = 20 * n + 2

src/Meta/chain.jl

@@ -22,22 +22,13 @@ Hanging Chain
 
 Find the chain (of uniform density) of length L suspended between two points with minimal
 potential energy.
-
+""",
+  :origin_notes => raw"""
 This is problem 4 in the COPS (Version 3) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2004)
 
-classification OOR2-AN-V-V
-""",
-  :origin_notes => raw"""
-Problem :
-Find the chain (of uniform density) of length L suspended between
-two points with minimal potential energy
-This is problem 3 in the COPS (Version 2) collection of 
-E. Dolan and J. More'
-see "Benchmarking Optimization Software with COPS"
-Argonne National Labs Technical Report ANL/MCS-246 (2000)
 SIF input: Nick Gould, November 2000
 classification OOR2-AN-V-V
 """,

src/Meta/channel.jl

@@ -18,30 +18,21 @@ channel_meta = Dict(
   :origin => :unknown,
   :url => "https://bitbucket.org/optrove/sif/src/master/CHANNEL.SIF",
   :notes => raw"""
-# Flow in a Channel
+Flow in a Channel
 
-# Analyze the flow of a fluid during injection into a long vertical channel
-
-#   This is problem 7 in the COPS (Version 3) collection of 
-#   E. Dolan and J. More'
-#   see "Benchmarking Optimization Software with COPS"
-#   Argonne National Labs Technical Report ANL/MCS-246 (2004)
-
-#   classification OOR2-AN-V-V
-  
-""",
-  :origin_notes => raw"""
-Problem :
 Analyse the flow of a fluid during injection into a long vertical channel,
 assuming that the flow is modelled by the boundary-value problem
 u'''' = R (u'u'' - u u''') t in [0,1]
 u(0) = 0, u(1) = 1, u'(0) = 0 = u'(1)
 where u is the potential function, u' is the tangential velocity of
 the field, and R is the Reynold's number
-This is problem 7 in the COPS (Version 2) collection of 
+""",
+  :origin_notes => raw"""
+This is problem 7 in the COPS (Version 3) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
-Argonne National Labs Technical Report ANL/MCS-246 (2000)
+Argonne National Labs Technical Report ANL/MCS-246 (2004)
+
 SIF input: Nick Gould, November 2000
 classification NOR2-AN-V-V
 """,

src/Meta/elec.jl

@@ -20,22 +20,13 @@ elec_meta = Dict(
   :notes => raw"""
 Given np electrons, find the equilibrium state distribution of minimal
 Columb potential of the electrons positioned on a conducting sphere
-
+""",
+  :origin_notes => raw"""
 This is problem 2 in the COPS (Version 3) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2004)
 
-classification OOR2-AN-V-V
-""",
-  :origin_notes => raw"""
-Problem :
-Given np electrons, find the equilibrium state distribution of minimal
-Columb potential of the electrons positioned on a conducting sphere
-This is problem 2 in the COPS (Version 2) collection of 
-E. Dolan and J. More'
-see "Benchmarking Optimization Software with COPS"
-Argonne National Labs Technical Report ANL/MCS-246 (2000)
 SIF input: Nick Gould, November 2000
 classification OOR2-AN-V-V
 """,

src/Meta/gasoil.jl

@@ -20,25 +20,26 @@ gasoil_meta = Dict(
   :notes => raw"""
 Catalytic Cracking of Gas Oil Problem
 Collocation formulation
-""",
-  :origin_notes => raw"""
-Michael Merritt - Summer 2000
-COPS 2.0 - September 2000
-COPS 3.0 - November 2002
-COPS 3.1 - March 2004  
-  ---
-Problem :
+
 Determine the reaction coefficients for the catalytic cracking of gas oil
 and other byproducts. The nonlinear model that describes the process is
 y_1' = - (theta_1 + theta_3 ) y_1^2
 y_2' = theta_1 y_1^2 + theta_2 y_2
 with given initial conditions. The problem is to minimize
 sum{i=1,20} || y(tau_i,theta) - z_i||^2
 where the z_i are concentration measurements for y at times tau_i (i=1,20)
+""",
+  :origin_notes => raw"""
 This is problem 12 in the COPS (Version 2) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2000)
+
+Michael Merritt - Summer 2000
+COPS 2.0 - September 2000
+COPS 3.0 - November 2002
+COPS 3.1 - March 2004  
+
 SIF input: Nick Gould, November 2000
 classification OOR2-AN-V-V
 """,
@@ -53,7 +54,7 @@ classification OOR2-AN-V-V
   }
     """,
 
-  :lib => "CUTEst:GASOIL",
+  :lib => "CUTEst:GASOIL, COPS:12",
 )
 get_gasoil_nvar(; n::Integer = default_nvar, kwargs...) = 26 * n + 3
 get_gasoil_ncon(; n::Integer = default_nvar, kwargs...) = 26 * n + 0

src/Meta/glider.jl

@@ -20,20 +20,21 @@ glider_meta = Dict(
   :notes => raw"""
 Hang Glider Problem
 Trapezoidal formulation
-""",
-  :origin_notes => raw"""
-David Bortz - Summer 1998
-COPS 2.0 - September 2000
-COPS 3.0 - November 2002
-COPS 3.1 - March 2004  
-  ---
-Problem :
+
 Maximize the final horizontal position of a hang glider in the presence
 of a thermal updraft.
+""",
+  :origin_notes => raw"""
 This is problem 11 in the COPS (Version 2) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2000)
+
+David Bortz - Summer 1998
+COPS 2.0 - September 2000
+COPS 3.0 - November 2002
+COPS 3.1 - March 2004  
+
 SIF input: Nick Gould, December 2000
 classification OOR2-AN-V-V
 """,
@@ -48,7 +49,7 @@ classification OOR2-AN-V-V
   }
     """,
 
-  :lib => "CUTEst:GLIDER",
+  :lib => "CUTEst:GLIDER, COPS:11",
 )
 get_glider_nvar(; n::Integer = default_nvar, kwargs...) = 5 * n + 6
 get_glider_ncon(; n::Integer = default_nvar, kwargs...) = 4 * n + 7

src/Meta/marine.jl

@@ -18,43 +18,23 @@ marine_meta = Dict(
   :origin => :unknown,
   :url => "https://bitbucket.org/optrove/sif/src/master/MARINE.SIF",
   :notes => raw"""
- Given observations of ns stages of a marine species over n timesteps, 
- minimize the loss between the observation and the computed law of paraneters : growth, mortality and number of specimens (g,m,x) 
-
-   This is problem 6 in the COPS (Version 3) collection of 
-   E. Dolan and J. More'
-   see "Benchmarking Optimization Software with COPS"
-   Argonne National Labs Technical Report ANL/MCS-246 (2004)
-
-   classification OOR2-AN-V-V
-
  Marine Population Dynamics Problem
  Collocation formulation
- Alexander S. Bondarenko - Summer 1998
- COPS 2.0 - September 2000
- COPS 3.0 - November 2002
- COPS 3.1 - March 2004  
+
+ Given observations of ns stages of a marine species over n timesteps, 
+ minimize the loss between the observation and the computed law of paraneters : growth, mortality and number of specimens (g,m,x) 
   """,
   :origin_notes => raw"""
-Problem :
-Given estimates of the abundance of the population of a marine
-spieces at each stage as a function of time, determine specific
-growth and mortality rates. Th emodel for the population dynamics
-of the n_e -stage population is 
-y_j' = g_j-1 y_j-1 - (m_j + g_j) y_j   (1 <= j <= n_e)
-where m_i and g_i are unknown mortality and growth rates at stage i
-with g_0 = 0 = g_n_e. This model assumes that the species eventually
-dies or grows into the next stage, with the implicit assumption that
-the species cannot skip a stage. Initial conditions for the differntial
-equation are unknown, since the stage abundance measurements at the
-initial time might also be contaminated with experimental error. The
-problem is to minimize the error between the observed and computed data,
-sum{i=1,nm} || y(tau_i,m,g) - z_i||^2
-where the z_i are stage abundance measurements.
-This is problem 6 in the COPS (Version 2) collection of 
+This is problem 6 in the COPS (Version 3) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
-Argonne National Labs Technical Report ANL/MCS-246 (2000)
+Argonne National Labs Technical Report ANL/MCS-246 (2004)
+
+Alexander S. Bondarenko - Summer 1998
+COPS 2.0 - September 2000
+COPS 3.0 - November 2002
+COPS 3.1 - March 2004  
+
 SIF input: Nick Gould, November 2000
 classification OOR2-AN-V-V
 """,

src/Meta/methanol.jl

@@ -18,15 +18,9 @@ methanol_meta = Dict(
   :origin => :unknown,
   :url => "https://bitbucket.org/optrove/sif/src/master/METHANOL.SIF",
   :notes => raw"""
- Methanol-to-Hydrocarbons Problem
- Collocation formulation
- Michael Merritt - Summer 2000
- COPS 2.0 - September 2000
- COPS 3.0 - November 2002
- COPS 3.1 - March 2004
-  """,
-  :origin_notes => raw"""
-Problem :
+Methanol-to-Hydrocarbons Problem
+Collocation formulation
+
 Determine the reaction coefficients for the conversion of methanol into
 various hydrocarbons. The nonlinear model that describes the process is
 y_1' = - (2 theta_2 + theta_3 + theta_4 - theta_1 y_2 / d ) y_1
@@ -36,10 +30,18 @@ where d = (theta_2 + theta_5) y_1 + y_2 and the theta_i are positive,
 with given initial conditions. The problem is to minimize
 sum{i=1,16} || y(tau_i,theta) - z_i||^2
 where the z_i are concentration measurements for y at times tau_i (i=1,16)
+  """,
+  :origin_notes => raw"""
 This is problem 13 in the COPS (Version 2) collection of 
 E. Dolan and J. More'
 see "Benchmarking Optimization Software with COPS"
 Argonne National Labs Technical Report ANL/MCS-246 (2000)
+
+Michael Merritt - Summer 2000
+COPS 2.0 - September 2000
+COPS 3.0 - November 2002
+COPS 3.1 - March 2004
+
 SIF input: Nick Gould, November 2000
 classification OOR2-AN-V-V
 """,
@@ -54,7 +56,7 @@ classification OOR2-AN-V-V
   }
     """,
 
-  :lib => "CUTEst:METHANOL",
+  :lib => "CUTEst:METHANOL, COPS:13",
 )
 get_methanol_nvar(; n::Integer = default_nvar, kwargs...) = 30 * n + 5
 get_methanol_ncon(; n::Integer = default_nvar, kwargs...) = 30 * n + 0