Mercurial > octave-libgccjit
view liboctave/MArray-i.cc @ 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 | a1dbe9d80eee |
children | 4c0cdbe0acca |
line wrap: on
line source
/* Copyright (C) 1995, 1996, 1997, 2000, 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 "oct-inttypes.h" // Instantiate MArrays of int values. #include "MArray.h" #include "MArray.cc" template class OCTAVE_API MArray<int>; template class OCTAVE_API MArray<long>; INSTANTIATE_MARRAY_FRIENDS (int, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (long, OCTAVE_API) template class OCTAVE_API MArray<octave_int8>; template class OCTAVE_API MArray<octave_int16>; template class OCTAVE_API MArray<octave_int32>; template class OCTAVE_API MArray<octave_int64>; INSTANTIATE_MARRAY_FRIENDS (octave_int8, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (octave_int16, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (octave_int32, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (octave_int64, OCTAVE_API) template class OCTAVE_API MArray<octave_uint8>; template class OCTAVE_API MArray<octave_uint16>; template class OCTAVE_API MArray<octave_uint32>; template class OCTAVE_API MArray<octave_uint64>; INSTANTIATE_MARRAY_FRIENDS (octave_uint8, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (octave_uint16, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (octave_uint32, OCTAVE_API) INSTANTIATE_MARRAY_FRIENDS (octave_uint64, OCTAVE_API) #include "MArray2.h" #include "MArray2.cc" template class OCTAVE_API MArray2<int>; INSTANTIATE_MARRAY2_FRIENDS (int, OCTAVE_API) #include "MArrayN.h" #include "MArrayN.cc" template class OCTAVE_API MArrayN<int>; INSTANTIATE_MARRAYN_FRIENDS (int, OCTAVE_API) template class OCTAVE_API MArrayN<octave_int8>; template class OCTAVE_API MArrayN<octave_int16>; template class OCTAVE_API MArrayN<octave_int32>; template class OCTAVE_API MArrayN<octave_int64>; INSTANTIATE_MARRAYN_FRIENDS (octave_int8, OCTAVE_API) INSTANTIATE_MARRAYN_FRIENDS (octave_int16, OCTAVE_API) INSTANTIATE_MARRAYN_FRIENDS (octave_int32, OCTAVE_API) INSTANTIATE_MARRAYN_FRIENDS (octave_int64, OCTAVE_API) template class OCTAVE_API MArrayN<octave_uint8>; template class OCTAVE_API MArrayN<octave_uint16>; template class OCTAVE_API MArrayN<octave_uint32>; template class OCTAVE_API MArrayN<octave_uint64>; INSTANTIATE_MARRAYN_FRIENDS (octave_uint8, OCTAVE_API) INSTANTIATE_MARRAYN_FRIENDS (octave_uint16, OCTAVE_API) INSTANTIATE_MARRAYN_FRIENDS (octave_uint32, OCTAVE_API) INSTANTIATE_MARRAYN_FRIENDS (octave_uint64, OCTAVE_API) #include "MDiagArray2.h" #include "MDiagArray2.cc" template class OCTAVE_API MDiagArray2<int>; INSTANTIATE_MDIAGARRAY2_FRIENDS (int, OCTAVE_API) /* ;;; Local Variables: *** ;;; mode: C++ *** ;;; End: *** */