Skip to content

Commit 491045c

Browse files
authored
Merge pull request #3765 from henrikt-ma/cleanup/into-the-future
Use consistent language when talking about scheduling clock ticks
2 parents 5342f0f + b885530 commit 491045c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

chapters/synchronous.tex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ \section{Clock Constructors}\label{clock-constructors}
344344
The result is of base type \lstinline!Clock! that ticks when \lstinline!time! becomes $t_{\mathrm{start}}$, $t_{\mathrm{start}} + \mathit{interval}_{1}$, $t_{\mathrm{start}} + \mathit{interval}_{1} + \mathit{interval}_{2}$, \@\ldots{}
345345
The clock starts at the start of the simulation $t_{\mathrm{start}}$ or when the controller is switched on.
346346
At the start of the simulation, \lstinline!previous($\mathit{intervalCounter}$)! = \lstinline!$\mathit{intervalCounter}$.start! and the clocks ticks the first time.
347-
At the first clock tick $\mathit{intervalCounter}$ must be computed and the second clock tick is then triggered at $\mathit{interval}_{1} = \mathit{intervalCounter}/\mathit{resolution}$.
348-
At the second clock tick at time $t_{\mathrm{start}} + \mathit{interval}_{1}$, a new value for $\mathit{intervalCounter}$ must be computed and the next clock tick is scheduled at $\mathit{interval}_{2} = \mathit{intervalCounter}/\mathit{resolution}$, and so on.
347+
At the first clock tick, $\mathit{intervalCounter}$ must be computed and the second clock tick is scheduled $\mathit{interval}_{1} = \mathit{intervalCounter}/\mathit{resolution}$ into the future.
348+
At the second clock tick at time $t_{\mathrm{start}} + \mathit{interval}_{1}$, a new value for $\mathit{intervalCounter}$ must be computed and the next clock tick is scheduled $\mathit{interval}_{2} = \mathit{intervalCounter}/\mathit{resolution}$ into the future, and so on.
349349

350350

351351
\begin{nonnormative}
@@ -388,7 +388,7 @@ \section{Clock Constructors}\label{clock-constructors}
388388
The $\mathit{interval}$ must be strictly positive ($\mathit{interval} > 0$) of type \lstinline!Real! with \lstinline!unit = "s"!.
389389
The result is of base type \lstinline!Clock! that ticks when \lstinline!time! becomes $t_{\mathrm{start}}$, $t_{\mathrm{start}} + \mathit{interval}_{1}$, $t_{\mathit{start}} + \mathit{interval}_{1} + \mathit{interval}_{2}$, \@\ldots{}
390390
The clock starts at the start of the simulation $t_{\mathrm{start}}$ or when the controller is switched on.
391-
Here the next clock tick is scheduled at $\mathit{interval}_{1}$ = \lstinline!$\mathit{interval}$!.
391+
Here the second clock tick is scheduled $\mathit{interval}_{1}$ = \lstinline!$\mathit{interval}$! into the future.
392392
At the second clock tick at time $t_{\mathrm{start}} + \mathit{interval}_{1}$, the next clock tick is scheduled $\mathit{interval}_{2}$ = \lstinline!$\mathit{interval}$! into the future, and so on.
393393
If $\mathit{interval}$ is a parameter expression, the clock defines a periodic clock.
394394

0 commit comments

Comments
 (0)