Mercurial > octave-libgccjit
view liboctave/CmplxGEPBAL.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 | 4c0cdbe0acca |
line wrap: on
line source
/* Copyright (C) 1994, 1995, 1996, 1997, 2000, 2002, 2004, 2005, 2006, 2007, 2008 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_ComplexGEPBALANCE_h) #define octave_ComplexGEPBALANCE_h 1 #include <iosfwd> #include <string> #include "CMatrix.h" #include "dMatrix.h" class OCTAVE_API ComplexGEPBALANCE { public: ComplexGEPBALANCE (void) : balanced_mat (), balancing_mat () { } ComplexGEPBALANCE (const ComplexMatrix& a, const ComplexMatrix& b, const std::string& balance_job) { init (a, b, balance_job); } ComplexGEPBALANCE (const ComplexGEPBALANCE& a) : balanced_mat (a.balanced_mat), balanced_mat2 (a.balanced_mat2), balancing_mat (a.balancing_mat), balancing_mat2 (a.balancing_mat2) { } ComplexGEPBALANCE& operator = (const ComplexGEPBALANCE& a) { if (this != &a) { balanced_mat = a.balanced_mat; balanced_mat2 = a.balanced_mat2; balancing_mat = a.balancing_mat; balancing_mat2 = a.balancing_mat2; } return *this; } ~ComplexGEPBALANCE (void) { } ComplexMatrix balanced_matrix (void) const { return balanced_mat; } ComplexMatrix balanced_matrix2 (void) const { return balanced_mat2; } Matrix balancing_matrix (void) const { return balancing_mat; } Matrix balancing_matrix2 (void) const { return balancing_mat2; } friend std::ostream& operator << (std::ostream& os, const ComplexGEPBALANCE& a); private: ComplexMatrix balanced_mat; ComplexMatrix balanced_mat2; Matrix balancing_mat; Matrix balancing_mat2; octave_idx_type init (const ComplexMatrix& a, const ComplexMatrix& b, const std::string& balance_job); }; #endif /* ;;; Local Variables: *** ;;; mode: C++ *** ;;; End: *** */