From f140795cdf3d92537fe003a7a58b3c2d22568cd6 Mon Sep 17 00:00:00 2001 From: hellboy Date: Tue, 9 Mar 2010 17:39:54 +0100 Subject: [PATCH] gostyle.py: minor bugfix in Rescale() --- gostyle.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gostyle.py b/gostyle.py index 2bd769e..fab0609 100755 --- a/gostyle.py +++ b/gostyle.py @@ -177,17 +177,18 @@ class OccurenceVectorGenerator(VectorGenerator): class Rescale(VectorToVector): """Class that rescales vectors to a given interval!""" def __init__(self, a=-1.0, b=1.0): - if a > b: - raise RuntimeError + if a >= b: + raise RuntimeError("a must be < b") self.a = a - self.tot = b - a #abs(a) + abs(b) + self.avg = (a + b) * 0.5 + self.tot = b - a def __call__(self, vector): if len(vector) == 0: raise RuntimeError to_zero = 0 - min(vector) maximum = max(vector) + to_zero if maximum == 0: - return [ 0.0 for _ in vector ] + return [ self.avg for _ in vector ] return [ self.tot * (x + to_zero) / maximum + self.a for x in vector ] class InputVectorGenerator(VectorGenerator): -- 2.11.4.GIT