Mercurial > octave-libgccjit
view liboctave/str-vec.h @ 8951:5bce1357edd6
Fix conversion from PermMatrix to SparseMatrix.
From 76c98628f1943d583d5813321ec0a3c684d7ac84 Mon Sep 17 00:00:00 2001
Date: Tue, 10 Mar 2009 14:12:59 -0400
The result was transposed and missing its values. Also add a test case.
Signed-off-by: Jason Riedy <jason@acm.org>
---
liboctave/ChangeLog | 6 ++++++
liboctave/dSparse.cc | 7 +++++--
test/ChangeLog | 4 ++++
test/test_diag_perm.m | 9 +++++++++
4 files changed, 24 insertions(+), 2 deletions(-)
author | Jason Riedy <jason@acm.org> |
---|---|
date | Tue, 10 Mar 2009 15:44:11 -0400 |
parents | d865363208d6 |
children | bdcfb756d721 |
line wrap: on
line source
/* Copyright (C) 1996, 1997, 2000, 2002, 2003, 2005, 2006, 2007, 2009 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/>. */ #if !defined (octave_str_vec_h) #define octave_str_vec_h 1 #include <iosfwd> #include <list> #include <string> #include "Array.h" class OCTAVE_API string_vector : public Array<std::string> { public: string_vector (void) : Array<std::string> () { } explicit string_vector (octave_idx_type n) : Array<std::string> (n) { } string_vector (const char *s) : Array<std::string> (1, s) { } string_vector (const std::string& s) : Array<std::string> (1, s) { } string_vector (const string_vector& s) : Array<std::string> (s) { } string_vector (const std::list<std::string>& lst); string_vector (const char * const *s); string_vector (const char * const *s, octave_idx_type n); string_vector& operator = (const string_vector& s) { if (this != &s) Array<std::string>::operator = (s); return *this; } ~string_vector (void) { } bool empty (void) const { return length () == 0; } octave_idx_type max_length (void) const { octave_idx_type n = length (); octave_idx_type longest = 0; for (octave_idx_type i = 0; i < n; i++) { octave_idx_type tmp = elem(i).length (); if (tmp > longest) longest = tmp; } return longest; } std::string& operator[] (octave_idx_type i) { return Array<std::string>::elem (i); } std::string operator[] (octave_idx_type i) const { return Array<std::string>::elem (i); } string_vector& sort (bool make_uniq = false); string_vector& uniq (void); string_vector& append (const std::string& s); string_vector& append (const string_vector& sv); char **c_str_vec (void) const; static void delete_c_str_vec (const char * const*); std::ostream& list_in_columns (std::ostream&, int width = 0) const; }; #endif /* ;;; Local Variables: *** ;;; mode: C++ *** ;;; End: *** */