diff scripts/control/system/sysmin.m @ 4771:b8105302cfe8

[project @ 2004-02-16 17:45:50 by jwe]
author jwe
date Mon, 16 Feb 2004 17:45:50 +0000
parents 3234a698073a
children bdbee5282954
line wrap: on
line diff
--- a/scripts/control/system/sysmin.m
+++ b/scripts/control/system/sysmin.m
@@ -64,9 +64,9 @@
 
     cstnam = stnam(crng);
     dstnam = stnam(drng);
-    cinnam = append(innam,stnam(drng));
-    coutnam = append(outnam,stnam(drng));
-    csys = ss2sys(Ac,[Bc,Acd],[Cc;Adc]);
+    cinnam = __sysconcat__(innam,stnam(drng));
+    coutnam = __sysconcat__(outnam,stnam(drng));
+    csys = ss(Ac,[Bc,Acd],[Cc;Adc]);
     csys = syssetsignals(csys,"st",cstnam);
     csys = syssetsignals(csys,"in",cinnam);
     csys = syssetsignals(csys,"out",coutnam);
@@ -90,9 +90,9 @@
       Adc = ccc(p + (1:nz),:);
 
       # recombine to reduce discrete part of the system
-      dinnam = append(innam,cstnam);
-      doutnam = append(outnam,cstnam);
-      dsys = ss2sys(Ad,[Bd,Adc],[Cd;Acd],[],tsam);
+      dinnam = __sysconcat__(innam,cstnam);
+      doutnam = __sysconcat__(outnam,cstnam);
+      dsys = ss(Ad,[Bd,Adc],[Cd;Acd],[],tsam);
       dsys = syssetsignals(dsys,"st",dstnam);
       dsys = syssetsignals(dsys,"in",dinnam);
       dsys = syssetsignals(dsys,"out",doutnam);
@@ -111,11 +111,11 @@
         Adc = dbb(:,m+(1:cn));
         Cd  = dcc(1:p,:);
         Acd = dcc(p+(1:cn),:);
-        stnam = append(cstnam,dstnam);
+        stnam = __sysconcat__(cstnam,dstnam);
         aa = [Ac, Acd; Adc, Ad];
         bb = [Bc; Bd];
         cc = [Cc, Cd];
-        retsys = ss2sys([Ac, Acd; Adc, Ad], [Bc ; Bd], [Cc, Cd], dd, tsam, ...
+        retsys = ss([Ac, Acd; Adc, Ad], [Bc ; Bd], [Cc, Cd], dd, tsam, ...
           cn, nz, stnam, innam, outnam, find(yd == 1));
       end
     endif
@@ -158,7 +158,7 @@
       endswitch
       innam = sysgetsignals(sys,"in");
       outnam= sysgetsignals(sys,"out");
-      retsys = ss2sys(aa,bb,cc,dd,Ts,nn,nz,[],innam,outnam);
+      retsys = ss(aa,bb,cc,dd,Ts,nn,nz,[],innam,outnam);
     case(1),
       ## reduced model with physical states
       [cflg,Uc] = is_controllable(sys); xc = find(max(abs(Uc')) != 0);