[Octave-cvsupdate] SF.net SVN: octave:[6027] trunk/octave-forge/main/control/inst

[<par...@us...>]

Revision: 6027
          http://octave.svn.sourceforge.net/octave/?rev=6027&view=rev
Author:   paramaniac
Date:     2009-07-19 02:46:35 +0000 (Sun, 19 Jul 2009)

Log Message:
-----------
fixed bugs for mixed cont/disc systems

Modified Paths:
--------------
    trunk/octave-forge/main/control/inst/feedback.m
    trunk/octave-forge/main/control/inst/series.m

Modified: trunk/octave-forge/main/control/inst/feedback.m
===================================================================
--- trunk/octave-forge/main/control/inst/feedback.m	2009-07-18 21:06:08 UTC (rev 6026)
+++ trunk/octave-forge/main/control/inst/feedback.m	2009-07-19 02:46:35 UTC (rev 6027)
@@ -92,16 +92,18 @@
   
   ## Handle digital gains
   if (sys1wasmatrix)
-    if (is_digital (sys2, 2))
+    if (is_digital (sys2, 2) == 1) # -1 for mixed systems!
       t_sam = sysgettsam (sys2);
       sys1 = c2d (sys1, t_sam);
+      sys1 = syschtsam (sys1, t_sam); # sys1 = c2d (sys1, t_sam) doesn't work
     endif
   endif
   
   if (sys2wasmatrix)
-    if (is_digital (sys1, 2))
+    if (is_digital (sys1, 2) == 1)
       t_sam = sysgettsam (sys1);
       sys2 = c2d (sys2, t_sam);
+      sys2 = syschtsam (sys2, t_sam);
     endif
   endif
   

Modified: trunk/octave-forge/main/control/inst/series.m
===================================================================
--- trunk/octave-forge/main/control/inst/series.m	2009-07-18 21:06:08 UTC (rev 6026)
+++ trunk/octave-forge/main/control/inst/series.m	2009-07-19 02:46:35 UTC (rev 6027)
@@ -102,16 +102,18 @@
   
   ## Handle digital gains
   if (sys1wasmatrix)
-    if (is_digital (sys2, 2))
+    if (is_digital (sys2, 2) == 1) # -1 for mixed systems!
       t_sam = sysgettsam (sys2);
       sys1 = c2d (sys1, t_sam);
+      sys1 = syschtsam (sys1, t_sam); # sys1 = c2d (sys1, t_sam) doesn't work
     endif
   endif
   
   if (sys2wasmatrix)
-    if (is_digital (sys1, 2))
+    if (is_digital (sys1, 2) == 1)
       t_sam = sysgettsam (sys1);
       sys2 = c2d (sys2, t_sam);
+      sys2 = syschtsam (sys2, t_sam);
     endif
   endif
   


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.