Mercurial > hg > octave-nkf
view scripts/sparse/gplot.m @ 16195:b52d2f9294b6
use class for reading lexer input
* input.h, input.cc (octave_base_input_reader, octave_terminal_reader,
octave_file_reader, octave_eval_string_reader): New classes.
(octave_gets): Now a member function of octave_base_reader.
(get_user_input): Delete function. Move actions to
octave_terminal_reader::get_input and
octave_eval_string_reader::get_input.
function. Call from octave_file_reader::get_input. Don't check
whether reading an eval string.
(current_eval_string, get_input_from_eval_string): Delete global
variables.
(get_debug_input): Check CURR_LEXER->input_from_eval_string instead of
global get_input_from_eval_string variable. Don't protect
get_input_from_eval_string.
* lex.h (octave_lexer::input_reader): New data member.
(octave_lexer::octave_lexer (void)): Initialize it.
(octave_lexer::octave_lexer (const std::string&),
octave_lexer::octave_lexer (FILE *)): New constructors.
* lex.h, lex.cc (octave_lexer::input_buffer::fill): New function.
(octave_lexer::input_buffer::read): Delete.
(octave_lexer::read): Rename from octave_read. Call reader to get
input, and then hand it to the input_buffer instead of asking the
input buffer to read input. Change all callers.
(octave_lexer::input_source, octave_lexer::input_from_eval_string):
New functions. Call octave_lexer::input_from_eval_string instead of
using get_input_from_eval_string.
* oct-parse.in.yy (octave_parser::octave_parser (FILE *),
octave_parser::octave_parser (const std::string&)): New constructors.
(parse_fcn_file): Pass FILE pointer to octave_parser constructor.
(eval_string): Pass string to octave_parser constructor instead of
setting global current_eval_string variable.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 05 Mar 2013 10:19:51 -0500 |
parents | f3d52523cde1 |
children | d63878346099 |
line wrap: on
line source
## Copyright (C) 2005-2012 Ivana Varekova ## ## 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 ## <http://www.gnu.org/licenses/>. ## -*- texinfo -*- ## @deftypefn {Function File} {} gplot (@var{A}, @var{xy}) ## @deftypefnx {Function File} {} gplot (@var{A}, @var{xy}, @var{line_style}) ## @deftypefnx {Function File} {[@var{x}, @var{y}] =} gplot (@var{A}, @var{xy}) ## Plot a graph defined by @var{A} and @var{xy} in the graph theory ## sense. @var{A} is the adjacency matrix of the array to be plotted ## and @var{xy} is an @var{n}-by-2 matrix containing the coordinates of ## the nodes of the graph. ## ## The optional parameter @var{line_style} defines the output style for ## the plot. Called with no output arguments the graph is plotted ## directly. Otherwise, return the coordinates of the plot in @var{x} ## and @var{y}. ## @seealso{treeplot, etreeplot, spy} ## @end deftypefn function [x, y] = gplot (A, xy, line_style) if (nargin < 2 || nargin > 3 || nargout > 2) print_usage (); endif if (nargin == 2) line_style = "-"; endif [i, j] = find (A); xcoord = [xy(i,1), xy(j,1), NaN(length(i),1) ]'(:); ycoord = [xy(i,2), xy(j,2), NaN(length(i),1) ]'(:); if (nargout == 0) plot (xcoord, ycoord, line_style); else x = xcoord; y = ycoord; endif endfunction %!demo %! ## Binary Tree Representation %! A = [0 1 0 0 0 0 0 %! 1 0 1 1 0 0 0 %! 0 1 0 0 0 0 0 %! 0 1 0 0 1 0 0 %! 0 0 0 1 0 1 1 %! 0 0 0 0 1 0 0 %! 0 0 0 0 1 0 0]; %! %! xy = [1 , 0 %! 1.5, 1 %! 2 , 0 %! 2.5, 2 %! 3.5, 1 %! 3 , 0 %! 4 , 0]; %! %! clf; %! gplot (A, xy, "o-"); %! set (get (gca, ("children")), "markersize", 12); %! title ("gplot() of Binary Tree Adjacency matrix"); %% Mark graphical function as tested by demo block %!assert (1)