Merge pull request #77 from baccuslab/rename

Renames upsample_stim and downsample_stim
baccuslab · Nov 15, 2016 · 3594831 · 3594831
2 parents 287ad99 + 913a9f1
commit 3594831
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pyret/__init__.py b/pyret/__init__.py
@@ -24,6 +24,6 @@
     'filtertools',
     ]
 
-__version__ = '0.4.5'
+__version__ = '0.4.6'
 
 from pyret import *
diff --git a/pyret/stimulustools.py b/pyret/stimulustools.py
@@ -6,11 +6,11 @@
 import numpy as np
 from pyret.utils import flat2d
 
-__all__ = ['upsample_stim', 'downsample_stim', 'slicestim',
+__all__ = ['upsample', 'downsample', 'slicestim',
            'cov', 'rolling_window', 'flat2d']
 
 
-def upsample_stim(stim, upsample_factor, time=None):
+def upsample(stim, upsample_factor, time=None):
     """
     Upsample the given stimulus by the given factor.
 
@@ -60,7 +60,7 @@ def upsample_stim(stim, upsample_factor, time=None):
     return stim_us, time_us
 
 
-def downsample_stim(stim, downsample_factor, time=None):
+def downsample(stim, downsample_factor, time=None):
     """
     Downsample the given stimulus by the given factor.
 

diff --git a/tests/test_stimulustools.py b/tests/test_stimulustools.py
@@ -16,15 +16,15 @@ def test_resampling_1d():
     dt = 0.1
     stim = np.random.randn(stim_size,)
     time = np.arange(stim_size) * dt
-    stim_us, time_us = stimulustools.upsample_stim(
+    stim_us, time_us = stimulustools.upsample(
             stim, resample_factor, time=time)
-    stim_ds, time_ds = stimulustools.downsample_stim(
+    stim_ds, time_ds = stimulustools.downsample(
             stim_us, resample_factor, time=time_us)
 
     assert np.all(stim == stim_us[::resample_factor]), 'Upsampling failed'
     assert np.all(stim == stim_ds), 'Downsampling failed'
 
-    _, time_us = stimulustools.upsample_stim(stim, resample_factor)
+    _, time_us = stimulustools.upsample(stim, resample_factor)
     assert time_us is None
 
 def test_resampling_2d():
@@ -35,9 +35,9 @@ def test_resampling_2d():
     dt = 0.1
     stim = np.random.randn(*stim_size)
     time = np.arange(stim_size[0]) * dt
-    stim_us, time_us = stimulustools.upsample_stim(
+    stim_us, time_us = stimulustools.upsample(
             stim, resample_factor, time=time)
-    stim_ds, time_ds = stimulustools.downsample_stim(
+    stim_ds, time_ds = stimulustools.downsample(
             stim_us, resample_factor, time=time_us)
 
     assert np.all(stim == stim_us[::resample_factor, ...]), 'Upsampling failed'