Mercurial > octave
changeset 33614:7f7d6bc5702b
maint: merge stable to default
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 20 May 2024 09:12:08 -0700 |
| parents | f958b36069d3 (current diff) 958d3535b511 (diff) |
| children | a7d95a082206 |
| files | |
| diffstat | 1 files changed, 67 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/plot/draw/bar.m Sun May 19 23:01:32 2024 -0400 +++ b/scripts/plot/draw/bar.m Mon May 20 09:12:08 2024 -0700 @@ -113,11 +113,14 @@ ## @end deftypefn function varargout = bar (varargin) + if (nargin < 1) - print_usage; + print_usage (); endif + varargout = cell (nargout, 1); [varargout{:}] = __bar__ ("bar", true, varargin{:}); + endfunction @@ -268,9 +271,9 @@ %! assert (baselinedata.linestyle, "-"); %! %! assert (patchdata.type, "patch"); -%! assert (patchdata.xdata, [0.6, 1.6, 2.6; ... -%! 0.6, 1.6, 2.6; ... -%! 1.4, 2.4, 3.4; ... +%! assert (patchdata.xdata, [0.6, 1.6, 2.6; +%! 0.6, 1.6, 2.6; +%! 1.4, 2.4, 3.4; %! 1.4, 2.4, 3.4], eps); %! assert (patchdata.ydata, [0, 0, 0; 2:4; 2:4; 0, 0, 0]); %! assert (size (patchdata.faces), [3, 4]); @@ -279,7 +282,7 @@ %! assert (axesdata.xscale, "linear"); %! assert (axesdata.xlim, [0.5, 3.5]); %! assert (axesdata.xtick, 1:3); -%! assert (get(hax, 'xticklabel'), {"1"; "2"; "3"}); +%! assert (get(hax, "xticklabel"), {"1"; "2"; "3"}); %! assert (axesdata.yscale, "linear"); %! assert (axesdata.ylim, [0, 4]); %! assert (axesdata.ytick, 0:4); @@ -331,7 +334,7 @@ %! close (hf); %! end_unwind_protect -## Style hist. +## Style "hist" %!test %! hf = figure ("visible", "off"); %! unwind_protect @@ -343,9 +346,9 @@ %! assert (! isfield (bardata, "barlayout")); %! assert (! isfield (bardata, "barwidth")); %! assert (bardata.type, "patch"); -%! assert (bardata.xdata, [0.5, 1.5, 2.5; ... -%! 0.5, 1.5, 2.5; ... -%! 1.5, 2.5, 3.5; ... +%! assert (bardata.xdata, [0.5, 1.5, 2.5; +%! 0.5, 1.5, 2.5; +%! 1.5, 2.5, 3.5; %! 1.5, 2.5, 3.5], eps); %! assert (bardata.ydata, [0, 0, 0; 2:4; 2:4; 0, 0, 0]); %! assert (size (bardata.faces), [3, 4]); @@ -355,7 +358,7 @@ %! close (hf); %! end_unwind_protect -## Style histc. +## Style "histc" %!test %! hf = figure ("visible", "off"); %! unwind_protect @@ -388,21 +391,21 @@ %! %! assert (numel (hb), 3); %! assert (numel (hp), 3); -%! assert (all (strcmp ({bardata.type}, 'hggroup'))); -%! assert (bardata(1).baseline, bardata(2).baseline); # Common baseline -%! assert (bardata(1).baseline, bardata(3).baseline); # Common baseline -%! assert (bardata(1).bargroup, bardata(2).bargroup); # Common hggroup -%! assert (bardata(1).bargroup, bardata(3).bargroup); # Common hggroup -%! assert (all (strcmp ({bardata.barlayout}, 'grouped'))); -%! assert (all (strcmp ({bardata.horizontal}, 'off'))); +%! assert (all (strcmp ({bardata.type}, "hggroup"))); +%! assert (bardata(1).baseline, bardata(2).baseline); # Common baseline +%! assert (bardata(1).baseline, bardata(3).baseline); # Common baseline +%! assert (bardata(1).bargroup, bardata(2).bargroup); # Common hggroup +%! assert (bardata(1).bargroup, bardata(3).bargroup); # Common hggroup +%! assert (all (strcmp ({bardata.barlayout}, "grouped"))); +%! assert (all (strcmp ({bardata.horizontal}, "off"))); %! assert ([bardata.basevalue], [0, 0, 0]); %! assert ([bardata.xdata], [1, 1, 1; 2, 2, 2]); %! assert ([bardata.ydata], [1, 2, 3; 4, 5, 6]); %! -%! assert (all (strcmp ({patchdata.type}, 'patch'))); -%! assert (patchdata(1).xdata, [2, 5; ... -%! 2, 5; ... -%! 64/25, 139/25; ... +%! assert (all (strcmp ({patchdata.type}, "patch"))); +%! assert (patchdata(1).xdata, [2, 5; +%! 2, 5; +%! 64/25, 139/25; %! 64/25, 139/25]/3, eps); %! assert (patchdata(1).ydata, [0, 0; 1, 4; 1, 4; 0, 0]); %! assert (size (patchdata(1).faces), [2, 4]); @@ -423,19 +426,19 @@ %! %! assert (numel (hb), 3); %! assert (numel (hp), 3); -%! assert (all (strcmp ({bardata.type}, 'hggroup'))); -%! assert (bardata(1).baseline, bardata(2).baseline); # Common baseline -%! assert (bardata(1).baseline, bardata(3).baseline); # Common baseline -%! assert (bardata(1).bargroup, bardata(2).bargroup); # Common hggroup -%! assert (bardata(1).bargroup, bardata(3).bargroup); # Common hggroup -%! assert (all (strcmp ({bardata.barlayout}, 'stacked'))); -%! assert (all (strcmp ({bardata.horizontal}, 'off'))); +%! assert (all (strcmp ({bardata.type}, "hggroup"))); +%! assert (bardata(1).baseline, bardata(2).baseline); # Common baseline +%! assert (bardata(1).baseline, bardata(3).baseline); # Common baseline +%! assert (bardata(1).bargroup, bardata(2).bargroup); # Common hggroup +%! assert (bardata(1).bargroup, bardata(3).bargroup); # Common hggroup +%! assert (all (strcmp ({bardata.barlayout}, "stacked"))); +%! assert (all (strcmp ({bardata.horizontal}, "off"))); %! %! assert ([bardata.basevalue], [0, 0, 0]); %! assert ([bardata.xdata], [1, 1, 1; 2, 2, 2]); %! assert ([bardata.ydata], [1, 2, 3; 4, 5, 6]); %! -%! assert (all (strcmp ({patchdata.type}, 'patch'))); +%! assert (all (strcmp ({patchdata.type}, "patch"))); %! assert (all (cellfun (@isequal, {patchdata.xdata}, ... %! {[0.6, 1.6; 0.6, 1.6; 1.4, 2.4; 1.4, 2.4]}))); %! assert (patchdata(1).ydata, [0, 0; 1, 4; 1, 4; 0, 0]); @@ -460,19 +463,19 @@ %! %! assert (numel (hb), 3); %! assert (numel (hp), 3); -%! assert (all (strcmp ({bardata.type}, 'hggroup'))); -%! assert (bardata(1).baseline, bardata(2).baseline); # Common baseline -%! assert (bardata(1).baseline, bardata(3).baseline); # Common baseline -%! assert (bardata(1).bargroup, bardata(2).bargroup); # Common hggroup -%! assert (bardata(1).bargroup, bardata(3).bargroup); # Common hggroup -%! assert (all (strcmp ({bardata.barlayout}, 'stacked'))); -%! assert (all (strcmp ({bardata.horizontal}, 'off'))); +%! assert (all (strcmp ({bardata.type}, "hggroup"))); +%! assert (bardata(1).baseline, bardata(2).baseline); # Common baseline +%! assert (bardata(1).baseline, bardata(3).baseline); # Common baseline +%! assert (bardata(1).bargroup, bardata(2).bargroup); # Common hggroup +%! assert (bardata(1).bargroup, bardata(3).bargroup); # Common hggroup +%! assert (all (strcmp ({bardata.barlayout}, "stacked"))); +%! assert (all (strcmp ({bardata.horizontal}, "off"))); %! %! assert ([bardata.basevalue], [0, 0, 0]); %! assert ([bardata.xdata], [1, 1, 1; 2, 2, 2]); %! assert ([bardata.ydata], [-2, 1, 3; 4, -5, 6]); %! -%! assert (all (strcmp ({patchdata.type}, 'patch'))); +%! assert (all (strcmp ({patchdata.type}, "patch"))); %! assert (all (cellfun (@isequal, {patchdata.xdata}, ... %! {[0.6, 1.6; 0.6, 1.6; 1.4, 2.4; 1.4, 2.4]}))); %! assert (patchdata(1).ydata, [0, 0; -2, 4; -2, 4; 0, 0]); @@ -486,8 +489,8 @@ %! end_unwind_protect ## Test plot property settings/updates -## Note - Not testing plot and children visibile settings to avoid creating -## test suite artifacts. +## Note: Not testing plot and children visibile settings to avoid creating +## test suite artifacts. ## Switch from grouped to stacked. %!test @@ -500,12 +503,12 @@ %! patchdata = get (hp); %! %! ## Verify base behavior. -%! assert (all (strcmp ({bardata.barlayout}, 'grouped'))); +%! assert (all (strcmp ({bardata.barlayout}, "grouped"))); %! assert ([bardata.xdata], [1, 1, 1; 2, 2, 2]); %! assert ([bardata.ydata], [1, 2, 3; 4, 5, 6]); -%! assert (patchdata(1).xdata, [2, 5; ... -%! 2, 5; ... -%! 64/25, 139/25; ... +%! assert (patchdata(1).xdata, [2, 5; +%! 2, 5; +%! 64/25, 139/25; %! 64/25, 139/25]/3, eps); %! assert (patchdata(1).ydata, [0, 0; 1, 4; 1, 4; 0, 0]); %! @@ -515,7 +518,7 @@ %! hp = [bardata.children](:); %! patchdata = get (hp); %! -%! assert (all (strcmp ({bardata.barlayout}, 'stacked'))); +%! assert (all (strcmp ({bardata.barlayout}, "stacked"))); %! assert ([bardata.xdata], [1, 1, 1; 2, 2, 2]); %! assert ([bardata.ydata], [1, 2, 3; 4, 5, 6]); %! assert (all (cellfun (@isequal, {patchdata.xdata}, ... @@ -546,9 +549,9 @@ %! assert (baselinedata.ydata, [3, 3]); %! assert (diff (baselinedata.xdata) > 0); %! -%! assert (patchdata.xdata, [0.6, 1.6, 2.6; ... -%! 0.6, 1.6, 2.6; ... -%! 1.4, 2.4, 3.4; ... +%! assert (patchdata.xdata, [0.6, 1.6, 2.6; +%! 0.6, 1.6, 2.6; +%! 1.4, 2.4, 3.4; %! 1.4, 2.4, 3.4], eps); %! assert (patchdata.ydata, [3, 3, 3; 2:4; 2:4; 3, 3, 3]); %! assert (size (patchdata.faces), [3, 4]); @@ -646,9 +649,9 @@ %! assert (baselinedata.xdata, [0, 0]); %! assert (diff (baselinedata.ydata) > 0); %! -%! assert (patchdata.ydata, [0.6, 1.6, 2.6; ... -%! 0.6, 1.6, 2.6; ... -%! 1.4, 2.4, 3.4; ... +%! assert (patchdata.ydata, [0.6, 1.6, 2.6; +%! 0.6, 1.6, 2.6; +%! 1.4, 2.4, 3.4; %! 1.4, 2.4, 3.4], eps); %! assert (patchdata.xdata, [0, 0, 0; 2:4; 2:4; 0, 0, 0]); %! assert (size (patchdata.faces), [3, 4]); @@ -658,7 +661,7 @@ %! close (hf); %! end_unwind_protect -%!test <65734> # Axis ticks after change to horizontal should match barh. +%!test <65734> # Axis ticks after change to horizontal should match barh. %! hf = figure ("visible", "off"); %! unwind_protect %! hax = axes ("parent", hf); @@ -677,7 +680,7 @@ %! assert (axesdata.yscale, "linear"); %! assert (axesdata.ylim, [0.5, 3.5]); %! assert (axesdata.ytick, 1:3); -%! assert (get(hax, 'yticklabel'), {"1"; "2"; "3"}); +%! assert (get(hax, "yticklabel"), {"1"; "2"; "3"}); %! assert (axesdata.xscale, "linear"); %! assert (axesdata.xlim, [0, 4]); %! assert (axesdata.xtick, 0:4); @@ -704,16 +707,16 @@ %! assert (bardata.ydata, [2; 3; 4]); %! assert (baselinedata.ydata, [0, 0]); %! assert (baselinedata.xdata, [0.5, 3.5], eps); -%! assert (patchdata.xdata, [0.6, 1.6, 2.6; ... -%! 0.6, 1.6, 2.6; ... -%! 1.4, 2.4, 3.4; ... +%! assert (patchdata.xdata, [0.6, 1.6, 2.6; +%! 0.6, 1.6, 2.6; +%! 1.4, 2.4, 3.4; %! 1.4, 2.4, 3.4], eps); %! assert (patchdata.ydata, [0, 0, 0; 2:4; 2:4; 0, 0, 0]); %! -%! set (hax, "xlim", [0, 5]); # Change axes limits, verify baseline match. +%! set (hax, "xlim", [0, 5]); # Change axes limits, verify baseline match. %! assert (get (hl, "xdata"), [0, 5]); %! -%! set (hb, "basevalue", 2); # Change line position through bar object. +%! set (hb, "basevalue", 2); # Change line position through bar object. %! axesdata = get (hax); %! assert (get (hb, "basevalue"), 2); %! assert (get (hl, "ydata"), [2, 2]); @@ -772,7 +775,7 @@ %! end_unwind_protect ## Updating base plot xdata. -%!test <65734> # changing xdata should update xlim/ticks for new locations. +%!test <65734> # changing xdata should update xlim/ticks for new locations. %! hf = figure ("visible", "off"); %! unwind_protect %! xd = [0.6, 1.6, 2.6; 0.6, 1.6, 2.6; 1.4, 2.4, 3.4; 1.4, 2.4, 3.4]; @@ -836,23 +839,22 @@ %! ## Verify base behavior. %! assert (get (hb, "barwidth"), 0.8, eps); %! assert (get (hb, "xdata"), [1:3]'); -%! assert (get (hp, "xdata"), [0.6, 1.6, 2.6; ... -%! 0.6, 1.6, 2.6; ... -%! 1.4, 2.4, 3.4; ... +%! assert (get (hp, "xdata"), [0.6, 1.6, 2.6; +%! 0.6, 1.6, 2.6; +%! 1.4, 2.4, 3.4; %! 1.4, 2.4, 3.4], eps); %! %! ## Verify changed behavior. %! set (hb, "barwidth", 0.5); %! assert (get (hb, "xdata"), [1:3]'); -%! assert (get (hp, "xdata"), [0.75, 1.75, 2.75; ... -%! 0.75, 1.75, 2.75; ... -%! 1.25, 2.25, 3.25; ... +%! assert (get (hp, "xdata"), [0.75, 1.75, 2.75; +%! 0.75, 1.75, 2.75; +%! 1.25, 2.25, 3.25; %! 1.25, 2.25, 3.25], eps); %! unwind_protect_cleanup %! close (hf); %! end_unwind_protect - %% Test input validation %!error <Invalid call> bar () %!error <Y must be numeric> bar ("foo")