[Topographica-cvs] topographica/topo/base parameterclasses.py, 1.123, 1.124

[C. E. B. <ce...@us...>]

Update of /cvsroot/topographica/topographica/topo/base
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7610/topo/base

Modified Files:
	parameterclasses.py 
Log Message:
Made some of Dynamic's __get__-related method signatures match Parameter's __get__ better. Not really an important change. The place to read about the confusion is Parameter.__get__ itself.

Index: parameterclasses.py
===================================================================
RCS file: /cvsroot/topographica/topographica/topo/base/parameterclasses.py,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** parameterclasses.py	24 Dec 2007 10:09:56 -0000	1.123
--- parameterclasses.py	30 Dec 2007 08:28:14 -0000	1.124
***************
*** 211,215 ****
      # (i.e. probably need to have a better name and make this more formal + it might make
      # more sense to check for 'inspect' - need to think about it after doc+clean.)
!     def _value_is_dynamically_generated(self,obj):
          """
          Return True if the parameter is actually dynamic (i.e. the
--- 211,215 ----
      # (i.e. probably need to have a better name and make this more formal + it might make
      # more sense to check for 'inspect' - need to think about it after doc+clean.)
!     def _value_is_dynamically_generated(self,obj,objtype=None):
          """
          Return True if the parameter is actually dynamic (i.e. the
***************
*** 222,231 ****
          has one, otherwise inspects the parameter default value.
          """
!         gen=super(Dynamic,self).__get__(obj,None)
          return hasattr(gen,'_Dynamic_last')
  
  
!     def _inspect(self,obj):
!         gen=super(Dynamic,self).__get__(obj,None)
          if hasattr(gen,'_Dynamic_last'):
              return gen._Dynamic_last 
--- 222,232 ----
          has one, otherwise inspects the parameter default value.
          """
!         gen=super(Dynamic,self).__get__(obj,objtype)
          return hasattr(gen,'_Dynamic_last')
  
  
!     def _inspect(self,obj,objtype=None):
!         gen=super(Dynamic,self).__get__(obj,objtype)
!         
          if hasattr(gen,'_Dynamic_last'):
              return gen._Dynamic_last 
***************
*** 233,238 ****
              return gen 
      
!     def _force(self,obj):
!         gen=super(Dynamic,self).__get__(obj,None)
          if hasattr(gen,'_Dynamic_last'):
              return self._produce_value(gen,update=True)
--- 234,240 ----
              return gen 
      
!     def _force(self,obj,objtype=None):
!         gen=super(Dynamic,self).__get__(obj,objtype)
!         
          if hasattr(gen,'_Dynamic_last'):
              return self._produce_value(gen,update=True)
***************
*** 295,299 ****
          """
          result = super(Number,self).__get__(obj,objtype)
!         if self._value_is_dynamically_generated(obj): self._check_bounds(result)
          return result
  
--- 297,301 ----
          """
          result = super(Number,self).__get__(obj,objtype)
!         if self._value_is_dynamically_generated(obj,objtype): self._check_bounds(result)
          return result