Mercurial > octave

changeset 33305:0b4118c91dc9 bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter
author Arun Giridhar <arungiridhar@gmail.com>
date Wed, 03 Apr 2024 12:30:26 -0400
parents 95596df836a1 (current diff) acef2a35ba7c (diff)
children ac3633dd67d1
files
diffstat 2 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/conv2.cc	Wed Apr 03 07:28:44 2024 -0400
+++ b/libinterp/corefcn/conv2.cc	Wed Apr 03 12:30:26 2024 -0400
@@ -435,7 +435,8 @@
 %! c = convn (a, b, "full");
 %!assert (convn (a, b, "same"), c(2:11,2:11,2:11))
 %!test <39314>
-%! assert (convn (a, b, "valid"), c(3:10,3:10,3:10));
+%! assert (all ((convn (a, b, "valid") == c(3:10,3:10,3:10))(:)),
+%!         "central part of convn 'full' differs from convn 'valid'");
 %!
 %!test
 %! old_state = rand ("state");
@@ -447,7 +448,8 @@
 %! c = convn (a, b, "full");
 %!assert (convn (a, b, "same"), c(2:11,2:11,:))
 %!test <39314>
-%! assert (convn (a, b, "valid"), c(3:10,3:10,:));
+%! assert (all ((convn (a, b, "valid") == c(3:10,3:10,:))(:)),
+%!         "central part of convn 'full' differs from convn 'valid'");
 %!
 %!test
 %! old_state = rand ("state");
@@ -470,7 +472,8 @@
 %! c = convn (a, b, "full");
 %!assert (convn (a, b, "same"), c(3:12,2:16,2:8,2:9,:))
 %!test <39314>
-%! assert (convn (a, b, "valid"), c(4:10,3:15,2:7,3:8,:));
+%! assert (all ((convn (a, b, "valid") == c(4:10,3:15,2:7,3:8,:))(:)),
+%!         "central part of convn 'full' differs from convn 'valid'");
 
 %!test
 %! a = reshape (floor (magic (16) /10), [4 8 4 2]);
--- a/scripts/testfun/assert.m	Wed Apr 03 07:28:44 2024 -0400
+++ b/scripts/testfun/assert.m	Wed Apr 03 12:30:26 2024 -0400
@@ -771,7 +771,7 @@
   if (numel (matsize) == 2)
     subs = subs(:, matsize != 1);  # For vectors, use 1-D index
   endif
-  fmt = repmat ('%d,', 1, columns (subs));
+  fmt = repmat ('%d,', 1, max (columns (subs), 1));
   fmt(end) = [];   # delete final extra comma
   cout = ostrsplit (sprintf (['(' fmt ')', '$'], subs'), '$');
   cout(end) = [];  # delete extra cell from final '$'