Skip to content

Commit

Permalink
updated docs for version 4.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ttl-octave committed Mar 22, 2024
1 parent 7c7ef1f commit 4390e55
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
Binary file modified docs/assets/pzmap_101.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/assets/pzmap_201.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion docs/doc_control.html
Expand Up @@ -83,6 +83,8 @@ <h3 class="d-inline-block mr-2">
</dl>
<p> Function names for which the documentation should be displayed.
If no function name is given, the index of the documentation is shown.
If one of the function names is &rsquo;license&rsquo;, copyright and license
information are displayed.
</p></dd>
</dl>

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


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


Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Expand Up @@ -61,7 +61,7 @@
</div>
<div class="col-sm-9 col-md-10">
<h3 class="d-inline-block mr-2">control</h3>
<b>4.0.0&nbsp;2024-01-04</b>
<b>4.0.1&nbsp;2024-03-24</b>
<p class="indent">
Control package for GNU Octave including system analysis and control synthesis. The package uses routines of the SLICOT-Reference library.
</p>
Expand Down
6 changes: 3 additions & 3 deletions docs/mktito.html
Expand Up @@ -113,17 +113,17 @@ <h3 class="d-inline-block mr-2">
K norm

+--------+
w -----&gt;| |-----&gt; z
w = u1 -----&gt;| |-----&gt; z = y1
| P(s) |
u +----&gt;| |-----+ v
u = u2 +----&gt;| |-----+ y = y2
| +--------+ |
| |
| +--------+ |
+-----| K(s) |&lt;----+
+--------+

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

Expand Down
23 changes: 13 additions & 10 deletions docs/pzmap.html
Expand Up @@ -78,19 +78,21 @@ <h3 class="d-inline-block mr-2">
</dl>
<p> Plot the poles and zeros of an LTI system in the complex plane.
If no output arguments are given, the result is plotted on the screen.
Otherwise, the poles and zeros are computed and returned.
Otherwise, the poles and zeros are computed and returned. Note that
only one system is processed when output arguments are given.
</p>
<div class="ms-5">
<p> <strong>Inputs</strong>
</p><dl compact="compact">
<dt> <var>sys</var></dt>
<dt> <var>sys, sys1, ...</var></dt>
</dl>
<p> <acronym>LTI</acronym> model.
<p> <acronym>LTI</acronym> model(s).
</p></dd>
<dt> <var>&rsquo;style&rsquo;</var></dt>
</dl>
<p> Line style and color, e.g. &rsquo;r&rsquo; for a solid red line or &rsquo;-.k&rsquo; for a dash-dotted
black line. See <code>help plot</code> for details.
<p> Color, e.g. &rsquo;r&rsquo; for a red. See <code>help plot</code> for details.
Marker or line styles are ignored as poles and zeros have the
fixed marker types &rsquo;x&rsquo; and &rsquo;o&rsquo; repectively.
</p></dd>
</dl>

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

s = tf('s');
g = (s-1)/(s-2)/(s-3);
pzmap(g);
z = tf('z',1);
G1z = (z+1)/(z-0.75)/(z^2-1*z+1);
pzmap(G1z);

</pre></td></tr></tbody>
</table>
Expand Down Expand Up @@ -163,8 +165,9 @@ <h3 class="d-inline-block mr-2">
<td><pre class="example">

s = tf('s');
g = 1/(2*s^2+3*s+4);
pzmap(g);
G1 = 1/(2*s^2+3*s+4);
G2 = (1-s)/(1+s)/(s^2+s+1);
pzmap(G1,G2);

</pre></td></tr></tbody>
</table>
Expand Down

0 comments on commit 4390e55

Please sign in to comment.