Skip to content
Snippets Groups Projects
Unverified Commit 13e1088c authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

maximise slew rate if it does not conflict with user directives

parent c2f7ede6
No related branches found
No related tags found
1 merge request!4Resolve "Add secondary objective function"
...@@ -6,7 +6,7 @@ module Trapezoids ...@@ -6,7 +6,7 @@ module Trapezoids
import JuMP: @constraint import JuMP: @constraint
import StaticArrays: SVector import StaticArrays: SVector
import LinearAlgebra: norm import LinearAlgebra: norm
import ...Variables: variables, @defvar, scanner_constraints!, get_free_variable, set_simple_constraints!, gradient_orientation, VariableType, get_gradient, get_pulse, get_readout, adjustable, adjust_internal, apply_simple_constraint! import ...Variables: variables, @defvar, scanner_constraints!, get_free_variable, set_simple_constraints!, gradient_orientation, VariableType, get_gradient, get_pulse, get_readout, adjustable, adjust_internal, apply_simple_constraint!, add_cost_function!
import ...Components: ChangingGradient, ConstantGradient, RFPulseComponent, ADC import ...Components: ChangingGradient, ConstantGradient, RFPulseComponent, ADC
import ...Containers: BaseBuildingBlock import ...Containers: BaseBuildingBlock
...@@ -89,6 +89,7 @@ function (::Type{Trapezoid})(; orientation=nothing, rise_time=nothing, flat_time ...@@ -89,6 +89,7 @@ function (::Type{Trapezoid})(; orientation=nothing, rise_time=nothing, flat_time
apply_simple_constraint!(res.flat_time, :>=, 0) apply_simple_constraint!(res.flat_time, :>=, 0)
apply_simple_constraint!(res.rise_time, :>=, 0) apply_simple_constraint!(res.rise_time, :>=, 0)
add_cost_function!(-res.slew_rate)
scanner_constraints!(res) scanner_constraints!(res)
return res return res
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment