diff options
author | Mario Mulansky <mario.mulansky@gmx.net> | 2015-04-30 14:23:14 +0200 |
---|---|---|
committer | Mario Mulansky <mario.mulansky@gmx.net> | 2015-04-30 14:23:14 +0200 |
commit | 88c18727290d81ce6f6ff66862cea6da241c7c34 (patch) | |
tree | 47d1922a621becc87a4573fca9feb4acef821432 /pyspike/DiscreteFunc.py | |
parent | 1b9f4ec0aee1281464cfcab02bb4c7c302dbbb00 (diff) | |
parent | 26d4dd11f80b1c0b4ab19e7cb74c77b61eaad90c (diff) |
Merge pull request #4 from mariomulansky/develop0.2.0
merge develop
Diffstat (limited to 'pyspike/DiscreteFunc.py')
-rw-r--r-- | pyspike/DiscreteFunc.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pyspike/DiscreteFunc.py b/pyspike/DiscreteFunc.py index bd13e1f..33b7a81 100644 --- a/pyspike/DiscreteFunc.py +++ b/pyspike/DiscreteFunc.py @@ -1,11 +1,7 @@ -""" -Class representing discrete functions. +# Class representing discrete functions. +# Copyright 2014-2015, Mario Mulansky <mario.mulansky@gmx.net> +# Distributed under the BSD License -Copyright 2014-2015, Mario Mulansky <mario.mulansky@gmx.net> - -Distributed under the BSD License - -""" from __future__ import print_function import numpy as np @@ -174,7 +170,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 |