Changeset 16405

Timestamp:

10/15/13 08:15:42 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: enums do not need to be a field of outputdefinitions, define it localy at marshall

Location:

issm/trunk-jpl/src/m/classes

Files:

• outputdefinition.m (modified) (3 diffs)
• outputdefinition.py (modified) (3 diffs)

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

@@ -7 +7 @@
         properties (SetAccess=public) 
                 definitions                 = {};
-        end
-        properties (SetAccess=private) 
-                enums                 = {};
         end
         methods
@@ -23 +20 @@
 
                         obj.definitions={};
-                        obj.enums=NaN;
 
                 end % }}}
@@ -47 +43 @@
                         classdefinition=class(obj.definitions{i});
                         classdefinition(1)=upper(classdefinition(1)); %so it matches our enums definitions.
-                        obj.enums(i)=StringToEnum(classdefinition);
+                        enums(i)=StringToEnum(classdefinition);
                 end
-                obj.enums=unique(obj.enums);
+                enums=unique(enums);
                 
-                WriteData(fid,'object',obj,'fieldname','enums','format','DoubleMat','mattype',1);
+                WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1);
                 end % }}}
         end

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

@@ -16 +16 @@
         def __init__(self): # {{{
                 self.definitions                   = []
-                self.enums                         = float('NaN')
                 #}}}
         def __repr__(self): # {{{
@@ -37 +36 @@
         def marshall(self,md,fid):    # {{{
                 
-                self.enums=npy.zeros(len(self.definitions),)
+                enums=npy.zeros(len(self.definitions),)
                 
                 for i in range(len(self.definitions)):
@@ -43 +42 @@
                         classdefinition=self.definitions[i].__class__.__name__
                         classdefinition=classdefinition[0].upper()+classdefinition[1:]
-                        self.enums[i]=StringToEnum(classdefinition)[0]
+                        enums[i]=StringToEnum(classdefinition)[0]
                 
-                self.enums=npy.unique(self.enums);
+                enums=npy.unique(enums);
                 
-                WriteData(fid,'object',self,'fieldname','enums','format','DoubleMat','mattype',1)
-
+                WriteData(fid,'data',enums,'enum',OutputdefinitionEnumsEnum(),'format','DoubleMat','mattype',1);
         # }}}