summaryrefslogtreecommitdiff
path: root/pyspike/DiscreteFunc.py
diff options
context:
space:
mode:
authorMario Mulansky <mario.mulansky@gmx.net>2015-02-03 15:13:22 +0100
committerMario Mulansky <mario.mulansky@gmx.net>2015-02-03 15:13:22 +0100
commitea61fc2ed03e42b3ea159b7ef7886d005c90e29f (patch)
tree923a10fadd6d381c8b42d93a036f9da95dcdc646 /pyspike/DiscreteFunc.py
parent57b282e117c73913eed1f62dbe080544aadf4bbe (diff)
update docs to the structural changes
Diffstat (limited to 'pyspike/DiscreteFunc.py')
-rw-r--r--pyspike/DiscreteFunc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyspike/DiscreteFunc.py b/pyspike/DiscreteFunc.py
index 2283e03..bd13e1f 100644
--- a/pyspike/DiscreteFunc.py
+++ b/pyspike/DiscreteFunc.py
@@ -23,10 +23,10 @@ class DiscreteFunc(object):
""" Constructs the discrete function.
:param x: array of length N defining the points at which the values are
- defined.
+ defined.
:param y: array of length N degining the values at the points x.
:param multiplicity: array of length N defining the multiplicity of the
- values.
+ values.
"""
# convert parameters to arrays, also ensures copying
self.x = np.array(x)
@@ -174,7 +174,7 @@ class DiscreteFunc(object):
def avrg(self, interval=None):
""" Computes the average of the interval sequence:
- :math:`a = 1/N sum f_n ` where N is the number of intervals.
+ :math:`a = 1/N sum f_n` where N is the number of intervals.
:param interval: averaging interval given as a pair of floats, a
sequence of pairs for averaging multiple intervals, or