Mercurial > octave-libgccjit
changeset 15953:0bf55f5f5d10 classdef
Fix typos and mistakes from changeset dd4258398a59.
* test/classdef/module.mk: Include the test/classdef (not test/classes) files.
* test/classdef/foo_payment.m: Moved test/classes/foo_payment.m.
author | Ben Abbott <bpabbott@mac.com> |
---|---|
date | Tue, 15 Jan 2013 14:50:43 -0500 |
parents | 9c7e1c633e47 |
children | 46ca8488de92 |
files | test/classdef/foo_payment.m test/classdef/module.mk test/classes/foo_payment.m |
diffstat | 3 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/classdef/foo_payment.m Tue Jan 15 14:50:43 2013 -0500 @@ -0,0 +1,30 @@ +classdef foo_payment + properties + rate; + term; + principle; + end + methods + function obj = foo_payment (r, t, p) + if (nargin == 0) + obj = struct ('rate', 0, 'term', 0, 'principle', 0); + elseif (nargin == 3) + obj.rate = r; + obj.term = t; + obj.principle = p; + else + 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 +
--- a/test/classdef/module.mk Mon Jan 14 22:56:54 2013 -0500 +++ b/test/classdef/module.mk Tue Jan 15 14:50:43 2013 -0500 @@ -1,5 +1,5 @@ classdef_FCN_FILES = \ - classes/foo_payment.m \ - classes/test_classdef.m + classdef/foo_payment.m \ + classdef/test_classdef.m FCN_FILES += $(classdef_FCN_FILES)
--- a/test/classes/foo_payment.m Mon Jan 14 22:56:54 2013 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -classdef foo_payment - properties - rate; - term; - principle; - end - methods - function obj = foo_payment (r, t, p) - if (nargin == 0) - obj = struct ('rate', 0, 'term', 0, 'principle', 0); - elseif (nargin == 3) - obj.rate = r; - obj.term = t; - obj.principle = p; - else - 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 -