Mercurial > octave
view scripts/miscellaneous/fileparts.m @ 32047:e3de59065cf1
inputParser.m: Re-architect internal data structures for 60% speed improvement.
Key idea is to replace Parameter and Switch structs with name field containing
a nested struct (def, val fields) with a struct array that has fields "name",
"def", and "val". This makes it possible to eliminate for loops.
* NEWS.9.md: Announce performance improvement.
* inputParser.m: Declare "Parameter" and "Switch" properties as struct arrays.
Add new private property "last_idx" which caches the last Parameter or Switch
lookup.
* inputParser.m (addRequired): Adjust input validation to use numel() now
rather than numfields().
* inputParser.m (addOptional): Adjust input validation to use numel() now
rather than numfields().
* inputParser.m (addParameter): Change code to add new Parameter to a struct
array.
* inputParser.m (addSwitch): Change code to add new Switch to a struct
array.
* inputParser.m (parse): Adjust initialization of internal variables
ParameterNames and SwitchNames to match new data structure.
Use last_idx to simplify call to validate_arg() for Parameters.
* inputParser.m (validate_arg): Move creation of error message
to code path when error has been found---No need to do it for every
function call. Don't capture "exception" variable in try/catch as
it is no longer used.
* inputParser.m (is_argname): Cache "last_idx" if match was found.
* inputParser.m (add_missing): Replace call to setdiff() with in-place
code which can take advantage of implicit knowledge to eliminate calls
to unique and input validation. Replace for loop with cell2struct/struct2cell
combination.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 21 Apr 2023 11:01:40 -0700 |
parents | 597f3ee61a48 |
children | dc89f561451a |
line wrap: on
line source
######################################################################## ## ## Copyright (C) 2003-2023 The Octave Project Developers ## ## See the file COPYRIGHT.md in the top-level directory of this ## distribution or <https://octave.org/copyright/>. ## ## This file is part of Octave. ## ## Octave is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License ## along with Octave; see the file COPYING. If not, see ## <https://www.gnu.org/licenses/>. ## ######################################################################## ## -*- texinfo -*- ## @deftypefn {} {[@var{dir}, @var{name}, @var{ext}] =} fileparts (@var{filename}) ## Return the directory, name, and extension components of @var{filename}. ## ## The input @var{filename} is a string which is parsed. There is no attempt ## to check whether the filename or directory specified actually exists. ## @seealso{fullfile, filesep} ## @end deftypefn function [dir, name, ext] = fileparts (filename) if (nargin < 1) print_usage (); endif if (! ischar (filename) || rows (filename) > 1) error ("fileparts: FILENAME must be a single string"); endif ds = strchr (filename, filesep ("all"), 1, "last"); if (isempty (ds)) ds = 0; endif es = rindex (filename, "."); ## These can be the same if they are both 0 (no dir or ext). if (es <= ds) es = length (filename)+1; endif if (ds == 0) dir = ""; elseif (ds == 1) dir = filename(1); else dir = filename(1:ds-1); endif name = filename(ds+1:es-1); if (isempty (name)) name = ""; endif if (es > 0 && es <= length (filename)) ext = filename(es:end); else ext = ""; endif endfunction %!test %! [d, n, e] = fileparts ("file"); %! assert (strcmp (d, "") && strcmp (n, "file") && strcmp (e, "")); %!test %! [d, n, e] = fileparts ("file.ext"); %! assert (strcmp (d, "") && strcmp (n, "file") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts ("/file.ext"); %! assert (strcmp (d, "/") && strcmp (n, "file") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts ("dir/file.ext"); %! assert (strcmp (d, "dir") && strcmp (n, "file") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts ("./file.ext"); %! assert (strcmp (d, ".") && strcmp (n, "file") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts ("d1/d2/file.ext"); %! assert (strcmp (d, "d1/d2") && strcmp (n, "file") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts ("/d1/d2/file.ext"); %! assert (strcmp (d, "/d1/d2") && strcmp (n, "file") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts ("/.ext"); %! assert (strcmp (d, "/") && strcmp (n, "") && strcmp (e, ".ext")); %!test %! [d, n, e] = fileparts (".ext"); %! assert (strcmp (d, "") && strcmp (n, "") && strcmp (e, ".ext")); ## Test input validation %!error <Invalid call> fileparts () %!error <FILENAME must be a single string> fileparts (1) %!error <FILENAME must be a single string> fileparts (["a"; "b"])