Skip to content

Commit 4390e55

Browse files
committed
updated docs for version 4.0.1
1 parent 7c7ef1f commit 4390e55

File tree

6 files changed

+20
-15
lines changed

6 files changed

+20
-15
lines changed

docs/assets/pzmap_101.png

5.14 KB
Loading

docs/assets/pzmap_201.png

4.98 KB
Loading

docs/doc_control.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ <h3 class="d-inline-block mr-2">
8383
</dl>
8484
<p> Function names for which the documentation should be displayed.
8585
If no function name is given, the index of the documentation is shown.
86+
If one of the function names is &rsquo;license&rsquo;, copyright and license
87+
information are displayed.
8688
</p></dd>
8789
</dl>
8890

@@ -104,7 +106,7 @@ <h3 class="d-inline-block mr-2">
104106

105107

106108
<p><strong>Source Code: </strong>
107-
<a href="">doc_control</a>
109+
<a href="https://github.com/gnu-octave/pkg-control/tree/main/inst/doc_control.m">doc_control</a>
108110
</div>
109111

110112

docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</div>
6262
<div class="col-sm-9 col-md-10">
6363
<h3 class="d-inline-block mr-2">control</h3>
64-
<b>4.0.0&nbsp;2024-01-04</b>
64+
<b>4.0.1&nbsp;2024-03-24</b>
6565
<p class="indent">
6666
Control package for GNU Octave including system analysis and control synthesis. The package uses routines of the SLICOT-Reference library.
6767
</p>

docs/mktito.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,17 @@ <h3 class="d-inline-block mr-2">
113113
K norm
114114

115115
+--------+
116-
w -----&gt;| |-----&gt; z
116+
w = u1 -----&gt;| |-----&gt; z = y1
117117
| P(s) |
118-
u +----&gt;| |-----+ v
118+
u = u2 +----&gt;| |-----+ y = y2
119119
| +--------+ |
120120
| |
121121
| +--------+ |
122122
+-----| K(s) |&lt;----+
123123
+--------+
124124

125125
+--------+
126-
w -----&gt;| N(s) |-----&gt; z
126+
w = u1 -----&gt;| N(s) |-----&gt; z = y1
127127
+--------+
128128
</pre><pre class="example"> </pre></td></tr></table>
129129

docs/pzmap.html

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,19 +78,21 @@ <h3 class="d-inline-block mr-2">
7878
</dl>
7979
<p> Plot the poles and zeros of an LTI system in the complex plane.
8080
If no output arguments are given, the result is plotted on the screen.
81-
Otherwise, the poles and zeros are computed and returned.
81+
Otherwise, the poles and zeros are computed and returned. Note that
82+
only one system is processed when output arguments are given.
8283
</p>
8384
<div class="ms-5">
8485
<p> <strong>Inputs</strong>
8586
</p><dl compact="compact">
86-
<dt> <var>sys</var></dt>
87+
<dt> <var>sys, sys1, ...</var></dt>
8788
</dl>
88-
<p> <acronym>LTI</acronym> model.
89+
<p> <acronym>LTI</acronym> model(s).
8990
</p></dd>
9091
<dt> <var>&rsquo;style&rsquo;</var></dt>
9192
</dl>
92-
<p> Line style and color, e.g. &rsquo;r&rsquo; for a solid red line or &rsquo;-.k&rsquo; for a dash-dotted
93-
black line. See <code>help plot</code> for details.
93+
<p> Color, e.g. &rsquo;r&rsquo; for a red. See <code>help plot</code> for details.
94+
Marker or line styles are ignored as poles and zeros have the
95+
fixed marker types &rsquo;x&rsquo; and &rsquo;o&rsquo; repectively.
9496
</p></dd>
9597
</dl>
9698

@@ -128,9 +130,9 @@ <h3 class="d-inline-block mr-2">
128130
<td>&nbsp;</td>
129131
<td><pre class="example">
130132

131-
s = tf('s');
132-
g = (s-1)/(s-2)/(s-3);
133-
pzmap(g);
133+
z = tf('z',1);
134+
G1z = (z+1)/(z-0.75)/(z^2-1*z+1);
135+
pzmap(G1z);
134136

135137
</pre></td></tr></tbody>
136138
</table>
@@ -163,8 +165,9 @@ <h3 class="d-inline-block mr-2">
163165
<td><pre class="example">
164166

165167
s = tf('s');
166-
g = 1/(2*s^2+3*s+4);
167-
pzmap(g);
168+
G1 = 1/(2*s^2+3*s+4);
169+
G2 = (1-s)/(1+s)/(s^2+s+1);
170+
pzmap(G1,G2);
168171

169172
</pre></td></tr></tbody>
170173
</table>

0 commit comments

Comments
 (0)