[python-dtcwt] 40/497: replace MATLAB coefficient files with numpy ones

[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 ddaffa6dbf58f9993c297d12f49449b27174900f
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Wed Aug 7 23:10:28 2013 +0100

    replace MATLAB coefficient files with numpy ones
---
 dtcwt/coeffs.py           |   6 +++---
 dtcwt/data/antonini.mat   | Bin 608 -> 0 bytes
 dtcwt/data/antonini.npz   | Bin 0 -> 1451 bytes
 dtcwt/data/legall.mat     | Bin 480 -> 0 bytes
 dtcwt/data/legall.npz     | Bin 0 -> 1300 bytes
 dtcwt/data/lenna.mat      | Bin 77847 -> 0 bytes
 dtcwt/data/near_sym_a.mat | Bin 544 -> 0 bytes
 dtcwt/data/near_sym_a.npz | Bin 0 -> 1351 bytes
 dtcwt/data/near_sym_b.mat | Bin 864 -> 0 bytes
 dtcwt/data/near_sym_b.npz | Bin 0 -> 1504 bytes
 dtcwt/data/qshift_06.mat  | Bin 1216 -> 0 bytes
 dtcwt/data/qshift_06.npz  | Bin 0 -> 2359 bytes
 dtcwt/data/qshift_32.mat  | Bin 2728 -> 0 bytes
 dtcwt/data/qshift_32.npz  | Bin 0 -> 4238 bytes
 dtcwt/data/qshift_a.mat   | Bin 1216 -> 0 bytes
 dtcwt/data/qshift_a.npz   | Bin 0 -> 2565 bytes
 dtcwt/data/qshift_b.mat   | Bin 1472 -> 0 bytes
 dtcwt/data/qshift_b.npz   | Bin 0 -> 2837 bytes
 dtcwt/data/qshift_c.mat   | Bin 1600 -> 0 bytes
 dtcwt/data/qshift_c.npz   | Bin 0 -> 2973 bytes
 dtcwt/data/qshift_d.mat   | Bin 1728 -> 0 bytes
 dtcwt/data/qshift_d.npz   | Bin 0 -> 3109 bytes
 setup.py                  |   2 +-
 23 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dtcwt/coeffs.py b/dtcwt/coeffs.py
index 3b7e7b4..2b5432a 100644
--- a/dtcwt/coeffs.py
+++ b/dtcwt/coeffs.py
@@ -1,17 +1,17 @@
 import os
-from scipy.io import loadmat
+from numpy import load
 
 DATADIR = os.path.join(os.path.dirname(__file__), 'data')
 
 COEFF_CACHE = {}
 
 def _load_from_file(basename, varnames):
-    filename = os.path.join(DATADIR, basename + '.mat')
+    filename = os.path.join(DATADIR, basename + '.npz')
 
     try:
         mat = COEFF_CACHE[filename]
     except KeyError:
-        mat = loadmat(filename)
+        mat = load(filename)
         COEFF_CACHE[filename] = mat
 
     try:
diff --git a/dtcwt/data/antonini.mat b/dtcwt/data/antonini.mat
deleted file mode 100644
index 01f1067..0000000
Binary files a/dtcwt/data/antonini.mat and /dev/null differ
diff --git a/dtcwt/data/antonini.npz b/dtcwt/data/antonini.npz
new file mode 100644
index 0000000..4f6e4ad
Binary files /dev/null and b/dtcwt/data/antonini.npz differ
diff --git a/dtcwt/data/legall.mat b/dtcwt/data/legall.mat
deleted file mode 100644
index ccd070e..0000000
Binary files a/dtcwt/data/legall.mat and /dev/null differ
diff --git a/dtcwt/data/legall.npz b/dtcwt/data/legall.npz
new file mode 100644
index 0000000..387382b
Binary files /dev/null and b/dtcwt/data/legall.npz differ
diff --git a/dtcwt/data/lenna.mat b/dtcwt/data/lenna.mat
deleted file mode 100644
index d3579da..0000000
Binary files a/dtcwt/data/lenna.mat and /dev/null differ
diff --git a/dtcwt/data/near_sym_a.mat b/dtcwt/data/near_sym_a.mat
deleted file mode 100644
index 2ebb9b8..0000000
Binary files a/dtcwt/data/near_sym_a.mat and /dev/null differ
diff --git a/dtcwt/data/near_sym_a.npz b/dtcwt/data/near_sym_a.npz
new file mode 100644
index 0000000..a1c49d4
Binary files /dev/null and b/dtcwt/data/near_sym_a.npz differ
diff --git a/dtcwt/data/near_sym_b.mat b/dtcwt/data/near_sym_b.mat
deleted file mode 100644
index 8fb0882..0000000
Binary files a/dtcwt/data/near_sym_b.mat and /dev/null differ
diff --git a/dtcwt/data/near_sym_b.npz b/dtcwt/data/near_sym_b.npz
new file mode 100644
index 0000000..fbf8d7a
Binary files /dev/null and b/dtcwt/data/near_sym_b.npz differ
diff --git a/dtcwt/data/qshift_06.mat b/dtcwt/data/qshift_06.mat
deleted file mode 100644
index 7a3f484..0000000
Binary files a/dtcwt/data/qshift_06.mat and /dev/null differ
diff --git a/dtcwt/data/qshift_06.npz b/dtcwt/data/qshift_06.npz
new file mode 100644
index 0000000..74343f1
Binary files /dev/null and b/dtcwt/data/qshift_06.npz differ
diff --git a/dtcwt/data/qshift_32.mat b/dtcwt/data/qshift_32.mat
deleted file mode 100644
index f95a592..0000000
Binary files a/dtcwt/data/qshift_32.mat and /dev/null differ
diff --git a/dtcwt/data/qshift_32.npz b/dtcwt/data/qshift_32.npz
new file mode 100644
index 0000000..e4a94c9
Binary files /dev/null and b/dtcwt/data/qshift_32.npz differ
diff --git a/dtcwt/data/qshift_a.mat b/dtcwt/data/qshift_a.mat
deleted file mode 100644
index 62c06a3..0000000
Binary files a/dtcwt/data/qshift_a.mat and /dev/null differ
diff --git a/dtcwt/data/qshift_a.npz b/dtcwt/data/qshift_a.npz
new file mode 100644
index 0000000..886508b
Binary files /dev/null and b/dtcwt/data/qshift_a.npz differ
diff --git a/dtcwt/data/qshift_b.mat b/dtcwt/data/qshift_b.mat
deleted file mode 100644
index d28e855..0000000
Binary files a/dtcwt/data/qshift_b.mat and /dev/null differ
diff --git a/dtcwt/data/qshift_b.npz b/dtcwt/data/qshift_b.npz
new file mode 100644
index 0000000..3738f85
Binary files /dev/null and b/dtcwt/data/qshift_b.npz differ
diff --git a/dtcwt/data/qshift_c.mat b/dtcwt/data/qshift_c.mat
deleted file mode 100644
index e528e75..0000000
Binary files a/dtcwt/data/qshift_c.mat and /dev/null differ
diff --git a/dtcwt/data/qshift_c.npz b/dtcwt/data/qshift_c.npz
new file mode 100644
index 0000000..f944117
Binary files /dev/null and b/dtcwt/data/qshift_c.npz differ
diff --git a/dtcwt/data/qshift_d.mat b/dtcwt/data/qshift_d.mat
deleted file mode 100644
index 9de6cdf..0000000
Binary files a/dtcwt/data/qshift_d.mat and /dev/null differ
diff --git a/dtcwt/data/qshift_d.npz b/dtcwt/data/qshift_d.npz
new file mode 100644
index 0000000..85682e4
Binary files /dev/null and b/dtcwt/data/qshift_d.npz differ
diff --git a/setup.py b/setup.py
index 77049d7..9c304fd 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ setup(
         "License :: Free To Use But Restricted",
     ],
     package_data = {
-        'dtcwt': ['data/*.mat',],
+        'dtcwt': ['data/*.npz',],
     },
 
     setup_requires=[

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