X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=CreaPhase.git;a=blobdiff_plain;f=octave_packages%2Fcontrol-2.3.52%2F%40lti%2Fparallel.m;fp=octave_packages%2Fcontrol-2.3.52%2F%40lti%2Fparallel.m;h=0f7568266773299e252474827997a7bd667fb4e5;hp=0000000000000000000000000000000000000000;hb=c880e8788dfc484bf23ce13fa2787f2c6bca4863;hpb=1705066eceaaea976f010f669ce8e972f3734b05

diff --git a/octave_packages/control-2.3.52/@lti/parallel.m b/octave_packages/control-2.3.52/@lti/parallel.m
new file mode 100644
index 0000000..0f75682
--- /dev/null
+++ b/octave_packages/control-2.3.52/@lti/parallel.m
@@ -0,0 +1,56 @@
+## Copyright (C) 2009   Lukas F. Reichlin
+##
+## This file is part of LTI Syncope.
+##
+## LTI Syncope is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## LTI Syncope is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with LTI Syncope.  If not, see <http://www.gnu.org/licenses/>.
+
+## -*- texinfo -*-
+## @deftypefn{Function File} {@var{sys} =} parallel (@var{sys1}, @var{sys2})
+## Parallel connection of two LTI systems.
+##
+## @strong{Block Diagram}
+## @example
+## @group
+##     ..........................
+##     :      +--------+        :
+##     :  +-->|  sys1  |---+    :
+##  u  :  |   +--------+   | +  :  y
+## -------+                O--------->
+##     :  |   +--------+   | +  :
+##     :  +-->|  sys2  |---+    :
+##     :      +--------+        :
+##     :.........sys............:
+##
+## sys = parallel (sys1, sys2)
+## @end group
+## @end example
+## @end deftypefn
+
+## Author: Lukas Reichlin <lukas.reichlin@gmail.com>
+## Created: September 2009
+## Version: 0.1
+
+function sys = parallel (sys1, sys2)
+
+  if (nargin == 2)
+    sys = sys1 + sys2;
+  ## elseif (nargin == 6)
+
+  ## TODO: implement "complicated" case sys = parallel (sys1, sys2, in1, in2, out1, out2)
+
+  else
+    print_usage ();
+  endif
+
+endfunction
\ No newline at end of file