Changeset 5b13774 in tol

Timestamp:

Aug 26, 2009, 9:50:42 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

0fcdd1d

Parents:

b4b5301

Message:

Enabling warning message of inefficient use when matrices are converted to dense

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

File:

• tol/btol/vmatrix_type/vmat_io.cpp (modified) (6 diffs)

tol/btol/vmatrix_type/vmat_io.cpp

@@ -76 +76 @@
 }
 
-//#define DO_WARN_INEF_USE
+#define DO_WARN_INEF_USE
+#ifdef DO_WARN_INEF_USE
+  #define DO_WARN_INEF_USE_all2bRd
+//#define DO_WARN_INEF_USEall_all2cRs
+//#define DO_WARN_INEF_USE_2cRt
+#endif
 
 
@@ -94 +99 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-#ifdef DO_WARN_INEF_USE
+#ifdef DO_WARN_INEF_USE_2cRt
   static double minStoredCells_ = 1000.0;
   double storedCells = a.StoredCells();
@@ -113 +118 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-#ifdef DO_WARN_INEF_USE
+#ifdef DO_WARN_INEF_USEall_all2cRs
   static double minStoredCells_ = 1000.0;
   double storedCells = a.StoredCells();
@@ -119 +124 @@
   {
     warn_inefUse(I2("Converting to","Convirtiendo matriz a")+
-            " Blas.R.Sparse "+CodeName(a.code_)+" "+
+            " Cholmod.R.Sparse "+CodeName(a.code_)+" "+
             I2("to apply","para aplicar")+" "+fName+" "+
             I2("to a virtual matrix","a una matriz virtual")+
@@ -132 +137 @@
 ////////////////////////////////////////////////////////////////////////////////
 {
-#ifdef DO_WARN_INEF_USE
+#ifdef DO_WARN_INEF_USE_all2bRd
   static double minLostCells_ = 1000.0;
+  int    r = a.Rows();
+  int    c = a.Columns();
   double storedCells = a.StoredCells();
-  double denseCells  = a.Rows()*a.Columns();
+  double denseCells  = r*c;
   double lostCells   = denseCells-storedCells;
-  if(lostCells>=minLostCells_)
+  if( ((r>1)&&(c>1)) && (lostCells>=minLostCells_) )
   {
     double memKbLost = (lostCells*sizeof(double))/1024.0;
@@ -144 +151 @@
       I2("to apply","para aplicar")+" "+fName+" "+
       I2("to a virtual matrix","a una matriz virtual")+
-      " "+CodeName(a.code_)+"("+a.Rows()+"x"+a.Columns()+")"+" "+
+      " "+CodeName(a.code_)+"("+r+"x"+c+")"+" "+
       I2("with","con")+" "+storedCells+
       I2("stored cells","celdas almacendas")+".\n"+