Skip to content
Snippets Groups Projects
Verified Commit 2f70e137 authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

Rename global_model to solve_model

parent 591439e6
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ Builds and optimises NMR/MRI sequences. ...@@ -3,7 +3,7 @@ Builds and optimises NMR/MRI sequences.
""" """
module MRIBuilder module MRIBuilder
include("global_model.jl") include("solve_model.jl")
include("scanners.jl") include("scanners.jl")
include("variables.jl") include("variables.jl")
include("building_blocks.jl") include("building_blocks.jl")
...@@ -14,7 +14,7 @@ include("gradients/gradients.jl") ...@@ -14,7 +14,7 @@ include("gradients/gradients.jl")
include("pulses/pulses.jl") include("pulses/pulses.jl")
include("readouts/readouts.jl") include("readouts/readouts.jl")
import .GlobalModel: set_model import .SolveModel: set_model
export set_model export set_model
import .Scanners: Scanner, B0, Siemens_Connectom, Siemens_Prisma, Siemens_Terra import .Scanners: Scanner, B0, Siemens_Connectom, Siemens_Prisma, Siemens_Terra
......
module Sequences module Sequences
import JuMP: Model import JuMP: Model
import ...GlobalModel: @global_model_constructor import ...SolveModel: @global_model_constructor
import ...Variables: variables, start_time, duration, VariableType import ...Variables: variables, start_time, duration, VariableType
import ...BuildingBlocks: BuildingBlock import ...BuildingBlocks: BuildingBlock
......
...@@ -3,7 +3,7 @@ import JuMP: @constraint, @variable, Model, owner_model ...@@ -3,7 +3,7 @@ import JuMP: @constraint, @variable, Model, owner_model
import ...Variables: qval, bval, start_time, duration, variables, get_free_variable, VariableType import ...Variables: qval, bval, start_time, duration, variables, get_free_variable, VariableType
import ...BuildingBlocks: BuildingBlock import ...BuildingBlocks: BuildingBlock
import ...ConcreteBlocks: to_concrete_block, AbstractConcreteBlock import ...ConcreteBlocks: to_concrete_block, AbstractConcreteBlock
import ...GlobalModel: @global_model_constructor import ...SolveModel: @global_model_constructor
""" """
InstantGradientBlock(; orientation=:bvec, qval=nothing) InstantGradientBlock(; orientation=:bvec, qval=nothing)
......
...@@ -8,7 +8,7 @@ import StaticArrays: SVector ...@@ -8,7 +8,7 @@ import StaticArrays: SVector
import ...Variables: qval, bval, rise_time, flat_time, slew_rate, gradient_strength, variables, duration, δ, get_free_variable, VariableType import ...Variables: qval, bval, rise_time, flat_time, slew_rate, gradient_strength, variables, duration, δ, get_free_variable, VariableType
import ...BuildingBlocks: BuildingBlock, duration, set_simple_constraints! import ...BuildingBlocks: BuildingBlock, duration, set_simple_constraints!
import ...ConcreteBlocks: ConcreteBlock, to_concrete_block import ...ConcreteBlocks: ConcreteBlock, to_concrete_block
import ...GlobalModel: @global_model_constructor import ...SolveModel: @global_model_constructor
""" """
......
...@@ -3,7 +3,7 @@ import JuMP: VariableRef, @constraint, @variable, value, Model ...@@ -3,7 +3,7 @@ import JuMP: VariableRef, @constraint, @variable, value, Model
import ...BuildingBlocks: BuildingBlock, set_simple_constraints! import ...BuildingBlocks: BuildingBlock, set_simple_constraints!
import ...ConcreteBlocks: ConcreteBlock, to_concrete_block import ...ConcreteBlocks: ConcreteBlock, to_concrete_block
import ...Variables: variables, get_free_variable, flip_angle, phase, amplitude, frequency, bandwidth, start_time, end_time, VariableType, duration import ...Variables: variables, get_free_variable, flip_angle, phase, amplitude, frequency, bandwidth, start_time, end_time, VariableType, duration
import ...GlobalModel: @global_model_constructor import ...SolveModel: @global_model_constructor
""" """
ConstantPulse(; variables...) ConstantPulse(; variables...)
......
...@@ -3,7 +3,7 @@ import JuMP: @constraint, @variable, VariableRef, value, Model ...@@ -3,7 +3,7 @@ import JuMP: @constraint, @variable, VariableRef, value, Model
import ...BuildingBlocks: BuildingBlock import ...BuildingBlocks: BuildingBlock
import ...ConcreteBlocks: to_concrete_block, AbstractConcreteBlock import ...ConcreteBlocks: to_concrete_block, AbstractConcreteBlock
import ...Variables: flip_angle, phase, start_time, variables, duration, get_free_variable, VariableType import ...Variables: flip_angle, phase, start_time, variables, duration, get_free_variable, VariableType
import ...GlobalModel: @global_model_constructor import ...SolveModel: @global_model_constructor
struct InstantRFPulseBlock <: BuildingBlock struct InstantRFPulseBlock <: BuildingBlock
model :: Model model :: Model
......
...@@ -6,7 +6,7 @@ import Polynomials: fit, Polynomial ...@@ -6,7 +6,7 @@ import Polynomials: fit, Polynomial
import ...BuildingBlocks: BuildingBlock, set_simple_constraints! import ...BuildingBlocks: BuildingBlock, set_simple_constraints!
import ...ConcreteBlocks: ConcreteBlock, to_concrete_block import ...ConcreteBlocks: ConcreteBlock, to_concrete_block
import ...Variables: flip_angle, phase, amplitude, frequency, bandwidth, VariableType, variables, get_free_variable, duration import ...Variables: flip_angle, phase, amplitude, frequency, bandwidth, VariableType, variables, get_free_variable, duration
import ...GlobalModel: @global_model_constructor import ...SolveModel: @global_model_constructor
""" """
SincPulse(; symmetric=true, max_Nlobes=nothing, apodise=true, variables...) SincPulse(; symmetric=true, max_Nlobes=nothing, apodise=true, variables...)
......
module GlobalModel module SolveModel
import JuMP: Model import JuMP: Model
const GLOBAL_MODEL = Ref(Model()) const GLOBAL_MODEL = Ref(Model())
......
...@@ -3,7 +3,7 @@ import JuMP: Model, @constraint, @variable, VariableRef, owner_model, value ...@@ -3,7 +3,7 @@ import JuMP: Model, @constraint, @variable, VariableRef, owner_model, value
import ..Variables: VariableType, variables, duration, get_free_variable import ..Variables: VariableType, variables, duration, get_free_variable
import ..BuildingBlocks: BuildingBlock import ..BuildingBlocks: BuildingBlock
import ..ConcreteBlocks: to_concrete_block, ConcreteBlock import ..ConcreteBlocks: to_concrete_block, ConcreteBlock
import ..GlobalModel: @global_model_constructor import ..SolveModel: @global_model_constructor
import ...Scanners: Scanner import ...Scanners: Scanner
""" """
......
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