Skip to content

Commit 2bc4162

Browse files
committed
Removes superfluous default annotations. (includes updates in text refs)
1 parent 98cd75d commit 2bc4162

File tree

8 files changed

+9
-15
lines changed

8 files changed

+9
-15
lines changed

ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ model IdealSensor "Implementation of an ideal sensor"
88
protected
99
Modelica.Mechanics.Rotational.Sensors.SpeedSensor idealSpeedSensor
1010
"An ideal speed sensor" annotation (Placement(transformation(
11-
extent={{-10,-10},{10,10}}, rotation=0,
12-
origin={0,0})));
11+
extent={{-10,-10},{10,10}})));
1312
equation
1413
connect(idealSpeedSensor.flange, shaft) annotation (Line(
1514
points={{-10,0},{-100,0}},

ModelicaByExample/Architectures/SensorComparison/Implementation/ProportionalController.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ protected
2020
rotation=180, origin={-50,0})));
2121
Modelica.Blocks.Math.Feedback feedback
2222
annotation (Placement(transformation(
23-
extent={{10,-10},{-10,10}},
24-
rotation=0, origin={0,0})));
23+
extent={{10,-10},{-10,10}})));
2524
equation
2625
connect(feedback.y, gain.u) annotation (Line(
2726
points={{-9,0},{2,0},{2,0},{-38,0}},

ModelicaByExample/Architectures/ThermalControl/Interfaces/Sensor.mo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ partial model Sensor "Sensor subsystem interface"
66
Modelica.Blocks.Interfaces.RealOutput temperature "Measured temperature"
77
annotation (Placement(transformation(
88
extent={{-10,-10},{10,10}},
9-
rotation=0,
109
origin={110,0})));
1110
end Sensor;

ModelicaByExample/Components/LotkaVolterra/Examples/ClassicLotkaVolterra.mo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ model ClassicLotkaVolterra "Includes reproduction, starvation and predation"
66
Components.Reproduction reproduction(alpha=0.1) "Reproduction of rabbits"
77
annotation (Placement(transformation(
88
extent={{-10,-10},{10,10}},
9-
rotation=0,
109
origin={-80,-30})));
1110
Components.RegionalPopulation foxes(init=ModelicaByExample.Components.LotkaVolterra.Components.RegionalPopulation.InitializationOptions.FixedPopulation,
1211
initial_population=10)

ModelicaByExample/Subsystems/LotkaVolterra/Components/TwoSpecies.mo

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ protected
2727
Reproduction reproduction(alpha=alpha) "Reproduction of rabbits"
2828
annotation (Placement(transformation(
2929
extent={{-10,-10},{10,10}},
30-
rotation=0,
3130
origin={-80,-50})));
3231
RegionalPopulation fox_population(
3332
init=RegionalPopulation.InitializationOptions.FixedPopulation,

text/source/components/architectures/sensor_comparison.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ model:
150150
.. todo:: sentence is missing some text at the end
151151

152152
Now, we want to create a variation of this model where the ``sensor``
153-
component
153+
component
154154

155155
Previously, we dealt with redundancy by using inheritance. We can
156156
certainly use inheritance to pull the subsystems from
@@ -242,15 +242,15 @@ the ``IdealSensor`` model:
242242

243243
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
244244
:language: modelica
245-
:lines: 1-12
245+
:lines: 1-11
246246

247247
The public interface of this component consists only of the two
248248
connectors ``w`` and ``shaft``. Looking at the ``SampleHoldSensor``
249249
model:
250250

251251
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
252252
:language: modelica
253-
:lines: 1-12
253+
:lines: 1-11
254254

255255
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo
256256
:language: modelica
@@ -296,7 +296,7 @@ model without repeating ourselves as follows:
296296
redeclare Implementation.SampleHoldSensor sensor
297297
);
298298
end Variation3;
299-
299+
300300
There are several things worth noting about this model. The first is
301301
that the syntax of a redeclaration is just like a normal declaration
302302
except it is preceded by the ``redeclare`` keyword. Also note that
@@ -424,4 +424,3 @@ top-down, :ref:`arch-driven-approach`.
424424
.. [ItPMwM] Michael M. Tiller, "Introduction to Physical Modeling with
425425
Modelica"
426426
http://www.amazon.com/Introduction-Physical-Modeling-International-Engineering/dp/0792373677
427-

text/source/components/architectures/sensor_comparison_ad.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Controller Models
179179

180180
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/ProportionalController.mo
181181
:language: modelica
182-
:lines: 1-39,55
182+
:lines: 1-38,54
183183

184184
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/PID_Controller.mo
185185
:language: modelica
@@ -190,7 +190,7 @@ Sensor Models
190190

191191
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/IdealSensor.mo
192192
:language: modelica
193-
:lines: 1-23,42
193+
:lines: 1-22,41
194194

195195
.. literalinclude:: /ModelicaByExample/Architectures/SensorComparison/Implementation/SampleHoldSensor.mo
196196
:language: modelica

text/source/components/subsystems/population.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dynamics. The Modelica source code for the model is:
1818

1919
.. literalinclude:: /ModelicaByExample/Subsystems/LotkaVolterra/Components/TwoSpecies.mo
2020
:language: modelica
21-
:lines: 1-71,80
21+
:lines: 1-70,79
2222

2323
The diagram for this component is rendered as:
2424

0 commit comments

Comments
 (0)