Changeset 4d1104a in git

Timestamp:

Dec 13, 2010, 10:43:25 AM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

37dc41c7f4b75286366de8700dfb2d28d71976d0

Parents:

086654227485403024df3a1e3d43b341615c040d

Message:

enhancement for f*g suggested by Santiago

git-svn-id: file:///usr/local/Singular/svn/trunk@13756 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/linearAlgebra.cc (modified) (6 diffs)

kernel/linearAlgebra.cc

@@ -1321 +1321 @@
      A*x = b with constant matrix A (as decomposed above). By theory, the
      system is guaranteed to have a unique solution. */
+  poly fg = ppMult_qq(f, g);   /* for storing the product of f and g */
   for (int xExp = 1; xExp <= d; xExp++)
   {
@@ -1326 +1327 @@
     matrix xVec = mpNew(n + m, 1);     /* x */
     
-    p = ppMult_qq(f, g);
+    p = pCopy(fg);
     p = pAdd(pCopy(h), pNeg(p));       /* p = h - f*g */
     /* we collect all terms in p with x-exponent = xExp and use their
@@ -1348 +1349 @@
       luSolveViaLUDecomp(pMat, lMat, uMat, bVec, xVec, notUsedMat);
       idDelete((ideal*)&notUsedMat);
-      /* augment f and g by newly computed terms */
+      /* update f and g by newly computed terms, and update f*g */
+      poly fNew = NULL; poly gNew = NULL;
       for (int row = 1; row <= m; row++)
       {
@@ -1357 +1359 @@
           pSetExp(p, yIndex, row - 1);        /* p = c * x^xExp * y^i   */
           pSetm(p);
-          g = pAdd(g, p);
+          gNew = pAdd(gNew, p);
         }
       }
@@ -1368 +1370 @@
           pSetExp(p, yIndex, row - m - 1);    /* p = c * x^xExp * y^i   */
           pSetm(p);
-          f = pAdd(f, p);
+          fNew = pAdd(fNew, p);
         }
       }
+      fg = pAdd(fg, ppMult_qq(f, gNew));
+      fg = pAdd(fg, ppMult_qq(g, fNew));
+      fg = pAdd(fg, ppMult_qq(fNew, gNew));
+      f = pAdd(f, fNew);
+      g = pAdd(g, gNew);
     }
     /* clean-up loop-dependent vectors */
@@ -1376 +1383 @@
   }
   
-  /* clean-up matrices A, P, L and U */
+  /* clean-up matrices A, P, L and U, and polynomial fg */
   idDelete((ideal*)&aMat); idDelete((ideal*)&pMat);
   idDelete((ideal*)&lMat); idDelete((ideal*)&uMat);
-}
-
+  pDelete(&fg);
+}
+