Changeset 1047

Timestamp:

01/12/12 22:33:39 (4 months ago)

Author:

apdavison

Message:

Internal renaming for better PEP8 compliance

Location:

trunk

Files:

• doc/api_reference.txt (modified) (1 diff)
• doc/highlevelapi.txt (modified) (2 diffs)
• src/common/__init__.py (modified) (1 diff)
• src/common/populations.py (modified) (1 diff)
• src/core.py (modified) (1 diff)
• src/models.py (modified) (2 diffs)
• src/nest/__init__.py (modified) (1 diff)
• src/standardmodels/__init__.py (modified) (1 diff)
• test/unittests/test_standardmodels.py (modified) (4 diffs)
• test/unsorted/commontests.py (modified) (1 diff)

trunk/doc/api_reference.txt

@@ -3 +3 @@
 =============
 
-.. py:currentmodule:: pyNN.common
+.. py:currentmodule:: pyNN.proxy
 
 Simulation setup and control

trunk/doc/highlevelapi.txt

@@ -73 +73 @@
           models.BaseModelType.__init__(self, parameters)
         File "/home/andrew/dev/pyNN/models.py", line 16, in __init__
-          self.parameters = self.__class__.checkParameters(parameters, with_defaults=True)
-        File "/home/andrew/dev/pyNN/models.py", line 67, in checkParameters
+          self.parameters = self.__class__.check_parameters(parameters, with_defaults=True)
+        File "/home/andrew/dev/pyNN/models.py", line 67, in check_parameters
           raise errors.NonExistentParameterError(k, cls, cls.default_parameters.keys())
     NonExistentParameterError: foo (valid parameters for <class 'pyNN.neuron.standardmodels.cells.IF_curr_alpha'> are: cm, i_offset, tau_m, tau_refrac, tau_syn_E, tau_syn_I, v_reset, v_rest, v_thresh)
@@ -90 +90 @@
           models.BaseModelType.__init__(self, parameters)
         File "/home/andrew/dev/pyNN/models.py", line 16, in __init__
-          self.parameters = self.__class__.checkParameters(parameters, with_defaults=True)
-        File "/home/andrew/dev/pyNN/models.py", line 57, in checkParameters
+          self.parameters = self.__class__.check_parameters(parameters, with_defaults=True)
+        File "/home/andrew/dev/pyNN/models.py", line 57, in check_parameters
           raise errors.InvalidParameterValueError(err_msg)
     InvalidParameterValueError: For tau_m in IF_curr_alpha, expected <type 'float'>, got <type 'str'> (bar)

trunk/src/common/__init__.py

@@ -51 +51 @@
 from projections import Projection, check_weight, DEFAULT_WEIGHT
 from procedural_api import build_create, build_connect, set, build_record, initialize
-from control import setup, build_reset, build_state_queries
+from control import setup, end, run, build_reset, build_state_queries

trunk/src/common/populations.py

@@ -301 +301 @@
         else:
             raise errors.InvalidParameterValueError
-        param_dict = self.celltype.checkParameters(param_dict, with_defaults=False)
+        param_dict = self.celltype.check_parameters(param_dict, with_defaults=False)
         logger.debug("%s.set(%s)", self.label, param_dict)
         if hasattr(self, "_set_array"):

trunk/src/core.py

@@ -34 +34 @@
         return meth(self, val)
     return wrapped_meth
+
 
 def lazy_operation(name):

trunk/src/models.py

@@ -17 +17 @@
 
     def __init__(self, parameters):
-        self.parameters = self.__class__.checkParameters(parameters, with_defaults=True)
+        self.parameters = self.__class__.check_parameters(parameters, with_defaults=True)
 
     @classmethod
@@ -28 +28 @@
     
     @classmethod
-    def checkParameters(cls, supplied_parameters, with_defaults=False):
+    def check_parameters(cls, supplied_parameters, with_defaults=False):
         """
         Returns a parameter dictionary, checking that each

trunk/src/nest/__init__.py

@@ -252 +252 @@
         else:
             raise errors.InvalidParameterValueError
-        param_dict = self.celltype.checkParameters(param_dict, with_defaults=False)
+        param_dict = self.celltype.check_parameters(param_dict, with_defaults=False)
         # The default implementation in common is is not very efficient for
         # simple and scaled parameters.

trunk/src/standardmodels/__init__.py

@@ -69 +69 @@
     def translate(cls, parameters):
         """Translate standardized model parameters to simulator-specific parameters."""
-        parameters = cls.checkParameters(parameters, with_defaults=False)
+        parameters = cls.check_parameters(parameters, with_defaults=False)
         native_parameters = {}
         for name in parameters:

trunk/test/unittests/test_standardmodels.py

@@ -45 +45 @@
     """
     Instantiating a StandardModelType should set self.parameters to the value
-    of translate(checkParameters(parameters)).
+    of translate(check_parameters(parameters)).
     """
     M = StandardModelType
@@ -52 +52 @@
     P1 = {'a': 22.2, 'b': 33.3}
     P2 = {'A': 22.2, 'B': 333}
-    orig_checkParameters = M.checkParameters
+    orig_check_parameters = M.check_parameters
     orig_translate = M.translate
-    M.checkParameters = Mock(return_value=P2)
+    M.check_parameters = Mock(return_value=P2)
     M.translate = Mock()
     m = M(P1)
     assert isinstance(m.parameters, Mock)
-    M.checkParameters.assert_called_with(P1, with_defaults=True)
+    M.check_parameters.assert_called_with(P1, with_defaults=True)
     M.translate.assert_called_with(P2)
     
-    M.checkParameters = orig_checkParameters
+    M.check_parameters = orig_check_parameters
     M.translate = orig_translate
 
-def test_checkParameters_without_defaults():
+def test_check_parameters_without_defaults():
     M = StandardModelType
     M.default_parameters = {'a': 22.2, 'b': 33.3, 'c': [1, 2, 3], 'd': 'hello'}
-    assert_equal(M.checkParameters({'a': 11, 'c': [4, 5, 6], 'd': 'goodbye'}),
+    assert_equal(M.check_parameters({'a': 11, 'c': [4, 5, 6], 'd': 'goodbye'}),
                  {'a': 11.0,'c': [4, 5, 6], 'd': 'goodbye'})
 
-def test_checkParameters_with_defaults():
+def test_check_parameters_with_defaults():
     M = StandardModelType
     M.default_parameters = {'a': 22.2, 'b': 33.3, 'c': [1, 2, 3]}
-    assert_equal(M.checkParameters({'a': 11, 'c': [4, 5, 6]}, with_defaults=True),
+    assert_equal(M.check_parameters({'a': 11, 'c': [4, 5, 6]}, with_defaults=True),
                  {'a': 11.0, 'b': 33.3, 'c': [4, 5, 6]})
 
-def test_checkParameters_with_nonexistent_parameter():
+def test_check_parameters_with_nonexistent_parameter():
     M = StandardModelType
     M.default_parameters = {'a': 22.2, 'b': 33.3, 'c': [1, 2, 3]}
     assert_raises(errors.NonExistentParameterError,
-                  M.checkParameters, {'a': 11.1, 'z': 99.9})
-
-def test_checkParameters_with_invalid_value():
+                  M.check_parameters, {'a': 11.1, 'z': 99.9})
+
+def test_check_parameters_with_invalid_value():
     M = StandardModelType
     M.default_parameters = {'a': 22.2, 'b': 33.3, 'c': [1, 2, 3], 'd': 'hello'}
     assert_raises(errors.InvalidParameterValueError,
-                  M.checkParameters, {'a': 11.1, 'b': [4,3,2]})
+                  M.check_parameters, {'a': 11.1, 'b': [4,3,2]})
     assert_raises(errors.InvalidParameterValueError,
-                  M.checkParameters, {'a': 11.1, 'c': 12.3})
+                  M.check_parameters, {'a': 11.1, 'c': 12.3})
     assert_raises(errors.InvalidParameterValueError,
-                  M.checkParameters, {'a': 11.1, 'd': 12.3})
+                  M.check_parameters, {'a': 11.1, 'd': 12.3})
 
 def test_translate():
@@ -184 +184 @@
     """
     M = StandardModelType
-    orig_checkParameters = M.checkParameters
+    orig_check_parameters = M.check_parameters
     orig_translate = M.translate
-    M.checkParameters = Mock()
+    M.check_parameters = Mock()
     P = {'a': 3}
     M.translate = Mock(return_value=P)
@@ -193 +193 @@
     m.update_parameters({})
     m.parameters.update.assert_called_with(P)
-    M.checkParameters = orig_checkParameters
+    M.check_parameters = orig_check_parameters
     M.translate = orig_translate
 

trunk/test/unsorted/commontests.py

@@ -51 +51 @@
 class StandardModelTest(unittest.TestCase):
     
-    def testCheckParameters(self):
+    def testcheck_parameters(self):
         self.assertRaises(errors.InvalidParameterValueError, cells.SpikeSourceArray, {'spike_times': 0.0})
         self.assertRaises(errors.InvalidParameterValueError, cells.SpikeSourceInhGamma, {'a': 'foo'})