Changeset 1037 for trunk

Show
Ignore:
Timestamp:
12/16/11 15:02:36 (5 months ago)
Author:
apdavison
Message:

Renamed Population.meanSpikeCount() to Population.mean_spike_count() (old name still works, but gives deprecation warning)

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/test/unittests/test_basepopulation.py

    r1000 r1037  
    448448    assert_equal(args, ("arg1", None)) 
    449449     
    450 def test_meanSpikeCount(): 
     450def test_mean_spike_count(): 
    451451    orig_rank = MockPopulation._simulator.state.mpi_rank 
    452452    MockPopulation._simulator.state.mpi_rank = 0 
    … …  
    454454    p.recorders = {'spikes': Mock()} 
    455455    p.recorders['spikes'].count = Mock(return_value={0: 2, 1: 5}) 
    456     assert_equal(p.meanSpikeCount(), 3.5) 
     456    assert_equal(p.mean_spike_count(), 3.5) 
    457457    MockPopulation._simulator.state.mpi_rank = orig_rank 
    458458 
    459 def test_meanSpikeCount_on_slave_node(): 
     459def test_mean_spike_count_on_slave_node(): 
    460460    orig_rank = MockPopulation._simulator.state.mpi_rank 
    461461    MockPopulation._simulator.state.mpi_rank = 1 
    … …  
    463463    p.recorders = {'spikes': Mock()} 
    464464    p.recorders['spikes'].count = Mock(return_value={0: 2, 1: 5}) 
    465     assert p.meanSpikeCount() is numpy.NaN 
     465    assert p.mean_spike_count() is numpy.NaN 
    466466    MockPopulation._simulator.state.mpi_rank = orig_rank 
    467467