[python-control-discuss] SF.net SVN: python-control:[138] branches/control-0.4a/src

[<lpa...@us...>]

Revision: 138
          http://python-control.svn.sourceforge.net/python-control/?rev=138&view=rev
Author:   lpadilla
Date:     2011-03-11 19:36:44 +0000 (Fri, 11 Mar 2011)

Log Message:
-----------
Changed signature of tb04ad to match the routine now available in Slycot version on GitHub tagged as v0.1.0.

Modified Paths:
--------------
    branches/control-0.4a/src/TestSlycot.py
    branches/control-0.4a/src/xferfcn.py

Modified: branches/control-0.4a/src/TestSlycot.py
===================================================================
--- branches/control-0.4a/src/TestSlycot.py	2011-02-19 03:15:18 UTC (rev 137)
+++ branches/control-0.4a/src/TestSlycot.py	2011-03-11 19:36:44 UTC (rev 138)
@@ -44,16 +44,15 @@
                         
                         
                         tfOriginal_Actrb, tfOriginal_Bctrb, tfOriginal_Cctrb, tfOrigingal_nctrb, tfOriginal_index,\
-                            tfOriginal_dcoeff, tfOriginal_ucoeff = tb04ad('R',states,inputs,outputs,\
+                            tfOriginal_dcoeff, tfOriginal_ucoeff = tb04ad(states,inputs,outputs,\
                             ssOriginal.A,ssOriginal.B,ssOriginal.C,ssOriginal.D,tol1=0.0)
                         
                         ssTransformed_nr, ssTransformed_A, ssTransformed_B, ssTransformed_C, ssTransformed_D\
                             = td04ad('R',inputs,outputs,tfOriginal_index,tfOriginal_dcoeff,tfOriginal_ucoeff,tol=0.0)
                         
                         tfTransformed_Actrb, tfTransformed_Bctrb, tfTransformed_Cctrb, tfTransformed_nctrb,\
-                            tfTransformed_index, tfTransformed_dcoeff, tfTransformed_ucoeff = tb04ad('R',\
-                            ssTransformed_nr,inputs,outputs,ssTransformed_A, ssTransformed_B, ssTransformed_C,\
-                            ssTransformed_D,tol1=0.0)
+                            tfTransformed_index, tfTransformed_dcoeff, tfTransformed_ucoeff = tb04ad(ssTransformed_nr,\
+                            inputs,outputs,ssTransformed_A, ssTransformed_B, ssTransformed_C,ssTransformed_D,tol1=0.0)
                         #print 'size(Trans_A)=',ssTransformed_A.shape
                         print '===== Transformed SS =========='
                         print matlab.ss(ssTransformed_A, ssTransformed_B, ssTransformed_C, ssTransformed_D)
@@ -82,14 +81,14 @@
                         ssOriginal = matlab.rss(states, inputs, outputs)
                         
                         tfOriginal_Actrb, tfOriginal_Bctrb, tfOriginal_Cctrb, tfOrigingal_nctrb, tfOriginal_index,\
-                            tfOriginal_dcoeff, tfOriginal_ucoeff = tb04ad('R',states,inputs,outputs,\
+                            tfOriginal_dcoeff, tfOriginal_ucoeff = tb04ad(states,inputs,outputs,\
                             ssOriginal.A,ssOriginal.B,ssOriginal.C,ssOriginal.D,tol1=0.0)
                         
                         ssTransformed_nr, ssTransformed_A, ssTransformed_B, ssTransformed_C, ssTransformed_D\
                             = td04ad('R',inputs,outputs,tfOriginal_index,tfOriginal_dcoeff,tfOriginal_ucoeff,tol=0.0)
                         
                         tfTransformed_Actrb, tfTransformed_Bctrb, tfTransformed_Cctrb, tfTransformed_nctrb,\
-                            tfTransformed_index, tfTransformed_dcoeff, tfTransformed_ucoeff = tb04ad('R',\
+                            tfTransformed_index, tfTransformed_dcoeff, tfTransformed_ucoeff = tb04ad(\
                             ssTransformed_nr,inputs,outputs,ssTransformed_A, ssTransformed_B, ssTransformed_C,\
                             ssTransformed_D,tol1=0.0)
 

Modified: branches/control-0.4a/src/xferfcn.py
===================================================================
--- branches/control-0.4a/src/xferfcn.py	2011-02-19 03:15:18 UTC (rev 137)
+++ branches/control-0.4a/src/xferfcn.py	2011-03-11 19:36:44 UTC (rev 138)
@@ -715,7 +715,7 @@
         # buggy!
         print "Warning: state space to transfer function conversion by tb04ad \
 is still buggy!"
-        tfout = tb04ad('R',sys.states, sys.inputs, sys.outputs, sys.A, sys.B, sys.C,
+        tfout = tb04ad(sys.states, sys.inputs, sys.outputs, sys.A, sys.B, sys.C,
             sys.D,tol1=0.0)
 
         # Preallocate outputs.


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