Skip to content

Commit

Permalink
Apply style guide hyphenation of "base-clock" and "sub-clock"
Browse files Browse the repository at this point in the history
  • Loading branch information
henrikt-ma committed Apr 11, 2021
1 parent f999d1d commit c840a02
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions chapters/synchronous.tex
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ \subsection{Sub-clock conversion operators}\label{sub-clock-conversion-operators
\begin{nonnormative}
Thus \lstinline!subSample(superSample($u$, $\mathit{factor}$), $\mathit{factor}$)! = $u$.
\end{nonnormative}
If argument factor is not provided or is equal to zero, it is inferred, see \cref{sub-clock-inferencing}. If an event clock is associated to a base-clock partition, all its sub-clock partitions must have resulting clocks that are sub-sampled with an \lstinline!Integer! factor with respect to this base clock.
If argument factor is not provided or is equal to zero, it is inferred, see \cref{sub-clock-inferencing}. If an event clock is associated to a base-clock partition, all its sub-clock partitions must have resulting clocks that are sub-sampled with an \lstinline!Integer! factor with respect to this base-clock.

\begin{example}
\begin{lstlisting}[language=modelica]
Expand Down Expand Up @@ -734,7 +734,7 @@ \subsection{Sub-clock conversion operators}\label{sub-clock-conversion-operators
\begin{semantics}
The input argument $u$ is either a component expression (\cref{def:component-expression}) or an expression of type \lstinline!Clock!.
This is an inverse of \lstinline!shiftSample! such that \lstinline!Clock y = backSample($u$, $\mathit{cnt}$, $\mathit{res}$)! implicitly defines a clock \lstinline!y! such that \lstinline!shiftSample(y, $\mathit{cnt}$, $\mathit{res}$)! activates at the same times as $u$.
It is an error if the clock of \lstinline!y! starts before the base clock of $u$.
It is an error if the clock of \lstinline!y! starts before the base-clock of $u$.

At every tick of the clock of \lstinline!y!, the operator returns the value of $u$ from the last tick of the clock of $u$.
If $u$ is a clocked component expression, the operator returns the start value of $u$, see \cref{initialization-of-clocked-partitions}, before the first tick of the clock of $u$.
Expand Down Expand Up @@ -1143,16 +1143,11 @@ \subsection{Solver Methods}\label{solver-methods}
\dot{x} &= f(x, u, t)\\
y &= g(x, u, t)
\end{align*}
A solver method is applied to a subclock partition. Such a partition has
explicit inputs $u$ marked by \lstinline!sample($u$)!,
\lstinline!subSample($u$)!, \lstinline!superSample($u$)!, \lstinline!shiftSample($u$)!
and/or \lstinline!backSample($u$)!. Furthermore, the outputs $y$ of
such a partition are marked by \lstinline!hold($y$)!, \lstinline!subSample($y$)!,
\lstinline!superSample($y$)!, \lstinline!shiftSample($y$)!, and/or
\lstinline!backSample($y$)!. The arguments of these operators are to be used
as input signals $u$ and output signals $y$ in the
conceptual ordinary differential equation above, and in the
discretization formulae below, respectively.

A solver method is applied to a sub-clock partition.
Such a partition has explicit inputs $u$ marked by \lstinline!sample($u$)!, \lstinline!subSample($u$)!, \lstinline!superSample($u$)!, \lstinline!shiftSample($u$)! and/or \lstinline!backSample($u$)!.
Furthermore, the outputs $y$ of such a partition are marked by \lstinline!hold($y$)!, \lstinline!subSample($y$)!, \lstinline!superSample($y$)!, \lstinline!shiftSample($y$)!, and/or \lstinline!backSample($y$)!.
The arguments of these operators are to be used as input signals $u$ and output signals $y$ in the conceptual ordinary differential equation above, and in the discretization formulae below, respectively.

The solver methods (with exception of \lstinline!"External"!) are defined by
integrating from clock tick $t_{i-1}$ to clock tick
Expand Down

0 comments on commit c840a02

Please sign in to comment.