Changeset 23d43bc in tol

Timestamp:

Nov 9, 2009, 10:19:41 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

3affc27

Parents:

883e960

Message:

Fixes #778

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

Location:

tol/btol/vmatrix_type

Files:

• tol_bvmat.h (modified) (1 diff)
• tol_bvmat_impl.h (modified) (1 diff)
• vmat_convert.cpp (modified) (1 diff)
• vmatgra.cpp (modified) (5 diffs)

tol/btol/vmatrix_type/tol_bvmat.h

@@ -426 +426 @@
                     double minSparse = 0.5,
                     double drop = 0.0);
+  void DMat2tripletUnique(const BMatrix<double>& d, int nrow, int columns);
   void DMat2triplet(const BMatrix<double>& d, int nrow, int columns);
   void DMat2triplet(const BMatrix<double>& d, int nrow, int columns,

tol/btol/vmatrix_type/tol_bvmat_impl.h

@@ -32 +32 @@
 #include "cholmod.h"
 #pragma pack(4)
-typedef hash_map_by_BIntPair<double>::sparse_ BHashPairs;
+typedef hash_map_by_BIntPair<double>::sparse_ BHashDoubleByIntPair;
+typedef hash_map_by_BIntPair<bool>::sparse_ BHashBoolByIntPair;
 
 BEGIN_DECLS

tol/btol/vmatrix_type/vmat_convert.cpp

@@ -457 +457 @@
   }
 };
+
+
+////////////////////////////////////////////////////////////////////////////////
+  void BVMat::DMat2tripletUnique(const BMatrix<double>& ijx, int nrow, int ncol)
+//Importing method
+//Converts a row major BMatrix<double> to a column major cholmod dense matrix
+////////////////////////////////////////////////////////////////////////////////
+{
+  BHashBoolByIntPair hashPairs;
+  BIntPair p;
+  double x;
+  static BText fName = "TripletUnique";
+  Delete();
+  int h, k, n = ijx.Rows();
+  code_  = ESC_chlmRtriplet;
+  s_.chlmRtriplet_ = cholmod_allocate_triplet
+    (nrow,ncol,n,0,CHOLMOD_REAL,common_);
+  int*    r_ = (int*)   s_.chlmRtriplet_->i;
+  int*    c_ = (int*)   s_.chlmRtriplet_->j;
+  double* x_ = (double*)s_.chlmRtriplet_->x;
+  bool ok = true;
+  k=-1;
+  for(h=0; h<n; h++)
+  {
+    p.r_ = (int)ijx(h,0)-1;
+    p.c_ = (int)ijx(h,1)-1;
+    x = ijx(h,2);
+    if(x==0.0) { continue; }
+    BHashBoolByIntPair::const_iterator fc = hashPairs.find(p);
+    if(fc!=hashPairs.end()) { continue; }
+    hashPairs[p] = true;
+    k++;
+    r_[k] = p.r_;
+    c_[k] = p.c_;
+    x_[k] = x;
+
+    if((r_[k]<0)||(r_[k]>=nrow))
+    {
+      err_cannot_apply(fName, 
+        BText("Row index ")+(r_[k]+1)+" out of range 1..."+(nrow+1), 
+        *this);
+      ok = false;
+      break;
+    }
+    else if((c_[k]<0)||(c_[k]>=ncol))
+    {
+      err_cannot_apply(fName, 
+        BText("Columns index ")+(c_[k]+1)+" out of range 1..."+(ncol+1), 
+        *this);
+      ok = false;
+      break;
+    }
+    s_.chlmRtriplet_->nnz++; 
+  }
+  if(!ok) { Delete(); }
+};
+
 
 

tol/btol/vmatrix_type/vmatgra.cpp

@@ -485 +485 @@
 }
 
-
 //--------------------------------------------------------------------
 DeclareContensClass(BVMat, BVMatTemporary, BVMatTriplet);
@@ -500 +499 @@
      "It's posible to remap row and column indexes of cells by specifying it "
      "with rowIdx and colIdx arguments, that must be row or column matrices "
-     "of integer numbers.",
+     "of integer numbers."
+     "CAUTION: Repeated cells will be summed!. To avoid this use "
+     "TripletUnique" ,
      "Construye una VMatrix Cholmod.R.Triplet T con la sdimensiones dadas a "
      "partir de una lista de tripletas ijx que pueden expresarse bien "
@@ -509 +510 @@
      "Es posible reubicar los índices de las filas y columnas de las celdas "
      "especificándolo con los argumentos rowIdx y colIdx, que deben ser "
-     "matrices fila o columna de números enteros."),
+     "matrices fila o columna de números enteros.\n"
+     "CUIDADO: ¡Las celdas repetidas serán sumadas! Para evitarlo use "
+     "TripletUnique"),
 BOperClassify::MatrixAlgebra_);
 //--------------------------------------------------------------------
@@ -612 +615 @@
 
 //--------------------------------------------------------------------
+DeclareContensClass(BVMat, BVMatTemporary, BVMatTripletUnique);
+DefExtOpr(1, BVMatTripletUnique, "TripletUnique", 3, 3, 
+  "Matrix Real Real",
+  "(Matrix ijx, Real nrow, Real ncol)",
+  I2("Creates a Cholmod.R.Triplet VMatrix T of given dimensions from a list "
+     "of triplets ijx that can be expressed as a matrix with three columns. "
+     "Each triplet (i,j,x) defines an stored cell T[i,j]=x. Non listed ones are "
+     "assumed as zero. If row i or columns j index are not integers will be "
+     "truncated.\n"
+     "It's posible to remap row and column indexes of cells by specifying it "
+     "with rowIdx and colIdx arguments, that must be row or column matrices "
+     "of integer numbers.",
+     "Construye una VMatrix Cholmod.R.Triplet T con la sdimensiones dadas a "
+     "partir de una lista de tripletas ijx que pueden expresarse bien "
+     "como un conjunto de conjuntos de tres números cada uno, bien como "
+     "una matriz con tres columnas. Cada tripleta (i,j,x) define una celda "
+     "almacenada T(i,j)=x. Las celdas no listadas se asumen como cero.\n"
+     "Si los índices de fila i ó columna j no son enteros serán truncados.\n"
+     "Es posible reubicar los índices de las filas y columnas de las celdas "
+     "especificándolo con los argumentos rowIdx y colIdx, que deben ser "
+     "matrices fila o columna de números enteros."),
+BOperClassify::MatrixAlgebra_);
+//--------------------------------------------------------------------
+void BVMatTripletUnique::CalcContens()
+//--------------------------------------------------------------------
+{ 
+  BMatrix<double>& ijx = (BMatrix<double>&)Mat(Arg(1));
+  int nrow = (int)Real(Arg(2));
+  int ncol = (int)Real(Arg(3));
+  contens_.DMat2tripletUnique(ijx,nrow,ncol);
+}
+
+//--------------------------------------------------------------------
 DeclareContensClass(BMat, BMatTemporary, BMatVMat2Triplet);
 DefExtOpr(1, BMatVMat2Triplet, "VMat2Triplet", 1, 2,
@@ -628 +664 @@
   V.GetTriplet((BMatrix<double>&)contens_);
 }
+
 
 //--------------------------------------------------------------------