Changeset 565716a in tol

Timestamp:

Aug 31, 2015, 6:28:54 AM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

65edfbd

Parents:

b2fecec

Message:

refs #621, correcciones debido a compilación en 64 bits

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

File:

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

tol/btol/vmatrix_type/vmat_convert.cpp

@@ -720 +720 @@
   Delete();
   code_  = ESC_chlmRsparse;
-  register int n = Minimum(nrow,ncol);
-  register int nnz = 0;
-  register int i, j, k, h, d;
-  register double c;
-  register BPolyn<BDat> pol = pol_;
+  int n = Minimum(nrow,ncol);
+  int nnz = 0;
+  int i, j, k, h, d;
+  double c;
+  BPolyn<BDat> pol = pol_;
   pol.Aggregate();
-  register int s=pol.Size();
-  register const BMonome<BDat>* mon = pol.Buffer();
+  int s=pol.Size();
+  //const BMonome<BDat>* mon = pol.Buffer();
 
   for(k=0; k<s; k++)
   {
-    d = mon->Degree();
+  //d = mon->Degree();
+  d = pol[k].Degree();
     if(d>=0)
     {
@@ -746 +747 @@
       }
     }
-    mon++;
-  }
-  mon = pol.Buffer();
+    //mon++;
+  }
+  //mon = pol.Buffer();
   cholmod_triplet* triplet = CholmodAllocate_triplet
     (nrow,ncol,nnz,0,CHOLMOD_REAL,common_);
@@ -757 +758 @@
   for(k=h=0; k<s; k++)
   {
-    d = mon->Degree();
-    c = mon->Coef().Value();
+  //d = mon->Degree();
+  d = pol[k].Degree();
+  //c = mon->Coef().Value();
+  c = pol[k].Coef().Value();
     if(d>=0)
     {
@@ -777 +780 @@
       }
     }
-    mon++;
+    //mon++;
   }