Changeset 8160


Ignore:
Timestamp:
13/03/12 13:32:01 (8 years ago)
Author:
mnagni
Message:

This new DB library adds better hash algorithm and a bug fix for the classes eq method

Location:
mauRepo/MolesManager/trunk/src
Files:
803 edited

Legend:

Unmodified
Added
Removed
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_acquisition.py

    r8091 r8160  
    2121from ea_model.moles3_4.acquisition.mo_acquisition import  MO_Acquisition  
    2222from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_process import  CEDA_Process  
    23 from ascore.utils import has_value 
     23from ascore.utils import has_value, collectionProofHash 
    2424 
    2525''' 
    26 Created on 16-Feb-2012 16:18:11 
     26Created on 13-Mar-2012 11:08:08 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_Acquisition(MO_Acquisition, CEDA_Process): 
     31class CEDA_Acquisition(MO_Acquisition,CEDA_Process): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._ceda_process = CEDA_Process()      
    4344        self._mo_acquisition = MO_Acquisition()          
    44         self._ceda_process = CEDA_Process()      
    4545 
    4646        self.identifier = [] 
     
    5353        self.description = None 
    5454        self.instrumentPlatformPair = [] 
     55        self.realatedParty = [] 
     56        self._generatedObservation_om_complexobservation = [] 
     57        self._generatedObservation_om_geometryobservation = [] 
     58        self._generatedObservation_om_temporalobservation = [] 
     59        self._generatedObservation_om_truthobservation = [] 
     60        self._generatedObservation_om_categoryobservation = [] 
     61        self._generatedObservation_om_measurement = [] 
     62        self._generatedObservation_om_countobservation = [] 
    5563        self._generatedObservation_om_discretecoverageobservation = [] 
    56         self._generatedObservation_om_temporalobservation = [] 
    57         self._generatedObservation_om_measurement = [] 
    5864        self._generatedObservation_mo_observation = [] 
    59         self._generatedObservation_om_truthobservation = [] 
    60         self._generatedObservation_om_countobservation = [] 
    61         self._generatedObservation_om_categoryobservation = [] 
    62         self._generatedObservation_om_geometryobservation = [] 
    63         self._generatedObservation_om_complexobservation = [] 
    64         self.realatedParty = [] 
    6565        super(CEDA_Acquisition, self).__init__() 
    6666 
     
    130130 
    131131    @property 
    132     def generatedObservation(self):      
    133         return self._mo_acquisition.generatedObservation 
    134  
    135     @generatedObservation.setter 
    136     def generatedObservation(self, value):       
    137             self._mo_acquisition.generatedObservation = value 
    138  
    139     @property 
    140132    def realatedParty(self):     
    141133        return self._mo_acquisition.realatedParty 
     
    145137            self._mo_acquisition.realatedParty = value 
    146138 
     139    @property 
     140    def generatedObservation(self):      
     141        return self._ceda_process.generatedObservation 
     142 
     143    @generatedObservation.setter 
     144    def generatedObservation(self, value):       
     145            self._ceda_process.generatedObservation = value 
     146 
    147147    def __key(self): 
    148         return (self.identifier, self.instrument, self.review, self.operation, self.documentation, self.outputDescription, self.platform, self.description, self.instrumentPlatformPair, self.generatedObservation, self.realatedParty) 
     148        return (self.identifier, self.instrument, self.review, self.operation, self.documentation, self.outputDescription, self.platform, self.description, self.instrumentPlatformPair, self.realatedParty, self.generatedObservation) 
    149149 
    150150    def __eq__(self, y): 
     151        if type(self) != type(y): 
     152            return False 
    151153        ''' 
    152154        Cannot compare classes which do not define a "__key" attribute  
     
    157159 
    158160    def __hash__(self): 
    159         return hash(self.__key()) 
     161        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_instrument.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.acquisition.mo_instrument import  MO_Instrument  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    103103 
    104104    def __eq__(self, y): 
     105        if type(self) != type(y): 
     106            return False 
    105107        ''' 
    106108        Cannot compare classes which do not define a "__key" attribute  
     
    111113 
    112114    def __hash__(self): 
    113         return hash(self.__key()) 
     115        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_operation.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.acquisition.mo_operation import  MO_Operation  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
     
    131131 
    132132    def __eq__(self, y): 
     133        if type(self) != type(y): 
     134            return False 
    133135        ''' 
    134136        Cannot compare classes which do not define a "__key" attribute  
     
    139141 
    140142    def __hash__(self): 
    141         return hash(self.__key()) 
     143        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_acquisition/ceda_platform.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.acquisition.mo_platform import  MO_Platform  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:02 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    4343 
    4444        self.identifier = [] 
     45        self.type = None 
    4546        self.relatedParty = [] 
    46         self.type = None 
    4747        self.review = [] 
    4848        self.documentation = [] 
     
    6161 
    6262    @property 
     63    def type(self):      
     64        return self._mo_platform.type 
     65 
     66    @type.setter 
     67    def type(self, value):       
     68            self._mo_platform.type = value 
     69 
     70    @property 
    6371    def relatedParty(self):      
    6472        return self._mo_platform.relatedParty 
     
    6775    def relatedParty(self, value):       
    6876            self._mo_platform.relatedParty = value 
    69  
    70     @property 
    71     def type(self):      
    72         return self._mo_platform.type 
    73  
    74     @type.setter 
    75     def type(self, value):       
    76             self._mo_platform.type = value 
    7777 
    7878    @property 
     
    109109 
    110110    def __key(self): 
    111         return (self.identifier, self.relatedParty, self.type, self.review, self.documentation, self.location, self.description, self.childPlatform) 
     111        return (self.identifier, self.type, self.relatedParty, self.review, self.documentation, self.location, self.description, self.childPlatform) 
    112112 
    113113    def __eq__(self, y): 
     114        if type(self) != type(y): 
     115            return False 
    114116        ''' 
    115117        Cannot compare classes which do not define a "__key" attribute  
     
    120122 
    121123    def __hash__(self): 
    122         return hash(self.__key()) 
     124        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_computation/ceda_processing.py

    r8091 r8160  
    2121from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_process import  CEDA_Process  
    2222from ea_model.moles3_4.computation.mo_processing import  MO_Processing  
    23 from ascore.utils import has_value 
     23from ascore.utils import has_value, collectionProofHash 
    2424 
    2525''' 
    26 Created on 16-Feb-2012 16:18:05 
     26Created on 13-Mar-2012 11:08:09 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_Processing(CEDA_Process,MO_Processing): 
     31class CEDA_Processing(MO_Processing,CEDA_Process): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._ceda_process = CEDA_Process()      
    4344        self._mo_processing = MO_Processing()    
    44         self._ceda_process = CEDA_Process()      
    4545 
    4646        self.identifier = [] 
     
    5353        self.description = None 
    5454        self.processingOutput = None 
     55        self._generatedObservation_om_complexobservation = [] 
     56        self._generatedObservation_om_geometryobservation = [] 
     57        self._generatedObservation_om_temporalobservation = [] 
     58        self._generatedObservation_om_truthobservation = [] 
     59        self._generatedObservation_om_categoryobservation = [] 
     60        self._generatedObservation_om_measurement = [] 
     61        self._generatedObservation_om_countobservation = [] 
    5562        self._generatedObservation_om_discretecoverageobservation = [] 
    56         self._generatedObservation_om_temporalobservation = [] 
    57         self._generatedObservation_om_measurement = [] 
    5863        self._generatedObservation_mo_observation = [] 
    59         self._generatedObservation_om_truthobservation = [] 
    60         self._generatedObservation_om_countobservation = [] 
    61         self._generatedObservation_om_categoryobservation = [] 
    62         self._generatedObservation_om_geometryobservation = [] 
    63         self._generatedObservation_om_complexobservation = [] 
    6464        super(CEDA_Processing, self).__init__() 
    6565 
     
    130130    @property 
    131131    def generatedObservation(self):      
    132         return self._mo_processing.generatedObservation 
     132        return self._ceda_process.generatedObservation 
    133133 
    134134    @generatedObservation.setter 
    135135    def generatedObservation(self, value):       
    136             self._mo_processing.generatedObservation = value 
     136            self._ceda_process.generatedObservation = value 
    137137 
    138138    def __key(self): 
     
    140140 
    141141    def __eq__(self, y): 
     142        if type(self) != type(y): 
     143            return False 
    142144        ''' 
    143145        Cannot compare classes which do not define a "__key" attribute  
     
    148150 
    149151    def __hash__(self): 
    150         return hash(self.__key()) 
     152        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observation/ceda_citation.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:00 
     24Created on 13-Mar-2012 11:08:11 
    2525 
    2626@author: mnagni 
     
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
     
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observation/ceda_observation.py

    r8147 r8160  
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
     
    4646        self._geographicExtent_ex_geographicdescription = [] 
    4747        self._geographicExtent_ex_geographicboundingbox = [] 
    48         #self.relatedParty = [] 
     48        self.relatedParty = [] 
     49        self._permission_md_legalconstraints = None 
    4950        self._permission_md_securityconstraints = None 
    50         self._permission_md_legalconstraints = None 
    5151        self.resultTime = None 
    5252        self.resultAccumulation = None 
    53         self._observedProperty_gf_attributetype = None 
    5453        self._observedProperty_gf_associationrole = None 
    5554        self._observedProperty_gf_operation = None 
     55        self._observedProperty_gf_attributetype = None 
    5656        self.parameter = [] 
    5757        self.publicationState = None 
     
    6363        self.documentation = [] 
    6464        self.validTime = None 
     65        self._resultQuality_qe_usability = [] 
     66        self._resultQuality_dq_positionalaccuracy = [] 
    6567        self._resultQuality_dq_logicalconsistency = [] 
     68        self._resultQuality_dq_temporalaccuracy = [] 
    6669        self._resultQuality_dq_thematicaccuracy = [] 
    67         self._resultQuality_qe_usability = [] 
    6870        self._resultQuality_dq_completeness = [] 
    69         self._resultQuality_dq_positionalaccuracy = [] 
    70         self._resultQuality_dq_temporalaccuracy = [] 
     71        self._procedure_ceda_processing = None 
     72        self._procedure_ceda_acquisition = None 
    7173        self._procedure_ceda_compositeprocess = None 
    72         self._procedure_ceda_acquisition = None 
    73         self._procedure_ceda_processing = None 
    7474        self.result = None 
    7575        self.verticalExtent = [] 
    7676        self.inSupportOf = None 
     77        self.internalReview = [] 
    7778        self.citation = [] 
    78         self.internalReview = [] 
    79         self._featureOfInterest_sf_samplingfeature = None 
    8079        self._featureOfInterest_mo_featureofinterest = None 
    8180        self._featureOfInterest_gfi_domainfeature = None 
     81        self._featureOfInterest_sf_samplingfeature = None 
     82        self._relatedObservation_om_complexobservation = [] 
     83        self._relatedObservation_om_geometryobservation = [] 
     84        self._relatedObservation_om_temporalobservation = [] 
     85        self._relatedObservation_om_truthobservation = [] 
     86        self._relatedObservation_om_categoryobservation = [] 
     87        self._relatedObservation_om_measurement = [] 
     88        self._relatedObservation_om_countobservation = [] 
     89        self._relatedObservation_om_discretecoverageobservation = [] 
     90        self._relatedObservation_mo_observation = [] 
    8291        self.status = None 
    8392        self.keywords = [] 
    84         self._relatedObservation_om_discretecoverageobservation = [] 
    85         self._relatedObservation_om_temporalobservation = [] 
    86         self._relatedObservation_om_measurement = [] 
    87         self._relatedObservation_mo_observation = [] 
    88         self._relatedObservation_om_truthobservation = [] 
    89         self._relatedObservation_om_countobservation = [] 
    90         self._relatedObservation_om_categoryobservation = [] 
    91         self._relatedObservation_om_geometryobservation = [] 
    92         self._relatedObservation_om_complexobservation = [] 
    9393        self.description = None 
    9494        super(CEDA_Observation, self).__init__() 
     
    255255 
    256256    @property 
     257    def relatedObservation(self):        
     258        return self._mo_observation.relatedObservation 
     259 
     260    @relatedObservation.setter 
     261    def relatedObservation(self, value):         
     262            self._mo_observation.relatedObservation = value 
     263 
     264    @property 
    257265    def status(self):    
    258266        return self._mo_observation.status 
     
    263271 
    264272    @property 
    265     def relatedObservation(self):        
    266         return self._mo_observation.relatedObservation 
    267  
    268     @relatedObservation.setter 
    269     def relatedObservation(self, value):         
    270             self._mo_observation.relatedObservation = value 
    271  
    272     @property 
    273273    def description(self):       
    274274        return self._mo_observation.description 
     
    279279 
    280280    def __key(self): 
    281         return (self.resolution, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.resultAccumulation, self.observedProperty, self.parameter, self.publicationState, self.identifier, self.metadata, self.dataLineage, self.phenomenonTime, self.documentation, self.validTime, self.resultQuality, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.citation, self.internalReview, self.featureOfInterest, self.status, self.keywords, self.relatedObservation, self.description) 
     281        return (self.resolution, self.geographicExtent, self.relatedParty, self.permission, self.resultTime, self.resultAccumulation, self.observedProperty, self.parameter, self.publicationState, self.identifier, self.metadata, self.dataLineage, self.phenomenonTime, self.documentation, self.validTime, self.resultQuality, self.procedure, self.result, self.verticalExtent, self.inSupportOf, self.internalReview, self.citation, self.featureOfInterest, self.relatedObservation, self.status, self.keywords, self.description) 
    282282 
    283283    def __eq__(self, y): 
     284        if type(self) != type(y): 
     285            return False 
    284286        ''' 
    285287        Cannot compare classes which do not define a "__key" attribute  
     
    289291        return id(self) == id(y) 
    290292 
    291     def __hash__(self):   
    292         return collectionProofHash(self.__key())       
     293    def __hash__(self): 
     294        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationcollection/ceda_observationcollection.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.observationcollection.mo_observationcollection import  MO_ObservationCollection  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
     
    5252        self.verticalExtent = [] 
    5353        self.subCollection = [] 
     54        self.member = [] 
    5455        self.additionalMetadata = [] 
    55         self.member = [] 
    5656        self.description = None 
    5757        self.CEDAOfficer = None 
     
    108108 
    109109    @property 
     110    def member(self):    
     111        return self._mo_observationcollection.member 
     112 
     113    @member.setter 
     114    def member(self, value):     
     115            self._mo_observationcollection.member = value 
     116 
     117    @property 
    110118    def additionalMetadata(self):        
    111119        return self._mo_observationcollection.additionalMetadata 
     
    114122    def additionalMetadata(self, value):         
    115123            self._mo_observationcollection.additionalMetadata = value 
    116  
    117     @property 
    118     def member(self):    
    119         return self._mo_observationcollection.member 
    120  
    121     @member.setter 
    122     def member(self, value):     
    123             self._mo_observationcollection.member = value 
    124124 
    125125    @property 
     
    140140 
    141141    def __key(self): 
    142         return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.review, self.verticalExtent, self.subCollection, self.additionalMetadata, self.member, self.description, self.CEDAOfficer, self.isoMetadata) 
     142        return (self.identifier, self.publicationState, self.geographicExtent, self.phenomenonTime, self.review, self.verticalExtent, self.subCollection, self.member, self.additionalMetadata, self.description, self.CEDAOfficer, self.isoMetadata) 
    143143 
    144144    def __eq__(self, y): 
     145        if type(self) != type(y): 
     146            return False 
    145147        ''' 
    146148        Cannot compare classes which do not define a "__key" attribute  
     
    151153 
    152154    def __hash__(self): 
    153         return hash(self.__key()) 
     155        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_compositeprocess.py

    r8091 r8160  
    2121from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_process import  CEDA_Process  
    2222from ea_model.moles3_4.observationprocess.mo_compositeprocess import  MO_CompositeProcess  
    23 from ascore.utils import has_value 
     23from ascore.utils import has_value, collectionProofHash 
    2424 
    2525''' 
    26 Created on 16-Feb-2012 16:18:04 
     26Created on 13-Mar-2012 11:08:06 
    2727 
    2828@author: mnagni 
    2929''' 
    3030 
    31 class CEDA_CompositeProcess(CEDA_Process,MO_CompositeProcess): 
     31class CEDA_CompositeProcess(MO_CompositeProcess,CEDA_Process): 
    3232    ''' 
    3333        Represents a data entity defined in a UML diagram and supposed to  
     
    4141    ''' 
    4242    def __init__(self): 
     43        self._ceda_process = CEDA_Process()      
    4344        self._mo_compositeprocess = MO_CompositeProcess()        
    44         self._ceda_process = CEDA_Process()      
    4545 
    4646        self.identifier = [] 
     
    4949        self.review = [] 
    5050        self.documentation = [] 
     51        self.acquisitionComponent = [] 
    5152        self.description = None 
    52         self.acquisitionComponent = [] 
     53        self._generatedObservation_om_complexobservation = [] 
     54        self._generatedObservation_om_geometryobservation = [] 
     55        self._generatedObservation_om_temporalobservation = [] 
     56        self._generatedObservation_om_truthobservation = [] 
     57        self._generatedObservation_om_categoryobservation = [] 
     58        self._generatedObservation_om_measurement = [] 
     59        self._generatedObservation_om_countobservation = [] 
    5360        self._generatedObservation_om_discretecoverageobservation = [] 
    54         self._generatedObservation_om_temporalobservation = [] 
    55         self._generatedObservation_om_measurement = [] 
    5661        self._generatedObservation_mo_observation = [] 
    57         self._generatedObservation_om_truthobservation = [] 
    58         self._generatedObservation_om_countobservation = [] 
    59         self._generatedObservation_om_categoryobservation = [] 
    60         self._generatedObservation_om_geometryobservation = [] 
    61         self._generatedObservation_om_complexobservation = [] 
    6262        super(CEDA_CompositeProcess, self).__init__() 
    6363 
     
    9595 
    9696    @property 
     97    def acquisitionComponent(self):      
     98        return self._mo_compositeprocess.acquisitionComponent 
     99 
     100    @acquisitionComponent.setter 
     101    def acquisitionComponent(self, value):       
     102            self._mo_compositeprocess.acquisitionComponent = value 
     103 
     104    @property 
    97105    def description(self):       
    98106        return self._mo_compositeprocess.description 
     
    103111 
    104112    @property 
    105     def acquisitionComponent(self):      
    106         return self._mo_compositeprocess.acquisitionComponent 
    107  
    108     @acquisitionComponent.setter 
    109     def acquisitionComponent(self, value):       
    110             self._mo_compositeprocess.acquisitionComponent = value 
    111  
    112     @property 
    113113    def generatedObservation(self):      
    114         return self._mo_compositeprocess.generatedObservation 
     114        return self._ceda_process.generatedObservation 
    115115 
    116116    @generatedObservation.setter 
    117117    def generatedObservation(self, value):       
    118             self._mo_compositeprocess.generatedObservation = value 
     118            self._ceda_process.generatedObservation = value 
    119119 
    120120    def __key(self): 
    121         return (self.identifier, self.computationComponent, self.relatedParty, self.review, self.documentation, self.description, self.acquisitionComponent, self.generatedObservation) 
     121        return (self.identifier, self.computationComponent, self.relatedParty, self.review, self.documentation, self.acquisitionComponent, self.description, self.generatedObservation) 
    122122 
    123123    def __eq__(self, y): 
     124        if type(self) != type(y): 
     125            return False 
    124126        ''' 
    125127        Cannot compare classes which do not define a "__key" attribute  
     
    130132 
    131133    def __hash__(self): 
    132         return hash(self.__key()) 
     134        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_observationprocess/ceda_process.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.observationprocess.mo_process import  MO_Process  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:09 
    2626 
    2727@author: mnagni 
     
    4242        self._mo_process = MO_Process()          
    4343 
     44        self._generatedObservation_om_complexobservation = [] 
     45        self._generatedObservation_om_geometryobservation = [] 
     46        self._generatedObservation_om_temporalobservation = [] 
     47        self._generatedObservation_om_truthobservation = [] 
     48        self._generatedObservation_om_categoryobservation = [] 
     49        self._generatedObservation_om_measurement = [] 
     50        self._generatedObservation_om_countobservation = [] 
    4451        self._generatedObservation_om_discretecoverageobservation = [] 
    45         self._generatedObservation_om_temporalobservation = [] 
    46         self._generatedObservation_om_measurement = [] 
    4752        self._generatedObservation_mo_observation = [] 
    48         self._generatedObservation_om_truthobservation = [] 
    49         self._generatedObservation_om_countobservation = [] 
    50         self._generatedObservation_om_categoryobservation = [] 
    51         self._generatedObservation_om_geometryobservation = [] 
    52         self._generatedObservation_om_complexobservation = [] 
    5353        super(CEDA_Process, self).__init__() 
    5454 
     
    6565 
    6666    def __eq__(self, y): 
     67        if type(self) != type(y): 
     68            return False 
    6769        ''' 
    6870        Cannot compare classes which do not define a "__key" attribute  
     
    7375 
    7476    def __hash__(self): 
    75         return hash(self.__key()) 
     77        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_project/ceda_project.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.project.mo_project import  MO_Project  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    149149 
    150150    def __eq__(self, y): 
     151        if type(self) != type(y): 
     152            return False 
    151153        ''' 
    152154        Cannot compare classes which do not define a "__key" attribute  
     
    157159 
    158160    def __hash__(self): 
    159         return hash(self.__key()) 
     161        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_curationvalue.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_b = "b"  
    3738    cl_a = "a"  
    3839    cl_c = "c"  
    39     cl_b = "b"  
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_result/ceda_result.py

    r8091 r8160  
    2020 
    2121from ea_model.moles3_4.result.mo_result import  MO_Result  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    7979 
    8080    def __eq__(self, y): 
     81        if type(self) != type(y): 
     82            return False 
    8183        ''' 
    8284        Cannot compare classes which do not define a "__key" attribute  
     
    8789 
    8890    def __hash__(self): 
    89         return hash(self.__key()) 
     91        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_notes.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:06 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
     
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
     
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_review.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
     
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
     
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewfrequencyvalue.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/ceda_metadatamodel/ceda_utilities/ceda_reviewstatusvalue.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
     37    cl_progressing = "progressing"  
    3738    cl_required = "required"  
    3839    cl_complete = "complete"  
    39     cl_progressing = "progressing"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_00639_language_codes/languagecode.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:02 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    3535        This class has been genererated automatically using the Apache Velocity project. 
    3636    ''' 
    37     cl_serbian = "Serbian"  
    38     cl_japanese = "Japanese"  
     37    cl_romanian = "Romanian"  
     38    cl_finnish = "Finnish"  
     39    cl_indonesian = "Indonesian"  
     40    cl_danish = "Danish"  
     41    cl_belarusian = "Belarusian"  
     42    cl_hebrew = "Hebrew"  
     43    cl_slovenian = "Slovenian"  
     44    cl_portuguese = "Portuguese"  
     45    cl_italian = "Italian"  
     46    cl_french_canadian_ = "French(Canadian)"  
     47    cl_german = "German"  
     48    cl_hungarian = "Hungarian"  
     49    cl_albanian = "Albanian"  
    3950    cl_afrikaans = "Afrikaans"  
    40     cl_greek = "Greek"  
    41     cl_english = "English"  
    42     cl_catalan = "Catalan"  
    43     cl_icelandic = "Icelandic"  
    44     cl_swahili = "Swahili"  
    4551    cl_russian = "Russian"  
    4652    cl_korean = "Korean"  
    47     cl_german = "German"  
     53    cl_chinese = "Chinese"  
     54    cl_bulgarian = "Bulgarian"  
     55    cl_icelandic = "Icelandic"  
     56    cl_malaysian = "Malaysian"  
     57    cl_serbian = "Serbian"  
     58    cl_catalan = "Catalan"  
    4859    cl_hawaian = "Hawaian"  
    49     cl_indonesian = "Indonesian"  
    50     cl_basque = "Basque"  
     60    cl_japanese = "Japanese"  
     61    cl_czech = "Czech"  
     62    cl_turkish = "Turkish"  
     63    cl_greek = "Greek"  
     64    cl_polish = "Polish"  
     65    cl_ukranian = "Ukranian"  
     66    cl_english = "English"  
     67    cl_spanish = "Spanish"  
     68    cl_lithuanian = "Lithuanian"  
    5169    cl_arabic = "Arabic"  
    52     cl_slovak = "Slovak"  
    53     cl_lithuanian = "Lithuanian"  
    54     cl_czech = "Czech"  
    55     cl_chinese = "Chinese"  
    56     cl_italian = "Italian"  
    57     cl_polish = "Polish"  
    58     cl_slovenian = "Slovenian"  
    59     cl_croatian = "Croatian"  
    60     cl_hungarian = "Hungarian"  
    6170    cl_latvian = "Latvian"  
    6271    cl_dutch = "Dutch"  
    63     cl_hebrew = "Hebrew"  
    64     cl_romanian = "Romanian"  
    6572    cl_faeroese = "Faeroese"  
     73    cl_croatian = "Croatian"  
     74    cl_swahili = "Swahili"  
     75    cl_estonian = "Estonian"  
     76    cl_french = "French"  
    6677    cl_swedish = "Swedish"  
    6778    cl_norwegian = "Norwegian"  
    68     cl_belarusian = "Belarusian"  
    69     cl_malaysian = "Malaysian"  
    70     cl_estonian = "Estonian"  
    71     cl_french_canadian_ = "French(Canadian)"  
    72     cl_danish = "Danish"  
    73     cl_albanian = "Albanian"  
    74     cl_turkish = "Turkish"  
    75     cl_french = "French"  
    76     cl_finnish = "Finnish"  
    77     cl_ukranian = "Ukranian"  
    78     cl_portuguese = "Portuguese"  
    79     cl_bulgarian = "Bulgarian"  
    80     cl_spanish = "Spanish"  
     79    cl_basque = "Basque"  
     80    cl_slovak = "Slovak"  
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angle.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:05 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/angularvelocity.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    6060 
    6161    def __eq__(self, y): 
     62        if type(self) != type(y): 
     63            return False 
    6264        ''' 
    6365        Cannot compare classes which do not define a "__key" attribute  
     
    6870 
    6971    def __hash__(self): 
    70         return hash(self.__key()) 
     72        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/area.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:03 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/currency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/distance.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.length import  Length  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
     
    6666 
    6767    def __eq__(self, y): 
     68        if type(self) != type(y): 
     69            return False 
    6870        ''' 
    6971        Cannot compare classes which do not define a "__key" attribute  
     
    7476 
    7577    def __hash__(self): 
    76         return hash(self.__key()) 
     78        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/length.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measure.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:03 
     24Created on 13-Mar-2012 11:08:03 
    2525 
    2626@author: mnagni 
     
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
     
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/measuretype.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:02 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/scale.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:04 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    6060 
    6161    def __eq__(self, y): 
     62        if type(self) != type(y): 
     63            return False 
    6264        ''' 
    6365        Cannot compare classes which do not define a "__key" attribute  
     
    6870 
    6971    def __hash__(self): 
    70         return hash(self.__key()) 
     72        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/standardunits.py

    r8091 r8160  
    2020 
    2121from ascore.ascodelist import  ASCodeList  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:05 
    2626 
    2727@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/subunitsperunit.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:05 
     24Created on 13-Mar-2012 11:08:04 
    2525 
    2626@author: mnagni 
     
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
     
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/time.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    6666 
    6767    def __eq__(self, y): 
     68        if type(self) != type(y): 
     69            return False 
    6870        ''' 
    6971        Cannot compare classes which do not define a "__key" attribute  
     
    7476 
    7577    def __hash__(self): 
    76         return hash(self.__key()) 
     78        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitofmeasure.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:06 
    2525 
    2626@author: mnagni 
     
    4343        self.nameStandardUnit = None 
    4444        self.scaleToStandardUnit = None 
     45        self.measure = [] 
    4546        self.measureType = None 
    46         self.measure = [] 
    4747        self.offsetToStandardUnit = None 
    4848        self.uomName = None 
     
    5252 
    5353    def __key(self): 
    54         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     54        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    5555 
    5656    def __eq__(self, y): 
     57        if type(self) != type(y): 
     58            return False 
    5759        ''' 
    5860        Cannot compare classes which do not define a "__key" attribute  
     
    6365 
    6466    def __hash__(self): 
    65         return hash(self.__key()) 
     67        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/unitslist.py

    r8091 r8160  
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.standardunits import  StandardUnits  
    2222from ascore.ascodelist import  ASCodeList  
    23 from ascore.utils import has_value 
     23from ascore.utils import has_value, collectionProofHash 
    2424 
    2525''' 
    26 Created on 16-Feb-2012 16:18:03 
     26Created on 13-Mar-2012 11:08:12 
    2727 
    2828@author: mnagni 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangle.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomangularvelocity.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.uomvelocity import  UomVelocity  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._uomvelocity.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._uomvelocity.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._uomvelocity.measureType 
     
    8492    def measureType(self, value):        
    8593            self._uomvelocity.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._uomvelocity.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._uomvelocity.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomarea.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomcurrency.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:11 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomlength.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomscale.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomtime.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvelocity.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:09 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomvolume.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:11 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/uomweight.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.unitofmeasure import  UnitOfMeasure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    4545        self.nameStandardUnit = None 
    4646        self.scaleToStandardUnit = None 
     47        self.measure = [] 
    4748        self.measureType = None 
    48         self.measure = [] 
    4949        self.offsetToStandardUnit = None 
    5050        self.uomName = None 
     
    7878 
    7979    @property 
     80    def measure(self):   
     81        return self._unitofmeasure.measure 
     82 
     83    @measure.setter 
     84    def measure(self, value):    
     85            self._unitofmeasure.measure = value 
     86 
     87    @property 
    8088    def measureType(self):       
    8189        return self._unitofmeasure.measureType 
     
    8492    def measureType(self, value):        
    8593            self._unitofmeasure.measureType = value 
    86  
    87     @property 
    88     def measure(self):   
    89         return self._unitofmeasure.measure 
    90  
    91     @measure.setter 
    92     def measure(self, value):    
    93             self._unitofmeasure.measure = value 
    9494 
    9595    @property 
     
    126126 
    127127    def __key(self): 
    128         return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measureType, self.measure, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
     128        return (self.subunit, self.nameStandardUnit, self.scaleToStandardUnit, self.measure, self.measureType, self.offsetToStandardUnit, self.uomName, self.formula, self.uomSymbol) 
    129129 
    130130    def __eq__(self, y): 
     131        if type(self) != type(y): 
     132            return False 
    131133        ''' 
    132134        Cannot compare classes which do not define a "__key" attribute  
     
    137139 
    138140    def __hash__(self): 
    139         return hash(self.__key()) 
     141        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/velocity.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:09 
    2626 
    2727@author: mnagni 
     
    6060 
    6161    def __eq__(self, y): 
     62        if type(self) != type(y): 
     63            return False 
    6264        ''' 
    6365        Cannot compare classes which do not define a "__key" attribute  
     
    6870 
    6971    def __hash__(self): 
    70         return hash(self.__key()) 
     72        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/volume.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:07 
     25Created on 13-Mar-2012 11:08:08 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/derived/units_of_measure/weight.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.derived.units_of_measure.measure import  Measure  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/bag.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.collection import  Collection  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:00 
     25Created on 13-Mar-2012 11:08:14 
    2626 
    2727@author: mnagni 
     
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
     
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/circularsequence.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.sequence import  Sequence  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:11 
     25Created on 13-Mar-2012 11:08:06 
    2626 
    2727@author: mnagni 
     
    6666 
    6767    def __eq__(self, y): 
     68        if type(self) != type(y): 
     69            return False 
    6870        ''' 
    6971        Cannot compare classes which do not define a "__key" attribute  
     
    7476 
    7577    def __hash__(self): 
    76         return hash(self.__key()) 
     78        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/code.py

    r8091 r8160  
    2121from sqlalchemy.types import  Text,  NUMERIC  
    2222from ascore.asunion import  ASUnion  
    23 from ascore.utils import has_value 
     23from ascore.utils import has_value, collectionProofHash 
    2424 
    2525''' 
    26 Created on 16-Feb-2012 16:18:04 
     26Created on 13-Mar-2012 11:08:09 
    2727 
    2828@author: mnagni 
     
    3636        This class has been genererated automatically using the Apache Velocity project. 
    3737    ''' 
    38     types = {'asCharacter':Text,'asNumber':NUMERIC} 
     38    types = {'asNumber':NUMERIC,'asCharacter':Text} 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/codelist.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:01 
     24Created on 13-Mar-2012 11:08:12 
    2525 
    2626@author: mnagni 
     
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
     
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/collection.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/dictionary.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:04 
     24Created on 13-Mar-2012 11:08:14 
    2525 
    2626@author: mnagni 
     
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
     
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keytype.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:04 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/keyvaluepair.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:06 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
     
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
     
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/sequence.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.collection import  Collection  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:09 
     25Created on 13-Mar-2012 11:08:10 
    2626 
    2727@author: mnagni 
     
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
     
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/set.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.collections.collection import  Collection  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
     
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/t.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:09 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/transfiniteset.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:12 
     24Created on 13-Mar-2012 11:08:07 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/collections/valuetype.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:09 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/genericname.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:00 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
     
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
     
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/localname.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.genericname import  GenericName  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
     
    5757 
    5858    def __eq__(self, y): 
     59        if type(self) != type(y): 
     60            return False 
    5961        ''' 
    6062        Cannot compare classes which do not define a "__key" attribute  
     
    6567 
    6668    def __hash__(self): 
    67         return hash(self.__key()) 
     69        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/membername.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.localname import  LocalName  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:08 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    5959 
    6060    def __eq__(self, y): 
     61        if type(self) != type(y): 
     62            return False 
    6163        ''' 
    6264        Cannot compare classes which do not define a "__key" attribute  
     
    6769 
    6870    def __hash__(self): 
    69         return hash(self.__key()) 
     71        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/namespace.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:11 
     24Created on 13-Mar-2012 11:08:03 
    2525 
    2626@author: mnagni 
     
    4949 
    5050    def __eq__(self, y): 
     51        if type(self) != type(y): 
     52            return False 
    5153        ''' 
    5254        Cannot compare classes which do not define a "__key" attribute  
     
    5759 
    5860    def __hash__(self): 
    59         return hash(self.__key()) 
     61        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/null.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/reference.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:11 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/scopedname.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.genericname import  GenericName  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:03 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
     
    5757 
    5858    def __eq__(self, y): 
     59        if type(self) != type(y): 
     60            return False 
    5961        ''' 
    6062        Cannot compare classes which do not define a "__key" attribute  
     
    6567 
    6668    def __hash__(self): 
    67         return hash(self.__key()) 
     69        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/typename.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.localname import  LocalName  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:07 
    2626 
    2727@author: mnagni 
     
    5858 
    5959    def __eq__(self, y): 
     60        if type(self) != type(y): 
     61            return False 
    6062        ''' 
    6163        Cannot compare classes which do not define a "__key" attribute  
     
    6668 
    6769    def __hash__(self): 
    68         return hash(self.__key()) 
     70        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/names/void.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:06 
     24Created on 13-Mar-2012 11:08:13 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/any.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:09 
     24Created on 13-Mar-2012 11:08:04 
    2525 
    2626@author: mnagni 
     
    4646 
    4747    def __eq__(self, y): 
     48        if type(self) != type(y): 
     49            return False 
    4850        ''' 
    4951        Cannot compare classes which do not define a "__key" attribute  
     
    5456 
    5557    def __hash__(self): 
    56         return hash(self.__key()) 
     58        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/classtypedescriptor.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:05 
     24Created on 13-Mar-2012 11:08:10 
    2525 
    2626@author: mnagni 
     
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
     
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/operationtype.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:08 
     24Created on 13-Mar-2012 11:08:04 
    2525 
    2626@author: mnagni 
     
    5252 
    5353    def __eq__(self, y): 
     54        if type(self) != type(y): 
     55            return False 
    5456        ''' 
    5557        Cannot compare classes which do not define a "__key" attribute  
     
    6062 
    6163    def __hash__(self): 
    62         return hash(self.__key()) 
     64        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/record.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:06 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
     
    4747 
    4848    def __eq__(self, y): 
     49        if type(self) != type(y): 
     50            return False 
    4951        ''' 
    5052        Cannot compare classes which do not define a "__key" attribute  
     
    5557 
    5658    def __hash__(self): 
    57         return hash(self.__key()) 
     59        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordschema.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.records_and_class_metadata.schema import  Schema  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:06 
     25Created on 13-Mar-2012 11:08:12 
    2626 
    2727@author: mnagni 
     
    8585 
    8686    def __eq__(self, y): 
     87        if type(self) != type(y): 
     88            return False 
    8789        ''' 
    8890        Cannot compare classes which do not define a "__key" attribute  
     
    9395 
    9496    def __hash__(self): 
    95         return hash(self.__key()) 
     97        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/recordtype.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.records_and_class_metadata.type import  Type  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:10 
     25Created on 13-Mar-2012 11:08:13 
    2626 
    2727@author: mnagni 
     
    6868 
    6969    def __eq__(self, y): 
     70        if type(self) != type(y): 
     71            return False 
    7072        ''' 
    7173        Cannot compare classes which do not define a "__key" attribute  
     
    7678 
    7779    def __hash__(self): 
    78         return hash(self.__key()) 
     80        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/schema.py

    r8091 r8160  
    2020 
    2121from ea_model.iso_19103_2005_schema_language.basic_types.implementation.names.namespace import  NameSpace  
    22 from ascore.utils import has_value 
     22from ascore.utils import has_value, collectionProofHash 
    2323 
    2424''' 
    25 Created on 16-Feb-2012 16:18:02 
     25Created on 13-Mar-2012 11:08:11 
    2626 
    2727@author: mnagni 
     
    4545        self.isGlobal = None 
    4646        self.schemaName = None 
     47        self.description = None 
    4748        self.acceptableClassList = [] 
    48         self.description = None 
    4949        super(Schema, self).__init__() 
    5050 
     
    5858 
    5959    def __key(self): 
    60         return (self.name, self.isGlobal, self.schemaName, self.acceptableClassList, self.description) 
     60        return (self.name, self.isGlobal, self.schemaName, self.description, self.acceptableClassList) 
    6161 
    6262    def __eq__(self, y): 
     63        if type(self) != type(y): 
     64            return False 
    6365        ''' 
    6466        Cannot compare classes which do not define a "__key" attribute  
     
    6971 
    7072    def __hash__(self): 
    71         return hash(self.__key()) 
     73        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/implementation/records_and_class_metadata/type.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:03 
     24Created on 13-Mar-2012 11:08:05 
    2525 
    2626@author: mnagni 
     
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
     
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/clocktime.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:00 
     24Created on 13-Mar-2012 11:08:04 
    2525 
    2626@author: mnagni 
     
    5050 
    5151    def __eq__(self, y): 
     52        if type(self) != type(y): 
     53            return False 
    5254        ''' 
    5355        Cannot compare classes which do not define a "__key" attribute  
     
    5860 
    5961    def __hash__(self): 
    60         return hash(self.__key()) 
     62        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/date.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:12 
    2525 
    2626@author: mnagni 
     
    5151 
    5252    def __eq__(self, y): 
     53        if type(self) != type(y): 
     54            return False 
    5355        ''' 
    5456        Cannot compare classes which do not define a "__key" attribute  
     
    5961 
    6062    def __hash__(self): 
    61         return hash(self.__key()) 
     63        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/dateprecision.py

    r8091 r8160  
    1919 
    2020 
    21 from ascore.utils import has_value 
     21from ascore.utils import has_value, collectionProofHash 
    2222 
    2323''' 
    24 Created on 16-Feb-2012 16:18:10 
     24Created on 13-Mar-2012 11:08:09 
    2525 
    2626@author: mnagni 
     
    4848 
    4949    def __eq__(self, y): 
     50        if type(self) != type(y): 
     51            return False 
    5052        ''' 
    5153        Cannot compare classes which do not define a "__key" attribute  
     
    5658 
    5759    def __hash__(self): 
    58         return hash(self.__key()) 
     60        return collectionProofHash(self.__key()) 
  • mauRepo/MolesManager/trunk/src/ea_model/iso_19103_2005_schema_language/basic_types/primitive/date_and_time/datetime.py

    r8091 r8160  
    2121from ea_model.iso_19103_2005_schema_language.basic_types.primitive.date_and_time.clocktime import  ClockT