Changeset af58f78 in tol

Timestamp:

Mar 19, 2009, 9:03:11 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

845146f

Parents:

bc58504

Message:

Simplified cycles in BPol2sparse
Fixes #663

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

File:

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

tol/btol/vmatrix_type/vmat_convert.cpp

@@ -613 +613 @@
   register int n = Minimum(nrow,ncol);
   register int nnz = 0;
-  register int i, j, k, h, d, jMin, jMax;
+  register int i, j, k, h, d;
   register double c;
   register BPolyn<BDat> pol = pol_;
@@ -619 +619 @@
   register int s=pol.Size();
   register const BMonome<BDat>* mon = pol.Buffer();
+
   for(k=0; k<s; k++)
   {
     d = mon->Degree();
-    jMin = Maximum(0,-d);
-    jMax = Minimum(nrow-d-1,ncol-1);
-    if(jMax<jMin)
-    {
-      s=k;
-      break;
+    if(d>=0)
+    {
+      for(i=d; (i<nrow)&&(i-d<ncol); i++)
+      {
+        nnz++;
+      }
     }
     else
     {
-      nnz += Maximum(0,jMax-jMin+1);
-      mon++;
-    }
+      for(j=-d; (j<ncol)&&(j+d<nrow); j++)
+      {
+        nnz++;
+      }
+    }
+    mon++;
   }
   mon = pol.Buffer();
@@ -646 +650 @@
     d = mon->Degree();
     c = mon->Coef().Value();
-    jMin = Maximum(0,-d);
-    jMax = Minimum(nrow-d-1,ncol-1);
-    assert(jMax>=jMin);
-    for(j=jMin; j<=jMax; j++, h++)
-    {
-      i=j+d;
-      assert((i>=0)&&(i<nrow));
-      assert((j>=0)&&(j<ncol));
-      assert(h<nnz);
-      r_[h] = i;
-      c_[h] = j;
-      x_[h] = c;
+    if(d>=0)
+    {
+      for(i=d; (i<nrow)&&(i-d<ncol); i++, h++)
+      {
+        r_[h] = i;
+        c_[h] = i-d;
+        x_[h] = c;
+      }
+    }
+    else
+    {
+      for(j=-d; (j<ncol)&&(j+d<nrow); j++, h++)
+      {
+        r_[h] = j+d;
+        c_[h] = j;
+        x_[h] = c;
+      }
     }
     mon++;
   }
+
   s_.chlmRsparse_ = cholmod_triplet_to_sparse(triplet, nnz, common_);
   cholmod_free_triplet(&triplet,common_);