Mercurial > hg > octave-nkf

annotate scripts/miscellaneous/python.m @ 16994:333243133364

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance. matrix concatenation is ~80% faster than cstrcat(). * doc/interpreter/strings.txi: Document preference for matrix concatenation as opposed to alternatives. * doc/interpreter/geometryimages.m, doc/interpreter/interpimages.m, doc/interpreter/plotimages.m, doc/interpreter/sparseimages.m, doc/interpreter/splineimages.m, scripts/general/genvarname.m, scripts/general/int2str.m, scripts/general/num2str.m, scripts/help/__makeinfo__.m, scripts/help/help.m, scripts/miscellaneous/copyfile.m, scripts/miscellaneous/dir.m, scripts/miscellaneous/edit.m, scripts/miscellaneous/fact.m, scripts/miscellaneous/fullfile.m, scripts/miscellaneous/mkoctfile.m, scripts/miscellaneous/movefile.m, scripts/miscellaneous/perl.m, scripts/miscellaneous/python.m, scripts/miscellaneous/run.m, scripts/miscellaneous/tempdir.m, scripts/miscellaneous/unpack.m, scripts/pkg/private/configure_make.m, scripts/pkg/private/create_pkgadddel.m, scripts/pkg/private/extract_pkg.m, scripts/pkg/private/get_description.m, scripts/pkg/private/get_forge_pkg.m, scripts/pkg/private/getarch.m, scripts/pkg/private/getarchprefix.m, scripts/pkg/private/install.m, scripts/pkg/private/installed_packages.m, scripts/pkg/private/load_packages_and_dependencies.m, scripts/pkg/private/rebuild.m, scripts/pkg/private/repackage.m, scripts/pkg/private/shell.m, scripts/pkg/private/uninstall.m, scripts/plot/private/__go_draw_axes__.m, scripts/signal/spectral_adf.m, scripts/signal/spectral_xdf.m, scripts/statistics/tests/z_test.m, scripts/statistics/tests/z_test_2.m, scripts/strings/mat2str.m, scripts/strings/strtok.m, scripts/testfun/__run_test_suite__.m, scripts/testfun/assert.m, scripts/testfun/demo.m, scripts/testfun/speed.m, scripts/testfun/test.m, test/eval-catch.tst, test/io.tst, test/try.tst: Replace cstrcat() with matrix concatenation where possible.
author Rik <rik@octave.org>
date Wed, 17 Jul 2013 14:02:32 -0700
parents c6ae30f73946
children 1c89599167a6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14138
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 13859
diff changeset
1 ## Copyright (C) 2008-2012 Julian Schnidder
72c96de7a403 maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents: 13859
diff changeset
2 ## Copyright (C) 2012 Carnë Draug
13163
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
3 ##
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
4 ## This file is part of Octave.
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
5 ##
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
6 ## Octave is free software; you can redistribute it and/or modify it
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
7 ## under the terms of the GNU General Public License as published by
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
8 ## the Free Software Foundation; either version 3 of the License, or (at
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
9 ## your option) any later version.
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
10 ##
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
11 ## Octave is distributed in the hope that it will be useful, but
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
14 ## General Public License for more details.
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
15 ##
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
16 ## You should have received a copy of the GNU General Public License
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
17 ## along with Octave; see the file COPYING. If not, see
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
18 ## <http://www.gnu.org/licenses/>.
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
19
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
20 ## -*- texinfo -*-
14818
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
21 ## @deftypefn {Function File} {@var{output} =} python (@var{scriptfile})
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
22 ## @deftypefnx {Function File} {@var{output} =} python (@var{scriptfile}, @var{argument1}, @var{argument2}, @dots{})
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
23 ## @deftypefnx {Function File} {[@var{output}, @var{status}] =} python (@dots{})
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
24 ## Invoke Python script @var{scriptfile}, possibly with a list of command line
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
25 ## arguments. Return output in @var{output} and optional status in
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
26 ## @var{status}. If @var{scriptfile} is not an absolute file name it is
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
27 ## is searched for in the current directory and then in the Octave loadpath.
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
28 ## @seealso{system, perl}
13163
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
29 ## @end deftypefn
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
30
13859
6d59b141e65d Add python to manual and respect format rules of copyright block
Carnë Draug <carandraug+dev@gmail.com>
parents: 13163
diff changeset
31 ## Author: Carnë Draug <carandraug+dev@gmail.com>
6d59b141e65d Add python to manual and respect format rules of copyright block
Carnë Draug <carandraug+dev@gmail.com>
parents: 13163
diff changeset
32
13163
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
33 function [output, status] = python (scriptfile = "-c ''", varargin)
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
34
14818
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
35 if (ischar (scriptfile)
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
36 && ( (nargin == 1 && ! isempty (scriptfile))
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
37 || (nargin != 1 && iscellstr (varargin))))
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
38 if (! strcmp (scriptfile(1:2), "-c"))
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
39 ## Attempt to find file in loadpath. No effect for absolute filenames.
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
40 scriptfile = file_in_loadpath (scriptfile);
c6ae30f73946 Look for perl/python scripts in Octave load path (bug #36729)
Rik <octave@nomad.inbox5.com>
parents: 14138
diff changeset
41 endif
13163
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
42
16994
333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents: 14818
diff changeset
43 [status, output] = system (["python ", scriptfile, ...
333243133364 Use matrix concatenation for strings, rather than cstrcat(), for clarity and performance.
Rik <rik@octave.org>
parents: 14818
diff changeset
44 sprintf(" %s", varargin{:})]);
13163
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
45 else
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
46 error ("python: invalid arguments");
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
47 endif
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
48
2ca9730d35ba python: new function to invoke python scripts from octave code
Carnë Draug <carandraug+dev@gmail.com>
parents:
diff changeset
49 endfunction