Changeset d232f66 in tol

Timestamp:

Oct 26, 2009, 3:41:15 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

d00af3a

Parents:

fbc0756

Message:

Fixed #621

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

File:

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

tol/btol/vmatrix_type/vmat_arith.cpp

@@ -683 +683 @@
   else     
   { 
-    assert(n0+1>=0);
+    assert(n0+i>=0);
     xk = X0[n0+i];
   }
@@ -698 +698 @@
 {
   double xk = 0;
-  i+=P[k].Degree();
-  if(i<n) 
+  BMonome<BDat>& Pk = P[k];
+  int d = Pk.Degree();
+  double c = Pk.Coef().Value();
+  int id = i+d;
+  if(id<n) 
   { 
-    assert(i>=0);
-    xk = X[i];
+    assert(id>=0);
+    xk = X[id];
+/*  Std(BText("  GetForwardValue ")+
+      "\tn0= "+n0+
+      "\tn= "+n+
+      "\ti= "+i+
+      "\tk= "+k+
+      "\td= "+d+
+      "\tc= "+c+
+      "\tid= "+id+
+      "\txk= X["+id+"]="+xk+
+      "\tc*xk= "+(c * xk)+
+      "\n"); */
   }
   else     
   { 
-    assert(n+i<n0);
-    xk = X0[n+i];
-  }
-  return(P[k].Coef().Value() * xk);
+    assert(id-n<n0);
+    xk = X0[id-n];
+/*  Std(BText("  GetForwardValue ")+
+      "\tn0= "+n0+
+      "\tn= "+n+
+      "\ti= "+i+
+      "\tk= "+k+
+      "\td= "+d+
+      "\tc= "+c+
+      "\tid= "+id+
+      "\txk= X0["+(id-n)+"]="+xk+
+      "\tc*xk= "+(c * xk)+
+      "\n"); */
+  }
+  return(c * xk);
 }
 
@@ -853 +878 @@
   BVMatColMajIter y0_(Y0, fName);
   BArray<double> _x0, _x, _y0;
-  double *x0, *x, *y0, *y;
-  double *yij= ((double*)Y->s_.blasRdense_->x);
+  double *x0=NULL, *x=NULL, *y0=NULL, *y=NULL;
+  double *yij= ((double*)Y->s_.blasRdense_->x)+(r*c-1);
   int nnz = 0;
-  for(j=0; j<c; j++)
-  {
-    x0_.GetCol(j,_x0); x0 = _x0.GetBuffer();
-    x_ .GetCol(j,_x ); x  = _x .GetBuffer();
-    y0_.GetCol(j,_y0); y0 = _y0.GetBuffer();
-    y = yij;
+  for(j=c-1; j>=0; j--)
+  {
+    if(p) { x0_.GetCol(j,_x0); x0 = _x0.GetBuffer(); }
+            x_ .GetCol(j,_x ); x  = _x .GetBuffer();
+    if(q) { y0_.GetCol(j,_y0); y0 = _y0.GetBuffer(); }
+    y = yij-r+1;
         for(i=r-1; i>=0; i--)
           {
             *yij = 0.0;
+    //Std(BText("BackDifEq AR\n"));
             for(k=0; k<num.Size(); k++)
             {
                     *yij += GetForwardValue(num,x0,p,x,r,i,k);
             }
+    //Std(BText("BackDifEq MA\n"));
             for(k=1; k<den.Size(); k++)
             {
@@ -875 +902 @@
       if(fabs(*yij)<chop) { *yij=0.0; }
       if(fabs(*yij)>0.0)  { nnz++; }
-      yij++;
+    //Std(BText("y[")+i+"]="+y[i]+"\n");
+      yij--; 
           }
   }