Changeset 1036

Timestamp:

12/16/11 14:56:15 (5 months ago)

Author:

apdavison

Message:

Removed Population.randomInit(distr) method. Deprecated since 0.7, and replaced by Population.initialize(v, distr)

Location:

trunk

Files:

• src/common/populations.py (modified) (1 diff)
• src/space.py (modified) (1 diff)
• test/benchmarks/ddpc.py (added)
• test/unsorted/generictests.py (modified) (3 diffs)

trunk/src/common/populations.py

@@ -366 +366 @@
             assert rarr.size == self.size, "%s != %s" % (rarr.size, self.size)
             self.tset(parametername, rarr)
-
-    def _call(self, methodname, arguments):
-        """
-        Call the method methodname(arguments) for every cell in the population.
-        e.g. p.call("set_background","0.1") if the cell class has a method
-        set_background().
-        """
-        raise NotImplementedError()
-
-    def _tcall(self, methodname, objarr):
-        """
-        `Topographic' call. Call the method methodname() for every cell in the
-        population. The argument to the method depends on the coordinates of
-        the cell. objarr is an array with the same dimensions as the
-        Population.
-        e.g. p.tcall("memb_init", vinitArray) calls
-        p.cell[i][j].memb_init(vInitArray[i][j]) for all i,j.
-        """
-        raise NotImplementedError()
-
-    #@deprecated("initialize('v', rand_distr)")
-    def randomInit(self, rand_distr):
-        """
-        Set initial membrane potentials for all the cells in the population to
-        random values.
-        """
-        warn("The randomInit() method is deprecated, and will be removed in a future release. Use initialize('v', rand_distr) instead.")
-        self.initialize('v', rand_distr)
 
     def initialize(self, variable, value):

trunk/src/space.py

@@ -188 +188 @@
         nx = math.sqrt(n*self.aspect_ratio)
         if n%nx != 0:
-            raise Exception("Invalid size")
+            raise Exception("Invalid size: n=%g, nx=%d" % (n, nx))
         ny = n/nx
         return nx, ny

trunk/test/unsorted/generictests.py

@@ -458 +458 @@
         self.assertRaises(errors.NonExistentParameterError, self.p1.set, {'tau_foo': 10.0, 'tau_m': 21.0})
             
-    def testRandomInit(self):        
+    def test_initialize_v(self):        
         rd = random.RandomDistribution(rng=random.NumpyRNG(seed=98765, num_processes=sim.num_processes()),
                                        distribution='uniform',
                                        parameters=[-75,-55])
-        self.p1.randomInit(rd)
+        self.p1.initialize('v', rd)
         #self.assertNotEqual(self.p1[0,0,0].v_init, self.p1[0,0,1].v_init)
         self.assertNotEqual(self.p1.local_cells[0].get_initial_value('v'), self.p1.local_cells[1].get_initial_value('v'))
@@ -592 +592 @@
         v_thresh = -50.0
         uniformDistr = random.RandomDistribution(rng=rng, distribution='uniform', parameters=[v_reset, v_thresh])
-        self.pop2.randomInit(uniformDistr)
+        self.pop2.initialize('v', uniformDistr)
         cells_to_record = [self.pop2[0], self.pop2[4]]
         self.pop2.record_v(cells_to_record)
@@ -1077 +1077 @@
         v_thresh = -50.0
         uniformDistr = random.RandomDistribution(rng=rng, distribution='uniform', parameters=[v_reset, v_thresh])
-        self.pop.randomInit(uniformDistr)
+        self.pop.initialize('v', uniformDistr)
         self.cells_to_record = [self.pop[0], self.pop[4]]
         self.pop.record_v(self.cells_to_record)