Changeset 388

Show
Ignore:
Timestamp:
06/24/08 13:33:05 (5 months ago)
Author:
apdavison
Message:

Minor change in neuron2 to avoid problems with numpy versions < 1.1.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk

    • Property svn:ignore changed from
      build
      .project
      .pydevproject
      to
      build
      .project
      .pydevproject
      .pyc
  • trunk/doc

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/misc

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/setup.py

    r347 r388  
    4343    version = "0.5.0alpha", 
    4444    package_dir={'pyNN': 'src'}, 
    45     packages = ['pyNN','pyNN.nest2','pyNN.nest1','pyNN.pcsim','pyNN.neuron','pyNN.brian'], 
     45    packages = ['pyNN','pyNN.nest2','pyNN.nest1','pyNN.pcsim','pyNN.neuron','pyNN.neuron2','pyNN.brian'], 
    4646    package_data = {'pyNN': ['hoc/*.hoc', 'hoc/*.mod']}, 
    4747    author = "The NeuralEnsemble Community", 
  • trunk/src

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/brian

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/hoc

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/moose

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/nest1

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/nest2

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/neuron

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/neuron2

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/src/neuron2/simulator.py

    r387 r388  
    2727    """Encapsulates data and functions related to recording model variables.""" 
    2828     
    29     numpy_formats = {'spikes': "%g\t%d", 
    30                'v': "%g\t%g\t%d"} 
     29    numpy1_1_formats = {'spikes': "%g\t%d", 
     30                        'v': "%g\t%g\t%d"} 
     31    numpy1_0_formats = {'spikes': "%g", # only later versions of numpy support different 
     32                        'v': "%g"}      # formats for different columns 
    3133    formats = {'spikes': 't id', 
    3234               'v': 't v id'} 
     
    8587        data = self.get(gather) 
    8688        filename = file or self.filename 
    87         numpy.savetxt(filename, data, Recorder.numpy_formats[self.variable]
     89        numpy.savetxt(filename, data, Recorder.numpy1_0_formats[self.variable], delimiter='\t'
    8890        if compatible_output: 
    8991            recording.write_compatible_output(filename, filename, Recorder.formats[self.variable], 
  • trunk/src/pcsim

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc
  • trunk/test

    • Property svn:ignore changed from
      recordTestSpikeFile1.txt
      recordTestVmFile1.txt
      to
      build
      .project
      .pydevproject
      .pyc
  • trunk/test/bfstdp

    • Property svn:ignore set to
      build
      .project
      .pydevproject
      .pyc