Merge branch 'develop' into 'master'

Develop

See merge request ct/gallery!235

examples/bacteria/naiveproblem.def

+# Definition file
+
+# Dimensions
+dim.state 4
+dim.control 1
+dim.boundaryconditions 4
+dim.pathconstraints 0
+dim.parameters 0
+dim.constants 4
+
+# Time interval
+initial.time 0
+final.time 20
+
+# Constants
+constant.0 0.6
+constant.1 0.003
+constant.2 0.5
+constant.3 0.07
+
+# Time discretisation
+ode.discretization midpoint_implicit
+time.steps 200 
+
+# Bounds for constraints (initial conditions for our case)
+boundarycond.0.lowerbound 0.03
+boundarycond.0.upperbound 0.03
+boundarycond.1.lowerbound 0.1
+boundarycond.1.upperbound 0.1
+boundarycond.2.lowerbound 0.2
+boundarycond.2.upperbound 0.2
+boundarycond.3.lowerbound 0.003
+boundarycond.3.upperbound 0.003
+
+# Bounds for variables (dynamical bound for each variable and control)
+state.0.lowerbound 0
+state.1.lowerbound 0
+state.2.lowerbound 0
+state.3.lowerbound 0
+#Optimal value calculated for our initial conditions
+control.0.lowerbound 0.4679139313552532 
+control.0.upperbound 0.4679139313552532
+
+# Initialization for discretized problem (initial point for the optimization algorithm.. this we can touch only if the algorithm is not working, otherwise we can leave it like this)
+state.0.init 0.1
+state.1.init 0.1
+state.2.init 0.1
+state.3.init 0.1 
+control.0.init 0.4679139313552532 
+
+# Ipopt
+ipoptIntOption.print_level 5
+ipoptIntOption.max_iter 1000
+ipoptStrOption.mu_strategy adaptive
+ipoptNumOption.tol 1e-12
+
+# Misc
+ad.retape 0

examples/bacteria/problem1.def

+# Definition file
+
+# Dimensions
+dim.state 4
+dim.control 1
+dim.boundaryconditions 4
+dim.pathconstraints 0
+dim.parameters 0
+dim.constants 4
+
+# Time interval
+initial.time 0
+final.time 20
+
+# Constants
+constant.0 0.6
+constant.1 0.003
+constant.2 0.5
+constant.3 0.07
+
+# Time discretisation
+ode.discretization midpoint_implicit
+time.steps 200
+
+# Bounds for constraints (initial conditions for our case)
+boundarycond.0.lowerbound 0.03
+boundarycond.0.upperbound 0.03
+boundarycond.1.lowerbound 0.1
+boundarycond.1.upperbound 0.1
+boundarycond.2.lowerbound 0.2
+boundarycond.2.upperbound 0.2
+boundarycond.3.lowerbound 0.003
+boundarycond.3.upperbound 0.003
+
+# Bounds for variables (dynamical bound for each variable and control)
+state.0.lowerbound 0
+state.1.lowerbound 0
+state.2.lowerbound 0
+state.3.lowerbound 0 
+control.0.lowerbound 0
+control.0.upperbound 1 
+
+# Initialization for discretized problem (initial point for the optimization algorithm.. this we can touch only if the algorithm is not working, otherwise we can leave it like this)
+state.0.init 0.1
+state.1.init 0.1
+state.2.init 0.1
+state.3.init 0.1 
+control.0.init 0.5
+
+# Ipopt
+ipoptIntOption.print_level 5
+ipoptIntOption.max_iter 1000
+ipoptStrOption.mu_strategy adaptive
+ipoptNumOption.tol 1e-12
+
+# Misc
+ad.retape 0