Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generalize jitter in clocked systems #134

Merged
merged 7 commits into from
Apr 28, 2020
Merged

Generalize jitter in clocked systems #134

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aea0bc9
jitter type param (draft)
mforets Apr 25, 2020
f1c1d3e
fix merge conflicts
mforets Apr 26, 2020
13b1147
admit interval values for jitter
mforets Apr 27, 2020
15a3f78
changes
mforets Apr 27, 2020
bb9afbd
update
mforets Apr 27, 2020
c3fdcd1
cleanup
mforets Apr 27, 2020
9d58f43
decrease default ztol for EMBrake
mforets Apr 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix merge conflicts
  • Loading branch information
@mforets
mforets committed Apr 26, 2020
commit f1c1d3e25228d667a7bed000bc9b769414c7e964
7 changes: 7 additions & 0 deletions src/Hybrid/time_triggered.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,15 @@ function solve(ivp::IVP{<:HACLD1}, args...; kwargs...) # post(alg::AbstractConti
if NLOW == 0
error("inconsistent choice of parameters: (Tsample - ζ)/δ = $αlow " *
"but it should be positive")
<<<<<<< HEAD

sol = solve(prob, NSTEPS=NHIGH, alg=alg; kwargs...)
=======
end
αhigh = (Tsample + ζ)/δ
NHIGH = ceil(Int, αhigh)
sol = post(alg, prob, ∅; NSTEPS=NHIGH)
>>>>>>> master

# preallocate output vector of flowpipes
N = numtype(alg)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.