Update matrix views with structure

Author: BenBrock

examples/Makefile

@@ -4,7 +4,7 @@
 # your system and export them to your environment or
 # define them here.
 
-CXX ?= clang++
+CXX ?= g++-13
 
 # Binsparse (this should be fine unless you do an
 # out-of-source build)

examples/c_style.cpp

@@ -70,11 +70,13 @@ int main(int argc, char** argv) {
     format = "COO";
   }
 
-  auto [m, n, nnz, type, comment] = binsparse::mmread_metadata(input_file);
+  auto [m, n, nnz, type, structure, comment] =
+      binsparse::mmread_metadata(input_file);
 
   std::cout << "Matrix is " << m << " x " << n << " with " << nnz
             << " values.\n";
   std::cout << "Type: " << type << std::endl;
+  std::cout << "Structure: " << structure << std::endl;
   std::cout << "Comment:\n";
   std::cout << comment;
 

examples/convert_binsparse.cpp

@@ -24,13 +24,16 @@ struct column_major {
   }
 };
 
+enum structure_t { general, symmetric, skew_symmetric, hermitian };
+
 template <typename T, typename I>
 struct csr_matrix {
   T* values;
   I* colind;
   I* row_ptr;
 
   I m, n, nnz;
+  structure_t structure = general;
 };
 
 template <typename T, typename I>
@@ -40,6 +43,7 @@ struct csc_matrix {
   I* col_ptr;
 
   I m, n, nnz;
+  structure_t structure = general;
 };
 
 template <typename T, typename I>
@@ -49,13 +53,15 @@ struct coo_matrix {
   I* colind;
 
   I m, n, nnz;
+  structure_t structure = general;
 };
 
 template <typename T, typename I = std::size_t, typename Order = row_major>
 struct dense_matrix {
   T* values;
 
   I m, n;
+  structure_t structure = general;
 
   using order = Order;
 };

include/binsparse/containers/matrices.hpp

@@ -13,9 +13,10 @@ namespace binsparse {
 // 1 - number of columns in matrix
 // 2 - number of values in matrix
 // 3 - type of the matrix (real / integer / complex / pattern)
-// 4 - comments
+// 4 - structure of the matrix (general / symmetric / skew-symmetric /
+// Hermitian) 5 - comments
 inline auto mmread_metadata(std::string file_path) {
-  std::string type;
+  std::string type, structure;
 
   std::ifstream f;
 
@@ -57,6 +58,7 @@ inline auto mmread_metadata(std::string file_path) {
 
   // Read in general / symmetric / skew-symmetric / Hermitian
   ss >> item;
+  structure = item;
 
   std::string comment;
 
@@ -77,7 +79,7 @@ inline auto mmread_metadata(std::string file_path) {
   ss.str(buf);
   ss >> m >> n >> nnz;
 
-  return std::tuple(m, n, nnz, type, comment);
+  return std::tuple(m, n, nnz, type, structure, comment);
 }
 
 } // namespace binsparse