Mercurial > octave-nkf
view src/token.cc @ 8964:f4f4d65faaa0
Implement sparse * diagonal and diagonal * sparse operations, double-prec only.
Date: Sun, 8 Mar 2009 16:28:18 -0400
These preserve sparsity, so eye(5) * sprand (5, 5, .2) is *sparse*
and not dense. This may affect people who use multiplication by
eye() rather than full().
The liboctave routines do *not* check if arguments are scalars in
disguise. There is a type problem with checking at that level. I
suspect we want diag * "sparse scalar" to stay diagonal, but we have
to return a sparse matrix at the liboctave. Rather than worrying
about that in liboctave, we cope with it when binding to Octave and
return the correct higher-level type.
The implementation is in Sparse-diag-op-defs.h rather than
Sparse-op-defs.h to limit recompilation. And the implementations
are templates rather than macros to produce better compiler errors
and debugging information.
author | Jason Riedy <jason@acm.org> |
---|---|
date | Mon, 09 Mar 2009 17:49:13 -0400 |
parents | 745a8299c2b5 |
children | d9b25c5b8ee5 |
line wrap: on
line source
/* Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2004, 2005, 2007 John W. Eaton 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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cassert> #include "error.h" #include "oct-obj.h" #include "symtab.h" #include "token.h" #include "utils.h" token::token (int l, int c) { line_num = l; column_num = c; type_tag = generic_token; } token::token (const std::string& s, int l, int c) { line_num = l; column_num = c; type_tag = string_token; str = new std::string (s); } token::token (double d, const std::string& s, int l, int c) { line_num = l; column_num = c; type_tag = double_token; num = d; orig_text = s; } token::token (end_tok_type t, int l, int c) { line_num = l; column_num = c; type_tag = ettype_token; et = t; } token::token (plot_tok_type t, int l, int c) { line_num = l; column_num = c; type_tag = pttype_token; pt = t; } token::token (symbol_table::symbol_record *s, int l, int c) { line_num = l; column_num = c; type_tag = sym_rec_token; sr = s; } token::~token (void) { if (type_tag == string_token) delete str; } std::string token::text (void) { assert (type_tag == string_token); return *str; } double token::number (void) { assert (type_tag == double_token); return num; } token::end_tok_type token::ettype (void) { assert (type_tag == ettype_token); return et; } token::plot_tok_type token::pttype (void) { assert (type_tag == pttype_token); return pt; } symbol_table::symbol_record * token::sym_rec (void) { assert (type_tag == sym_rec_token); return sr; } std::string token::text_rep (void) { return orig_text; } /* ;;; Local Variables: *** ;;; mode: C++ *** ;;; End: *** */