Changeset 98e52e6 in tol

Timestamp:

Jan 22, 2009, 9:35:23 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

59bbd54

Parents:

7a01db8

Message:

Fixed bug counting non null cells in Eye functions

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

File:

• tol/btol/vmatrix_type/vmat_convert.cpp (modified) (3 diffs)

tol/btol/vmatrix_type/vmat_convert.cpp

@@ -741 +741 @@
   }
   bool lower = diag<=0;
-  int k, n = isCol?v.Rows():v.Columns();
+  int i, k, n = isCol?v.Rows():v.Columns();
   if(lower)
   {
@@ -757 +757 @@
   int*    c_ = (int*)   triplet->j;
   double* x_ = (double*)triplet->x;
-  for(k=0; k<n; k++)
-  {
-    r_[k] = lower?k-diag:k;
-    c_[k] = lower?k:k+diag;
-    x_[k] = isCol?v.GetCell(k,0):v.GetCell(0,k);
-    if(x_[k]!=0.0) { triplet->nnz++; }
+
+  for(i=k=0; k<n; k++)
+  {
+    r_[i] = lower?k-diag:k;
+    c_[i] = lower?k:k+diag;
+    x_[i] = isCol?v.GetCell(k,0):v.GetCell(0,k);
+    if(x_[i]!=0.0) { triplet->nnz++; i++; }
   }
   code_  = ESC_chlmRsparse;
@@ -794 +795 @@
   cholmod_triplet* triplet = cholmod_allocate_triplet
     (nrow,ncol,n,0,CHOLMOD_REAL,common_);
-  int*    r_ = (int*)   triplet->i;
-  int*    c_ = (int*)   triplet->j;
-  double* x_ = (double*)triplet->x;
-  for(k=0; k<n; k++)
-  {
-    r_[k] = lower?k-diag:k;
-    c_[k] = lower?k:k+diag;
-    x_[k] = x;
-    triplet->nnz += (x!=0.0);
+  if(x!=0.0)
+  {
+    int*    r_ = (int*)   triplet->i;
+    int*    c_ = (int*)   triplet->j;
+    double* x_ = (double*)triplet->x;
+    for(k=0; k<n; k++)
+    {
+      r_[k] = lower?k-diag:k;
+      c_[k] = lower?k:k+diag;
+      x_[k] = x;
+    }
+    triplet->nnz = n;
   }
   code_  = ESC_chlmRsparse;