Changeset 912bd1b in tol

Timestamp:

Nov 3, 2008, 8:05:53 AM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

8b98f904

Parents:

47cbb8f

Message:

WriteMatrixMarket in order to export to MatrixMarket format. This will anable us to check results with SuiteSparse

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@103 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/btol/vmatrix_type

Files:

• Jamfile (modified) (1 diff)
• tol_bvmat.h (modified) (1 diff)
• vmat_io.cpp (modified) (3 diffs)

tol/btol/vmatrix_type/Jamfile

@@ -4 +4 @@
     : vmat.cpp vmat_convert.cpp vmat_stats.cpp vmat_arith.cpp vmat_logic.cpp
       vmat_chol.cpp vmat_subtypes.cpp vmat_io.cpp vmat_bsr.cpp 
-      vmat_iterator.cpp vmatgra.cpp
+      vmat_iterator.cpp vmatgra.cpp mmio.c
     : <include>$(TOP)/bmath/gsl_ext
 

tol/btol/vmatrix_type/tol_bvmat.h

@@ -324 +324 @@
   void   Print(FILE* file, const char* name, int level) const;
   void   Scan (FILE* file);
+  void   WriteMatrixMarket(FILE* file);
   size_t Bytes() const;
   bool   Write(BOisCreator& ois, BStream* name) const;

tol/btol/vmatrix_type/vmat_io.cpp

@@ -28 +28 @@
 #include <stdarg.h>
 
-     
+//#define _USE_MM_IO_
+#ifdef _USE_MM_IO_
+#include "mmio.h"
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -190 +193 @@
         I2("virtual matrix","")+" "+CodeName(a.code_)+
            "("+a.Rows()+"x"+a.Columns()+")"+" ");
+  FILE *f = fopen("/tmp/fail_chol.mtx", "w");
+  ((BVMat&)a).WriteMatrixMarket(f);
+  fclose(f);
 }
 
@@ -300 +306 @@
   s_.chlmRtriplet_ = cholmod_read_triplet(file,common_);
 };
+
+#ifdef _USE_MM_IO_
+////////////////////////////////////////////////////////////////////////////////
+  void BVMat::WriteMatrixMarket(FILE* file)
+//Exporting method
+////////////////////////////////////////////////////////////////////////////////
+{
+  cholmod_triplet *ptr_triplet = NULL;
+  bool should_free = false;
+  MM_typecode matcode;
   
+  if (code_==ESC_chlmRsparse) {
+    ptr_triplet = cholmod_sparse_to_triplet(s_.chlmRsparse_, common_);
+    should_free = true;
+  } else if (code_==ESC_chlmRtriplet) {
+    ptr_triplet = s_.chlmRtriplet_;
+  }
+  if (ptr_triplet) {
+    mm_initialize_typecode(&matcode);
+    mm_set_matrix(&matcode);
+    mm_set_coordinate(&matcode);
+    mm_set_real(&matcode);
+
+    mm_write_banner(file, matcode); 
+    mm_write_mtx_crd_size(file,
+                          ptr_triplet->nrow,
+                          ptr_triplet->ncol,
+                          ptr_triplet->nnz);
+
+    /* NOTE: matrix market files use 1-based indices, i.e. first element
+       of a vector has index 1, not 0.  */
+
+    int *Ti = (int*)ptr_triplet->i;
+    int *Tj = (int*)ptr_triplet->j;
+    double *Val = (double*)ptr_triplet->x;
+    for (int i=0; i<ptr_triplet->nnz; i++)
+        fprintf(file,
+                "%d %d %10.7g\n", Ti[i]+1, Tj[i]+1, Val[i]);
+    
+    if (should_free) {
+      cholmod_free_triplet(&ptr_triplet, common_);
+    }
+  }
+};
+#else
+void BVMat::WriteMatrixMarket(FILE* file)
+{
+}
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
   size_t BVMat::bytes_blasRdense() const