From fba178451c55c2bf9f5d01b4a473f1819eefc856 Mon Sep 17 00:00:00 2001 From: Dilawar Singh <dilawars@ncbs.res.in> Date: Sat, 1 Jul 2017 16:53:42 +0530 Subject: [PATCH] Squashed 'moose-core/' changes from 891f2f8bf7..d4417dcffd d4417dcffd Fixes to missing function declaration, post cherry-pick. git-subtree-dir: moose-core git-subtree-split: d4417dcffdd939de91bebf447ad776945c2fcc65 --- basecode/SparseMatrix.h | 13 +++++++++++++ msg/SparseMsg.h | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/basecode/SparseMatrix.h b/basecode/SparseMatrix.h index 606f53eb..a79d1ec5 100644 --- a/basecode/SparseMatrix.h +++ b/basecode/SparseMatrix.h @@ -423,6 +423,19 @@ public: colIndexArg.begin(), colIndexArg.end() ); rowStart_[rowNum + 1] = N_.size(); } + /// Here we expose the sparse matrix for MOOSE use. + const vector< T >& matrixEntry() const + { + return N_; + } + const vector< unsigned int >& colIndex() const + { + return colIndex_; + } + const vector< unsigned int >& rowStart() const + { + return rowStart_; + } ////////////////////////////////////////////////////////////////// // Operations on entire matrix. ////////////////////////////////////////////////////////////////// diff --git a/msg/SparseMsg.h b/msg/SparseMsg.h index 7df5e26f..3d7ba580 100644 --- a/msg/SparseMsg.h +++ b/msg/SparseMsg.h @@ -79,6 +79,11 @@ class SparseMsg: public Msg double getProbability() const; void setProbability( double value ); + // + vector< unsigned int > getMatrixEntry() const; + vector< unsigned int > getColIndex() const; + vector< unsigned int > getRowStart() const; + long getSeed() const; void setSeed( long value ); -- GitLab