Changeset 1048

Timestamp:

01/12/12 22:59:20 (4 months ago)

Author:

apdavison

Message:

Assorted minor fixes

Location:

trunk

Files:

• src/common/projections.py (modified) (2 diffs)
• src/core.py (modified) (2 diffs)
• src/nest/__init__.py (modified) (1 diff)
• src/nest/standardmodels/electrodes.py (modified) (2 diffs)
• src/neuron/nmodl/alphaisyn.mod (modified) (3 diffs)
• src/neuron/nmodl/alphasyn.mod (modified) (3 diffs)
• src/neuron/standardmodels/electrodes.py (modified) (1 diff)
• src/random.py (modified) (2 diffs)
• test/system/scenarios.py (modified) (2 diffs)

trunk/src/common/projections.py

@@ -287 +287 @@
                 lines.append([self.pre.id_to_index(c.source), self.post.id_to_index(c.target), c.weight, c.delay])
         
-        if gather == True and num_processes() > 1:
-            all_lines = { rank(): lines }
+        if gather == True and self._simulator.state.num_processes > 1:
+            all_lines = { self._simulator.state.mpi_rank: lines }
             all_lines = recording.gather_dict(all_lines)
             if self._simulator.state.mpi_rank == 0:
@@ -297 +297 @@
         logger.debug("--- Projection[%s].__saveConnections__() ---" % self.label)
         
-        if gather == False or rank() == 0:
+        if gather == False or self._simulator.state.mpi_rank == 0:
             file.write(lines, {'pre' : self.pre.label, 'post' : self.post.label})
             file.close()

trunk/src/core.py

@@ -20 +20 @@
     Maybe need to split into different functions, as don't always need length.
     """
-    return type(obj) in [list, numpy.ndarray, tuple, set]
+    return isinstance(obj, (list, numpy.ndarray, tuple, set))
 
 
@@ -233 +233 @@
     __rmul__ = __mul__
     __div__  = lazy_operation('div')
+    __rdiv__ = __div__
     __pow__  = lazy_operation('pow')
     

trunk/src/nest/__init__.py

@@ -26 +26 @@
 from pyNN.nest.connectors import *
 from pyNN.nest.standardmodels.synapses import *
-from pyNN.nest.electrodes import *
 from pyNN.nest.standardmodels.electrodes import *
 from pyNN.nest.recording import *

trunk/src/nest/standardmodels/electrodes.py

@@ -31 +31 @@
         self._device   = nest.Create(self.nest_name)
         self.cell_list = []
-        self.set_native_parameters(parameters)
+        self.set_native_parameters(self.parameters)
 
     def inject_into(self, cell_list):
@@ -45 +45 @@
 
     def set_native_parameters(self, parameters): 
-        parameters = self.translate(parameters)
+        #parameters = self.translate(parameters)
         for key, value in parameters.items():
             self.parameters[key] = value

trunk/src/neuron/nmodl/alphaisyn.mod

@@ -30 +30 @@
         i (nA)
         q
+        quiet
         onset_times[MAX_SPIKES] (ms)
         weight_list[MAX_SPIKES] (nA)
@@ -37 +38 @@
         i  = 0
         q  = 0 : queue index
+        quiet = 0
 }
 
@@ -79 +81 @@
         :printf("t = %f, weight = %f\n", t, weight)
         if (q >= MAX_SPIKES-1) {
-                printf("Error in AlphaSynI. Spike queue is full\n")
+                if (!quiet) {
+                        printf("Error in AlphaSynI. Spike queue is full\n")
+                        quiet = 1
+                }
         } else {
                 q = q + 1

trunk/src/neuron/nmodl/alphasyn.mod

@@ -34 +34 @@
         g (uS)
         q
+        quiet
         onset_times[MAX_SPIKES] (ms)
         weight_list[MAX_SPIKES] (uS)
@@ -41 +42 @@
         i  = 0
         q  = 0 : queue index
+        quiet = 0
 }
 
@@ -83 +85 @@
         weight_list[q] = weight
         if (q >= MAX_SPIKES-1) {
-                printf("Error in AlphaSyn. Spike queue is full\n")
+                if (!quiet) {
+                        printf("Error in AlphaSyn. Spike queue is full\n")
+                        quiet = 1
+                }
         } else {
                 q = q + 1
         }
 }
+s

trunk/src/neuron/standardmodels/electrodes.py

@@ -29 +29 @@
         self._times      = None
         self._h_iclamps  = {}
-        self.set_native_parameters(parameters)
+        self.set_native_parameters(self.parameters)
 
     @property

trunk/src/random.py

@@ -21 +21 @@
 
 import sys
+from copy import deepcopy
 import logging
 import numpy.random
@@ -135 +136 @@
         return "NumpyRNG() with seed %s for MPI rank %d (MPI processes %d). %s parallel safe." % (
             self.seed, mpi_rank, z, self.parallel_safe and "Is" or "Not")
+
+    def __deepcopy__(self, memo):
+        obj = NumpyRNG.__new__(NumpyRNG)
+        WrappedRNG.__init__(obj, seed=deepcopy(self.seed, memo),
+                             parallel_safe=deepcopy(self.parallel_safe, memo))
+        obj.rng = deepcopy(self.rng)
+        return obj
 
 

trunk/test/system/scenarios.py

@@ -3 +3 @@
 from pyNN import common, recording
 from nose.tools import assert_equal
+import glob, os
 import numpy
 from pyNN.utility import init_logging, assert_arrays_equal, assert_arrays_almost_equal, sort_by_column
@@ -134 +135 @@
     print "Inhibitory rate        : %g Hz" % (I_count*1000.0/tstop,)
     sim.end()
+    for filename in glob.glob("scenario1a_*"):
+        os.remove(filename)