# HG changeset patch # User Jaroslav Hajek # Date 1262149311 -3600 # Node ID 7fbdeaa9b0e0f15aeec937fbba2d48b4bf35e013 # Parent b7915ebe8acf4525c00c6710e8b12df57986ee84 fix common_size optimization diff -r b7915ebe8acf -r 7fbdeaa9b0e0 scripts/ChangeLog --- a/scripts/ChangeLog Wed Dec 30 05:30:54 2009 +0100 +++ b/scripts/ChangeLog Wed Dec 30 06:01:51 2009 +0100 @@ -1,3 +1,7 @@ +2009-12-30 Jaroslav Hajek + + * general/common_size.m: Use named function rather than a handle. + 2009-12-29 Jaroslav Hajek * set/complement.m: Deprecate. diff -r b7915ebe8acf -r 7fbdeaa9b0e0 scripts/general/common_size.m --- a/scripts/general/common_size.m Wed Dec 30 05:30:54 2009 +0100 +++ b/scripts/general/common_size.m Wed Dec 30 06:01:51 2009 +0100 @@ -77,7 +77,7 @@ uo = "uniformoutput"; dims = size (varargin{find (nscal, 1)}); subs = substruct ("()", arrayfun (@ones, 1, dims, uo, false)); - varargout(scal) = cellfun (@subsref, varargin(scal), {subs}, uo, false); + varargout(scal) = cellfun ("subsref", varargin(scal), {subs}, uo, false); endif endif endif diff -r b7915ebe8acf -r 7fbdeaa9b0e0 src/ChangeLog --- a/src/ChangeLog Wed Dec 30 05:30:54 2009 +0100 +++ b/src/ChangeLog Wed Dec 30 06:01:51 2009 +0100 @@ -1,3 +1,7 @@ +2009-12-30 Jaroslav Hajek + + * DLD-FUNCTIONS/cellfun.cc (Fcellfun): Fix tests. + 2009-12-28 Thomas Treichl * DLD-FUNCTIONS/md5sum.cc, DLD-FUNCTIONS/lookup.cc: Include diff -r b7915ebe8acf -r 7fbdeaa9b0e0 src/DLD-FUNCTIONS/cellfun.cc --- a/src/DLD-FUNCTIONS/cellfun.cc Wed Dec 30 05:30:54 2009 +0100 +++ b/src/DLD-FUNCTIONS/cellfun.cc Wed Dec 30 06:01:51 2009 +0100 @@ -383,12 +383,12 @@ else if (name == "subsref" && nargin == 5 && nargout == 1 && args(2).numel () == 1 && args(2).is_cell () && args(3).is_string () - && args(3).xtoupper ().string_value () == "uniformoutput" - && args(4).bool_value () && ! error_state) + && args(3).xtolower ().string_value () == "uniformoutput" + && ! args(4).bool_value () && ! error_state) { // This optimizes the case of applying the same index expression to // multiple values. We decode the subscript just once. uniformoutput must - // be requested as well. + // be set to false. const Cell tmpc = args(2).cell_value (); octave_value subs = tmpc(0);