[Pkg-octave-commit] [SCM] octave-image branch, master, updated. 197cd4643fe14432c96361198c7ece477fc731d2

[Thomas Weber]

The following commit has been merged in the master branch:
commit 59404ce45a1c91c728f238c04e206da8a77ac7e7
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sun Jan 17 22:16:29 2010 +0100

    New patch for fixing test failures in qtdecomp

diff --git a/debian/changelog b/debian/changelog
index 3e22f30..0af1c7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave-image (1.0.10-3) UNRELEASED; urgency=low
+
+  * New patch: fix_failing_test_in_qtdecomp, fixes some test failures in
+    qtdecomp().
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 17 Jan 2010 21:51:36 +0100
+
 octave-image (1.0.10-2) unstable; urgency=low
 
   * New patch: fix_uppercase_variable, fixes a wrongly uppercased variable
diff --git a/debian/patches/fix_failing_test_in_qtdecomp b/debian/patches/fix_failing_test_in_qtdecomp
new file mode 100644
index 0000000..19f95ca
--- /dev/null
+++ b/debian/patches/fix_failing_test_in_qtdecomp
@@ -0,0 +1,53 @@
+Origin: upstream, http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/image/inst/qtdecomp.m?r1=6784&r2=4585
+Description: Fix a failing test in qtdecomp, due to the use of whitespace.
+--- a/inst/qtdecomp.m
++++ b/inst/qtdecomp.m
+@@ -269,37 +269,28 @@
+ %!test
+ %! R=[[B4,[B2,B2;B2,B2]]; [[B2,B2;B2,B2],B4]];
+ %! assert(full(qtdecomp(A,10,2)), R);
++%!
++%! assert(full(qtdecomp(A,100,[2, 4])), [B4,B4;B4,B4]);
+ 
+-%!assert(full(qtdecomp(A,100,[2, 4])), [B4,B4;B4,B4]);
+-
+-%!function y = f(A,c1,c2,c3)
+-%! if (nargin < 2)
+-%!   c1 = 54;
+-%! endif
+-%! if (nargin < 3)
+-%!   c2 = 0;
+-%! endif
+-%! if (nargin < 4)
+-%!   c3 = 0;
+-%! endif
+-%! y = (A(1,1,:)!=((c1+c2+c3)*ones(1,1,size(A,3))))(:);
+-
+-%!assert(full(qtdecomp(A, at f)),[ones(4),B4;ones(4,8)]); 
+-%!assert(full(qtdecomp(A, at f,54)),[ones(4),B4;ones(4,8)]);
+-%!assert(full(qtdecomp(A, at f,4,40,10)),[ones(4),B4;ones(4,8)]);
++%!test
++%! f = @(A, c1 = 54, c2 = 0, c3 = 0) y = (A (1, 1, :) != ((c1+c2+c3) * ones (1, 1, size (A, 3))))(:);
++%!
++%! assert(full(qtdecomp(A,f)),[ones(4),B4;ones(4,8)]);
++%! assert(full(qtdecomp(A,f,54)),[ones(4),B4;ones(4,8)]);
++%! assert(full(qtdecomp(A,f,4,40,10)),[ones(4),B4;ones(4,8)]);
+ 
+-%!# no params
+ %!test
++%!# no params
+ %! first_eq=inline("(A(1,1,:)!=(54*ones(1,1,size(A,3))))(:)","A");
+ %! assert(full(qtdecomp(A,first_eq)),[ones(4),B4;ones(4,8)]); 
+ 
+-%!# 1 param
+ %!test
++%!# 1 param
+ %! first_eq=inline("(A(1,1,:)!=(c*ones(1,1,size(A,3))))(:)","A","c");
+ %! assert(full(qtdecomp(A,first_eq,54)),[ones(4),B4;ones(4,8)]); 
+ 
+-%!# 3 params
+ %!test
++%!# 3 params
+ %! first_eq=inline("(A(1,1,:)!=((c1+c2+c3)*ones(1,1,size(A,3))))(:)","A","c1","c2","c3");
+ %! assert(full(qtdecomp(A,first_eq,4,40,10)),[ones(4),B4;ones(4,8)]); 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index be3bc5c..5549e84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 replace_obsoleted_spfind
 fix_uppercase_variable
+fix_failing_test_in_qtdecomp

-- 
octave-image