Changeset 19040 for issm/trunk-jpl/src/m/classes/outputdefinition.m

Timestamp:

01/26/15 18:40:38 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renmaned obj -> self to look like python

File:

• issm/trunk-jpl/src/m/classes/outputdefinition.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/outputdefinition.m

@@ -9 +9 @@
         end
         methods
-           function createxml(obj,fid) % {{{
+           function createxml(self,fid) % {{{
             fprintf(fid, '<!-- outputdefinition -->\n');            
                     
             % outputdefinition solution parameters
             fprintf(fid,'%s\n%s\n%s\n','<frame key="1" label="outputdefinition">','<section name="outputdefinition" />');                    
-                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="definitions" type="',class(obj.definitions),'" default="',convert2str(obj.definitions),'">','     <section name="outputdefinition" />','     <help> list of potential outputs that can be requested, but which need additional data to be defined </help>','  </parameter>');
+                fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n','  <parameter key ="definitions" type="',class(self.definitions),'" default="',convert2str(self.definitions),'">','     <section name="outputdefinition" />','     <help> list of potential outputs that can be requested, but which need additional data to be defined </help>','  </parameter>');
             fprintf(fid,'%s\n%s\n','</frame>');    
         
         end % }}}
-                function obj = outputdefinition(varargin) % {{{
+                function self = outputdefinition(varargin) % {{{
                         switch nargin
                                 case 0
-                                        obj=setdefaultparameters(obj);
+                                        self=setdefaultparameters(self);
                                 otherwise
                                         error('constructor not supported');
                         end
                 end % }}}
-                function obj = setdefaultparameters(obj) % {{{
+                function self = setdefaultparameters(self) % {{{
 
-                        obj.definitions={};
+                        self.definitions={};
 
                 end % }}}
-                function md = checkconsistency(obj,md,solution,analyses) % {{{
+                function md = checkconsistency(self,md,solution,analyses) % {{{
 
                         md = checkfield(md,'fieldname','outputdefinition.definitions','cell',1);
 
-                        for i=1:length(obj.definitions),
-                                md=checkconsistency(obj.definitions{i},md,solution,analyses);
+                        for i=1:length(self.definitions),
+                                md=checkconsistency(self.definitions{i},md,solution,analyses);
                         end
 
                 end % }}}
-                function disp(obj) % {{{
+                function disp(self) % {{{
                         disp(sprintf('   outputdefinition:'));
-                        fielddisplay(obj,'definitions','list of potential outputs that can be requested, but which need additional data to be defined');
+                        fielddisplay(self,'definitions','list of potential outputs that can be requested, but which need additional data to be defined');
 
                 end % }}}
-                function marshall(obj,md,fid) % {{{
+                function marshall(self,md,fid) % {{{
 
-                enums=zeros(length(obj.definitions),1);
-                for i=1:length(obj.definitions),
-                        obj.definitions{i}.marshall(md,fid);
-                        classdefinition=class(obj.definitions{i});
+                enums=zeros(length(self.definitions),1);
+                for i=1:length(self.definitions),
+                        self.definitions{i}.marshall(md,fid);
+                        classdefinition=class(self.definitions{i});
                         classdefinition(1)=upper(classdefinition(1)); %so it matches our enums definitions.
                         enums(i)=StringToEnum(classdefinition);