Mercurial > octave-dspies
changeset 15961:3e782e337f8d classdef
Rename classdef test class foo_payment to foo_value_class
* test/classdef/foo_value_class.m: Rename foo_payment -> foo_value_class.
* test/classdef/module.mk: Ditto.
* test/classdef/test_classdef.m: Ditto.
author | Ben Abbott <bpabbott@mac.com> |
---|---|
date | Thu, 17 Jan 2013 17:23:58 -0500 |
parents | de240df20290 |
children | a3d7b927ce47 |
files | test/classdef/foo_payment.m test/classdef/foo_value_class.m test/classdef/module.mk test/classdef/test_classdef.m |
diffstat | 4 files changed, 35 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/test/classdef/foo_payment.m Tue Jan 15 21:11:33 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -classdef foo_payment - properties - rate; - term; - principle; - end - methods - function obj = foo_payment (r, t, p) - if (nargin == 3) - obj.rate = r; - obj.term = t; - obj.principle = p; - elseif (nargin ~= 0) - error ('foo_payment:SyntaxError', ... - 'foo_payment: Invalid syntax') - end - end - function amt = amount (obj) - i = obj.rate / (12 * 100); - if (i == 0 && obj.term == 0) - amt = obj.principle; - else - amt = (obj.principle * i) / (1 - (1 + i)^(-obj.term)); - end - end - end -end -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/classdef/foo_value_class.m Thu Jan 17 17:23:58 2013 -0500 @@ -0,0 +1,28 @@ +classdef foo_value_class + properties + rate; + term; + principle; + end + methods + function obj = foo_value_class (r, t, p) + if (nargin == 3) + obj.rate = r; + obj.term = t; + obj.principle = p; + elseif (nargin ~= 0) + error ('foo_value_class:SyntaxError', ... + 'foo_value_class: Invalid syntax') + end + end + function amt = amount (obj) + i = obj.rate / (12 * 100); + if (i == 0 && obj.term == 0) + amt = obj.principle; + else + amt = (obj.principle * i) / (1 - (1 + i)^(-obj.term)); + end + end + end +end +
--- a/test/classdef/module.mk Tue Jan 15 21:11:33 2013 -0500 +++ b/test/classdef/module.mk Thu Jan 17 17:23:58 2013 -0500 @@ -1,5 +1,5 @@ classdef_FCN_FILES = \ - classdef/foo_payment.m \ + classdef/foo_value_class.m \ classdef/test_classdef.m FCN_FILES += $(classdef_FCN_FILES)
--- a/test/classdef/test_classdef.m Tue Jan 15 21:11:33 2013 -0500 +++ b/test/classdef/test_classdef.m Thu Jan 17 17:23:58 2013 -0500 @@ -35,14 +35,14 @@ %% Basic classdef tests for value class %!shared p, q, i, amt -%! q = foo_payment (); -%! p = foo_payment (4, 4*12, 50e3); +%! q = foo_value_class (); +%! p = foo_value_class (4, 4*12, 50e3); %! i = p.rate / (12 * 100); %! amt = (p.principle * i) / (1 - (1 + i)^(-p.term)); %!assert (isempty (q.rate)); %!assert (isempty (q.principle)); %!assert (isempty (q.term)); -%!assert (class (p), "foo_payment"); +%!assert (class (p), "foo_value_class"); %!assert (p.term, 48); %!assert (p.rate, 4.0); %!assert (p.principle, 50e3); @@ -52,6 +52,6 @@ %!xtest %! assert (properties (p), {'rate'; 'term'; 'principle'}) %!xtest -%! assert (methods (p), {'amount'; 'foo_payment'}) -%!assert (isempty (foo_payment().rate)) -%!error <property `rate' is not constant> foo_payment.rate +%! assert (methods (p), {'amount'; 'foo_value_class'}) +%!assert (isempty (foo_value_class().rate)) +%!error <property `rate' is not constant> foo_value_class.rate