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

Remove outdated concrete blocks

parent c14ee7fb
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,6 @@ include("build_sequences.jl")
include("scanners.jl")
include("variables.jl")
include("building_blocks.jl")
include("concrete_blocks.jl")
include("wait.jl")
include("containers/containers.jl")
include("gradients/gradients.jl")
......@@ -26,9 +25,6 @@ export variables, duration, start_time, end_time, flip_angle, amplitude, phase,
import .BuildingBlocks: BuildingBlock, fixed
export BuildingBlocks, fixed
import .ConcreteBlocks: ConcreteBlock, AbstractConcreteBlock
export ConcreteBlocks, AbstractConcreteBlock
import .Wait: WaitBlock
export WaitBlock
......
......@@ -4,8 +4,6 @@ Module defining sub-types of the [`GradientBlock`](@ref), i.e., any [`BuildingBl
- [`PulsedGradient`](@ref)
- [`InstantGradientBlock`](@ref)
- [`FixedGradient`](@ref)
Arbitrary gradient waveforms can be store din a [`ConcreteBlock`](@ref)
"""
module Gradients
include("integrate_gradients.jl")
......
......@@ -2,7 +2,6 @@ module InstantGradients
import JuMP: @constraint, @variable, Model, owner_model
import ...Variables: qval, bval, start_time, duration, variables, get_free_variable, VariableType
import ...BuildingBlocks: GradientBlock, fixed
import ...ConcreteBlocks: to_concrete_block, AbstractConcreteBlock
import ...BuildSequences: @global_model_constructor
import ..FixedGradients: FixedInstantGradient
......
......@@ -7,7 +7,6 @@ import JuMP: @constraint, @variable, Model, VariableRef, owner_model, value
import StaticArrays: SVector
import ...Variables: qval, bval, rise_time, flat_time, slew_rate, gradient_strength, variables, duration, δ, get_free_variable, VariableType
import ...BuildingBlocks: GradientBlock, duration, set_simple_constraints!, fixed
import ...ConcreteBlocks: ConcreteBlock, to_concrete_block
import ...BuildSequences: @global_model_constructor
import ..FixedGradients: FixedGradient
......
module ConstantPulses
import JuMP: VariableRef, @constraint, @variable, value, Model
import ...BuildingBlocks: RFPulseBlock, set_simple_constraints!, fixed
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 ...BuildSequences: @global_model_constructor
import ..FixedPulses: FixedPulse
......
module InstantPulses
import JuMP: @constraint, @variable, VariableRef, value, Model
import ...BuildingBlocks: RFPulseBlock, fixed
import ...ConcreteBlocks: to_concrete_block, AbstractConcreteBlock
import ...Variables: flip_angle, phase, start_time, variables, duration, get_free_variable, VariableType
import ...BuildSequences: @global_model_constructor
import ..FixedPulses: FixedInstantPulse
......
......@@ -4,7 +4,6 @@ import JuMP: VariableRef, @constraint, @variable, value, Model
import QuadGK: quadgk
import Polynomials: fit, Polynomial
import ...BuildingBlocks: RFPulseBlock, set_simple_constraints!, fixed
import ...ConcreteBlocks: ConcreteBlock, to_concrete_block
import ...Variables: flip_angle, phase, amplitude, frequency, bandwidth, VariableType, variables, get_free_variable, duration
import ...BuildSequences: @global_model_constructor
import ..FixedPulses: FixedPulse
......
module InstantReadouts
import ...BuildingBlocks: BuildingBlock, to_block
import ...ConcreteBlocks: AbstractConcreteBlock, to_concrete_block
import ...BuildingBlocks: BuildingBlock, to_block, fixed
import ...Variables: variables
"""
......@@ -10,10 +9,10 @@ Represents an instantaneous `Readout` of the signal.
It has no parameters or properties to set.
"""
struct InstantReadout <: AbstractConcreteBlock
struct InstantReadout <: BuildingBlock
end
variables(::Type{<:InstantReadout}) = []
to_concrete_block(::InstantReadout) = InstantReadout()
to_block(::Type{<:InstantReadout}) = InstantReadout()
fixed(i::InstantReadout) = i
end
\ No newline at end of file
......@@ -2,7 +2,6 @@ module Wait
import JuMP: Model, @constraint, @variable, VariableRef, owner_model, value
import ..Variables: VariableType, variables, duration, get_free_variable
import ..BuildingBlocks: BuildingBlock, to_block
import ..ConcreteBlocks: to_concrete_block, ConcreteBlock
import ..BuildSequences: @global_model_constructor
import ...Scanners: Scanner
......@@ -48,6 +47,4 @@ variables(::Type{WaitBlock}) = [duration]
duration(wb::WaitBlock) = wb.duration
to_concrete_block(wb::WaitBlock) = ConcreteBlock(value(duration(wb)))
end
\ No newline at end of file
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