diff --git a/CMakeLists.txt b/CMakeLists.txt index aeeed1d0..e7d0d7da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # Thanks to S. Matsievskiy for bringing cmake to the project. -cmake_minimum_required(VERSION 3.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.14 FATAL_ERROR) project(Sparselizard LANGUAGES CXX) diff --git a/src/formulation/mat.cpp b/src/formulation/mat.cpp index e52ea8d2..fe293a3a 100755 --- a/src/formulation/mat.cpp +++ b/src/formulation/mat.cpp @@ -102,6 +102,12 @@ vec mat::eliminate(vec b) indexmat mat::getainds(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getainds(); } indexmat mat::getdinds(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getdinds(); } +indexmat mat::getarows(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getarows(); } +indexmat mat::getdrows(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getdrows(); } +indexmat mat::getacols(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getacols(); } +indexmat mat::getdcols(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getdcols(); } +densemat mat::getavals(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getavals(); } +densemat mat::getdvals(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getdvals(); } Mat mat::getapetsc(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getapetsc(); } Mat mat::getdpetsc(void) { errorifpointerisnull(); errorifinvalidated(); return rawmatptr->getdpetsc(); } diff --git a/src/formulation/mat.h b/src/formulation/mat.h index 16211d23..362178d5 100755 --- a/src/formulation/mat.h +++ b/src/formulation/mat.h @@ -68,6 +68,12 @@ class mat indexmat getainds(void); indexmat getdinds(void); + indexmat getarows(void); + indexmat getdrows(void); + indexmat getacols(void); + indexmat getdcols(void); + densemat getavals(void); + densemat getdvals(void); Mat getapetsc(void); Mat getdpetsc(void); diff --git a/src/formulation/rawmat.cpp b/src/formulation/rawmat.cpp index 40688572..70d66a4d 100755 --- a/src/formulation/rawmat.cpp +++ b/src/formulation/rawmat.cpp @@ -346,6 +346,36 @@ indexmat rawmat::getdinds(void) return Dinds; } +indexmat rawmat::getarows(void) +{ + return Arows; +} + +indexmat rawmat::getdrows(void) +{ + return Drows; +} + +indexmat rawmat::getacols(void) +{ + return Acols; +} + +indexmat rawmat::getdcols(void) +{ + return Dcols; +} + +densemat rawmat::getavals(void) +{ + return Avals; +} + +densemat rawmat::getdvals(void) +{ + return Dvals; +} + Mat rawmat::getapetsc(void) { return Amat; diff --git a/src/formulation/rawmat.h b/src/formulation/rawmat.h index a71efde8..b7c81929 100755 --- a/src/formulation/rawmat.h +++ b/src/formulation/rawmat.h @@ -84,6 +84,12 @@ class rawmat indexmat getainds(void); indexmat getdinds(void); + indexmat getarows(void); + indexmat getdrows(void); + indexmat getacols(void); + indexmat getdcols(void); + densemat getavals(void); + densemat getdvals(void); Mat getapetsc(void); Mat getdpetsc(void);