From f4caafad832b800ee116a6114a11027fc640b7b3 Mon Sep 17 00:00:00 2001 From: Leonardo Robol Date: Wed, 3 Mar 2010 11:45:55 +0100 Subject: [PATCH] =?UTF-8?q?Ora=20la=20Daubechies=20funzionano.=20Chiss?= =?UTF-8?q?=C3=A0=20perch=C3=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Filtering/Filtering.py | 7 ++++--- Filtering/Splitting.py | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Filtering/Filtering.py b/Filtering/Filtering.py index 8faefac..d4df360 100644 --- a/Filtering/Filtering.py +++ b/Filtering/Filtering.py @@ -110,7 +110,8 @@ class FilterBank(): # Sembra che la lunghezza del filtro debba essere # la metà del filtro lowpass, arrotondata per eccesso - self.SetLength ( (len(lowpass) + 1)/2 ) + self.SetLength ( int((len(lowpass) + 1)/2) ) + print "Setting length to %d" % self.length def SetHighPassFilter(self, highpass): """ @@ -186,7 +187,7 @@ class FilterBank(): # ricostruiti non disturbi la ricostruzione dei prossimi. # Sfortunatamente questo ci rovinerà tutta l'ultima parte del # segnale, ma per ora non vedo una soluzione comoda. - low = roll(low, -1 * self.length) + low = roll(low, -1) return low @@ -197,7 +198,7 @@ DaubechiesFilterBank = FilterBank () DaubechiesFilterBank.SetFilterMatrix ( [ 0.125 * array([ 1 + sqrt(3), 3 + sqrt(3), 3 - sqrt(3), 1 - sqrt(3)]), 0.125 * array([ 1 - sqrt(3),-3 + sqrt(3), 3 + sqrt(3),-1 - sqrt(3)]), - 0.25 * array([ 1 - sqrt(3), 3 - sqrt(3), 3 - sqrt(3), 1 - sqrt(3)]), + 0.25 * array([ 1 - sqrt(3), 3 - sqrt(3), 3 + sqrt(3), 1 + sqrt(3)]), 0.25 * array([-1 - sqrt(3), 3 + sqrt(3),-3 + sqrt(3), 1 - sqrt(3)]) ]) DaubechiesFilterBank.SetLength (3) diff --git a/Filtering/Splitting.py b/Filtering/Splitting.py index 1ea6063..7bedaa2 100755 --- a/Filtering/Splitting.py +++ b/Filtering/Splitting.py @@ -25,7 +25,9 @@ class SplittingExample(): # f0 = array([1, 1]) # f1 = array([1, -1]) - filterBank = Filtering.HaarFilterBank + # filterBank = Filtering.HaarFilterBank + filterBank = Filtering.DaubechiesFilterBank + # filterBank = Filtering.StrangFilterBank filterBank.SetDepth(8) samples = self.LoadSamples ("sunny.pcm") -- 2.1.4