Skip to content

Commit 47ee371

Browse files
committed
Merge pull request #173 from dietmarw/proofReading
Proof reading
2 parents 292d1ae + d7d0e95 commit 47ee371

File tree

7 files changed

+16
-11
lines changed

7 files changed

+16
-11
lines changed

text/source/behavior/arrays/declarations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ Booleans
101101
It is also possible to declare an array where a dimension is specified
102102
as ``Boolean``, *e.g.,*
103103

104-
.. math::
104+
.. code-block:: modelica
105105
106106
Real x[Boolean];

text/source/behavior/arrays/functions.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ Conversion Functions
201201
The following functions provide a means to transform arrays into other
202202
arrays.
203203

204+
.. todo:: It would be nice to get examples for each function call in
205+
order to be able to understand.
206+
204207
``scalar``
205208
~~~~~~~~~~
206209

text/source/behavior/discrete/bouncing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ where the time of the event is known *a priori*, a state event depends
1818
on the solution trajectory. So we cannot entirely avoid the
1919
"searching" for the point at which the event occurs.
2020

21-
To see a state even in action, let us consider the behavior of a
21+
To see a state event in action, let us consider the behavior of a
2222
bouncing ball bouncing on a flat horizontal surface. When the ball is
2323
above the surface, it accelerates due to gravitational forces. When
2424
the ball eventually comes in contact with the surface, it bounces off

text/source/behavior/discrete/hysteresis.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ temperature you have specified. Instead, it waits until the
4242
temperature gets some specified amount above or below the desired
4343
temperature before acting.
4444

45-
..todo: there seems to be a formatting problem around code{ChatteringControl}
45+
.. todo:: there seems to be a formatting problem around code{ChatteringControl}
4646

4747
This "band" that is introduced around the desired temperature is
4848
called hysteresis. The problem with the \code{ChatteringControl}
@@ -84,7 +84,7 @@ heater turning on and the heater turning off.
8484
The logic for implementing hysteresis can be made slightly more
8585
explicit by using an ``algorithm`` section (as previous discussed
8686
during our discussion on :ref:`speed estimation techniques
87-
<pulse-counting>`).
87+
<pulse-counting>`).
8888

8989
.. literalinclude:: /ModelicaByExample/DiscreteBehavior/Hysteresis/HysteresisControlWithAlgorithms.mo
9090
:language: modelica

text/source/behavior/discrete/measuring.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Let's take a close look at the ``when`` statement in this model:
136136

137137
.. literalinclude:: /ModelicaByExample/DiscreteBehavior/SpeedMeasurement/IntervalMeasure.mo
138138
:language: modelica
139-
:lines: 13-18
139+
:lines: 13-19
140140

141141
Here, we use the vector expression syntax used previously in the
142142
:ref:`bouncing-ball` example. Recall that the ``when`` statement

text/source/behavior/discrete/switching.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ equations.
2727

2828
We can see the voltage response of this model to the switched supply
2929
voltage in the following plot:
30-
.. todo:: Source Voltage V needs subscript s, other plots missing subscripts also
3130

3231
.. plot:: ../plots/SRLCv.py
3332
:class: interactive
3433

34+
.. todo:: Source Voltage V needs subscript s, other plots missing subscripts also
35+
3536
Furthermore, we can see the current response for inductor, resistor
3637
and capacitor components in this plot:
3738

text/source/behavior/discrete/when.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,10 @@ initialization phase to determine initial conditions, just like an
121121
``initial equation`` section, but the ``initial algorithm`` section
122122
will allow multiple assignments to the same variable. The same
123123
caveats apply with respect to symbolic manipulation.
124-
.. todo:: what would be the purpose in having multiple assignments to the same variable?is the order important like in non-initial algorithm sections where
125-
the last assigment is the one used?
126-
for any algorithm section (initial or otherwise):
127-
are the statements executed sequentially so that
128-
x = 2; y = x; z = y is well defined?
129124

125+
.. todo:: what would be the purpose in having multiple assignments to
126+
the same variable?is the order important like in non-initial
127+
algorithm sections where the last assigment is the one used?
128+
for any algorithm section (initial or otherwise):
129+
are the statements executed sequentially so that
130+
x = 2; y = x; z = y is well defined?

0 commit comments

Comments
 (0)