Mercurial > forge
changeset 6641:44d1aa7b6444 octave-forge
control-oo: small changes in get/set routines
author | paramaniac |
---|---|
date | Wed, 03 Feb 2010 15:27:36 +0000 |
parents | f62a89647da6 |
children | 71474fd2bdaa |
files | extra/control-oo/inst/@ss/__get__.m extra/control-oo/inst/@ss/__set__.m extra/control-oo/inst/@tf/__get__.m extra/control-oo/inst/@tf/__set__.m |
diffstat | 4 files changed, 20 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/control-oo/inst/@ss/__get__.m Wed Feb 03 10:29:27 2010 +0000 +++ b/extra/control-oo/inst/@ss/__get__.m Wed Feb 03 15:27:36 2010 +0000 @@ -25,16 +25,16 @@ function val = __get__ (sys, prop) switch (prop) # {<internal name>, <user name>} - case {"a"} + case "a" val = sys.a; - case {"b"} + case "b" val = sys.b; - case {"c"} + case "c" val = sys.c; - case {"d"} + case "d" val = sys.d; case {"stname", "statename"}
--- a/extra/control-oo/inst/@ss/__set__.m Wed Feb 03 10:29:27 2010 +0000 +++ b/extra/control-oo/inst/@ss/__set__.m Wed Feb 03 15:27:36 2010 +0000 @@ -25,19 +25,19 @@ function sys = __set__ (sys, prop, val) switch (prop) # {<internal name>, <user name>} - case {"a"} + case "a" [m, n, p] = __ssmatdim__ (val, sys.b, sys.c, sys.d); sys.a = val; - case {"b"} + case "b" [m, n, p] = __ssmatdim__ (sys.a, val, sys.c, sys.d); sys.b = val; - case {"c"} + case "c" [m, n, p] = __ssmatdim__ (sys.a, sys.b, val, sys.d); sys.c = val; - case {"d"} + case "d" [m, n, p] = __ssmatdim__ (sys.a, sys.b, sys.c, val); sys.d = val;
--- a/extra/control-oo/inst/@tf/__get__.m Wed Feb 03 10:29:27 2010 +0000 +++ b/extra/control-oo/inst/@tf/__get__.m Wed Feb 03 15:27:36 2010 +0000 @@ -25,12 +25,20 @@ function val = __get__ (sys, prop) switch (prop) # {<internal name>, <user name>} - case {"num"} + case "num" val = sys.num; - case {"den"} + for k = 1 : numel (val) + val(k) = get (val{k}); + endfor + + case "den" val = sys.den; + for k = 1 : numel (val) + val(k) = get (val{k}); + endfor + case {"tfvar", "variable"} val = sys.tfvar;
--- a/extra/control-oo/inst/@tf/__set__.m Wed Feb 03 10:29:27 2010 +0000 +++ b/extra/control-oo/inst/@tf/__set__.m Wed Feb 03 15:27:36 2010 +0000 @@ -25,12 +25,12 @@ function sys = __set__ (sys, prop, val) switch (prop) # {<internal name>, <user name>} - case {"num"} + case "num" num = __conv2tfpolycell__ (val); [p, m] = __tfnddim__ (num, sys.den); sys.num = num; - case {"den"} + case "den" den = __conv2tfpolycell__ (val); [p, m] = __tfnddim__ (sys.num, den); sys.den = den;