Mercurial > octave-libgccjit
view liboctave/oct-cmplx.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 | eb63fbe60fab |
children | 7dafdb8b062f |
line wrap: on
line source
/* Copyright (C) 1995, 1996, 1997, 2000, 2001, 2004, 2005, 2007, 2008, 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_oct_cmplx_h) #define octave_oct_cmplx_h 1 #include <complex> typedef std::complex<double> Complex; typedef std::complex<float> FloatComplex; // The default comparison of complex number is to compare by abs, then by arg. // FIXME: this could be speeded up significantly. template <class T> inline bool operator < (const std::complex<T>& a, const std::complex<T>& b) { T ax = std::abs (a), bx = std::abs (b); return ax < bx || (ax == bx && std::arg (a) < std::arg (b)); } template <class T> inline bool operator > (const std::complex<T>& a, const std::complex<T>& b) { T ax = std::abs (a), bx = std::abs (b); return ax > bx || (ax == bx && std::arg (a) > std::arg (b)); } #endif /* ;;; Local Variables: *** ;;; mode: C++ *** ;;; End: *** */