[python-dtcwt] 95/497: Merge pull request #11 from rjw57/2d-perfect-recon

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.

commit e4d79fad551be6db71952a25a81b646b1c4775af
Merge: f4c7591 7f015ff
Author: Rich Wareham <rjw57 at cantab.net>
Date:   Fri Aug 9 08:52:03 2013 -0700

    Merge pull request #11 from rjw57/2d-perfect-recon
    
    choose output type appropriate for input in 2d transform

 dtcwt/lowlevel.py    | 19 +++++++++++++++++++
 dtcwt/transform2d.py | 42 ++++++++++++++++++++++--------------------
 tests/testifm1.py    |  6 ++++--
 tests/testifm2.py    | 12 +++++++-----
 tests/testxfm1.py    | 11 ++++++++++-
 tests/testxfm2.py    |  6 ++++--
 6 files changed, 66 insertions(+), 30 deletions(-)

diff --cc tests/testxfm2.py
index c5f64d5,ca4e96e..94775fb
--- a/tests/testxfm2.py
+++ b/tests/testxfm2.py
@@@ -3,8 -3,10 +3,10 @@@ from nose.tools import raise
  from nose.plugins.attrib import attr
  
  import numpy as np
 -from dtcwt import dtwavexfm2, biort, qshift
 +from dtcwt import dtwavexfm2, dtwaveifm2, biort, qshift
  
+ TOLERANCE = 1e-12
+ 
  def setup():
      global lena
      lena = np.load(os.path.join(os.path.dirname(__file__), 'lena.npz'))['lena']

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git