Mercurial > forge
changeset 6470:2924ddd32617 octave-forge
control-oo: simplify cc files
| author | paramaniac |
|---|---|
| date | Sat, 19 Dec 2009 16:27:33 +0000 |
| parents | 06fc77624665 |
| children | 5a47580b4a6d |
| files | extra/control-oo/src/slab13bd.cc extra/control-oo/src/slsb01bd.cc extra/control-oo/src/slsb10dd.cc extra/control-oo/src/slsb10ed.cc extra/control-oo/src/slsb10fd.cc extra/control-oo/src/slsb10hd.cc |
| diffstat | 6 files changed, 10 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/extra/control-oo/src/slab13bd.cc Sat Dec 19 14:21:30 2009 +0000 +++ b/extra/control-oo/src/slab13bd.cc Sat Dec 19 16:27:33 2009 +0000 @@ -58,10 +58,7 @@ { int d = max (a, b); - if (c > d) - return c; - else - return d; + return max (c, d); } int min (int a, int b)
--- a/extra/control-oo/src/slsb01bd.cc Sat Dec 19 14:21:30 2009 +0000 +++ b/extra/control-oo/src/slsb01bd.cc Sat Dec 19 16:27:33 2009 +0000 @@ -60,10 +60,7 @@ int e = max (a, b); int f = max (c, d); - if (e > f) - return e; - else - return f; + return max (e, f); } DEFUN_DLD (slsb01bd, args, nargout, "Slicot SB01BD Release 5.0")
--- a/extra/control-oo/src/slsb10dd.cc Sat Dec 19 14:21:30 2009 +0000 +++ b/extra/control-oo/src/slsb10dd.cc Sat Dec 19 16:27:33 2009 +0000 @@ -66,10 +66,7 @@ { int d = max (a, b); - if (c > d) - return c; - else - return d; + return max (c, d); } int max (int a, int b, int c, int d) @@ -77,10 +74,7 @@ int e = max (a, b); int f = max (c, d); - if (e > f) - return e; - else - return f; + return max (e, f); } DEFUN_DLD (slsb10dd, args, nargout, "Slicot SB10DD Release 5.0")
--- a/extra/control-oo/src/slsb10ed.cc Sat Dec 19 14:21:30 2009 +0000 +++ b/extra/control-oo/src/slsb10ed.cc Sat Dec 19 16:27:33 2009 +0000 @@ -63,10 +63,7 @@ { int d = max (a, b); - if (c > d) - return c; - else - return d; + return max (c, d); } int max (int a, int b, int c, int d) @@ -74,10 +71,7 @@ int e = max (a, b); int f = max (c, d); - if (e > f) - return e; - else - return f; + return max (e, f); } DEFUN_DLD (slsb10ed, args, nargout, "Slicot SB10ED Release 5.0")
--- a/extra/control-oo/src/slsb10fd.cc Sat Dec 19 14:21:30 2009 +0000 +++ b/extra/control-oo/src/slsb10fd.cc Sat Dec 19 16:27:33 2009 +0000 @@ -64,10 +64,7 @@ { int d = max (a, b); - if (c > d) - return c; - else - return d; + return max (c, d); } int max (int a, int b, int c, int d) @@ -75,10 +72,7 @@ int e = max (a, b); int f = max (c, d); - if (e > f) - return e; - else - return f; + return max (e, f); } DEFUN_DLD (slsb10fd, args, nargout, "Slicot SB10FD Release 5.0")
--- a/extra/control-oo/src/slsb10hd.cc Sat Dec 19 14:21:30 2009 +0000 +++ b/extra/control-oo/src/slsb10hd.cc Sat Dec 19 16:27:33 2009 +0000 @@ -63,10 +63,7 @@ { int d = max (a, b); - if (c > d) - return c; - else - return d; + return max (c, d); } int max (int a, int b, int c, int d) @@ -74,10 +71,7 @@ int e = max (a, b); int f = max (c, d); - if (e > f) - return e; - else - return f; + return max (e, f); } DEFUN_DLD (slsb10hd, args, nargout, "Slicot SB10HD Release 5.0")