Skip to content

Commit 2718176

Browse files
author
Michael Tiller
committed
Merge pull request #217 from DongpingXieTUD/error
Correction: n times more than means actually (n+1) times
2 parents 216b478 + 6159793 commit 2718176

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

text/source/behavior/discrete/events.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Function Description
151151
``Clock(i,r)`` A clock that fires every :math:`\frac{i}{r}` seconds where ``i`` and ``r`` are both of type ``Integer``
152152
``Clock(dt)`` A clock that fires every :math:`dt` seconds where ``dt`` is a ``Real``
153153
``subSample(u,s)`` A clock that samples ``s`` times slower than the clock used to sample ``u`` where ``s`` is an ``Integer``
154-
``superSample(u,s)`` A clock that samples ``s`` times faster than the clock used to sample ``u`` where ``s`` is an ``Integer``
154+
``superSample(u,s)`` A clock that samples ``s`` times as fast as the clock used to sample ``u`` where ``s`` is an ``Integer``
155155
====================== ========================================================
156156

157157
Note that the ``Clock`` constructor function is overloaded (*i.e.,*

text/source/behavior/discrete/measuring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ This technique for speed estimation can be represented in Modelica as:
126126

127127
where ``tooth_angle`` represents :math:`\Delta\theta`. Note how
128128
``tooth_angle`` is not something the user needs to specify. Instead,
129-
the user species the number of teeth using the ``teeth`` parameter.
129+
the user specifies the number of teeth using the ``teeth`` parameter.
130130
The ``tooth_angle`` parameter is then computed using the value of
131131
``teeth`` (note that while we have hand coded the value of :math:`pi`
132132
here, we'll learn how to avoid this later in the book when we talk

text/source/behavior/discrete/sampling.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ defined in terms of integer quantities which allow exact comparison.
105105
This means that when executing a simulation, we can know for certain
106106
that these two clocks will trigger simultaneously.
107107

108-
If we wanted to create a clock that was exactly two times slower than
108+
If we wanted to create a clock that was exactly half as slow as
109109
``x``, we can use the ``subSample`` operator to accomplish this. We
110110
see this in the definition of ``z``:
111111

@@ -128,8 +128,8 @@ But by defining ``z`` using the ``subSample`` operator and defining it
128128
with respect to ``x`` we ensure that ``z`` is always triggering at
129129
half the frequency of ``x`` regardless of how ``x`` is defined.
130130

131-
In a similar way, we can define another clock, ``w`` that triggers 3 times more
132-
frequently than ``x`` by using the ``superSample`` operator:
131+
In a similar way, we can define another clock, ``w`` that triggers 3 times as
132+
frequently as ``x`` by using the ``superSample`` operator:
133133

134134
.. literalinclude:: /ModelicaByExample/DiscreteBehavior/SynchronousSystems/SamplingWithClocks.mo
135135
:language: modelica
@@ -142,7 +142,7 @@ Again, we could have defined ``w`` directly using ``sample`` with:
142142
w = sample(time, Clock(1,30));
143143
144144
But by using ``superSample``, we can ensure that ``w`` is always
145-
sampling three times faster than ``x`` and six times faster than ``z``
145+
sampling three times as fast as ``x`` and six times as fast as ``z``
146146
(since ``z`` is also defined with respect to ``x``).
147147

148148
The synchronous clock features in Modelica are relatively new. As

0 commit comments

Comments
 (0)