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

Initialise duration summation with 0.

parent 1798c0da
No related branches found
No related tags found
No related merge requests found
...@@ -75,7 +75,7 @@ TR(bs::BaseSequence) = duration(bs) ...@@ -75,7 +75,7 @@ TR(bs::BaseSequence) = duration(bs)
duration(bs::BaseSequence{0}) = 0. duration(bs::BaseSequence{0}) = 0.
duration(bs::BaseSequence) = sum(duration.(bs)) duration(bs::BaseSequence) = sum(duration.(bs); init=0.)
end end
...@@ -23,12 +23,14 @@ struct Sequence{N} <: BaseSequence{N} ...@@ -23,12 +23,14 @@ struct Sequence{N} <: BaseSequence{N}
end end
function Sequence(blocks::AbstractVector; TR=:min) function Sequence(blocks::AbstractVector; TR=:min)
blocks = to_block.(blocks)
actual_duration = sum(duration, blocks; init=0.)
if TR == :min if TR == :min
TR = sum(duration, blocks; init=0.) TR = actual_duration
end end
res = Sequence{length(blocks)}(SVector{length(blocks)}(to_block.(blocks)), get_free_variable(TR)) res = Sequence{length(blocks)}(SVector{length(blocks)}(blocks), get_free_variable(TR))
if !(res.TR isa Number) || !(duration(res) isa Number) if !(res.TR isa Number) || !(duration(res) isa Number)
@constraint global_model() res.TR >= sum(duration, blocks; init=0.) @constraint global_model() res.TR >= actual_duration
end end
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