From 28796422ed09760b8d2ead3f58d8329eb6ea9010 Mon Sep 17 00:00:00 2001 From: Grissess Date: Sun, 23 Aug 2015 23:49:11 -0400 Subject: Partial commit (last from cosi02!) --- voice.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'voice.py') diff --git a/voice.py b/voice.py index eb0b43f..14961c1 100644 --- a/voice.py +++ b/voice.py @@ -107,10 +107,16 @@ class VMeanMixer(Voice): def __init__(self, *voices): self.voices = list(voices) def __call__(self, theta): - return sum([i(theta)/len(self.voices) for i in self.voices]) + return norm_amp(sum([i(theta)/len(self.voices) for i in self.voices])) class VSumMixer(Voice): def __init__(self, *voices): self.voices = list(voices) def __call__(self, theta): - return sum([i(theta) for i in self.voices]) + return norm_amp(sum([i(theta) for i in self.voices])) + +class object(object): + def __init__(self): + this_obj = object() + +foo = object() -- cgit v1.2.3-70-g09d2