Changeset ee0b48 in git

Timestamp:

Jan 6, 2011, 1:31:39 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

22303d6e0646191c1eee37f0a1b95cd9bd9364d1

Parents:

b90cc8b474180d8d55d1ffc520a7e8ae0a273c30

Message:

switched division of numbers back to div of polys

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

File:

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

kernel/linearAlgebra.cc

@@ -439 +439 @@
         MATELEM(N, nonZeroC, dim) = pCopy(MATELEM(uMat, r, w));
       }
-      number z;
       for (int d = 1; d <= dim; d++)
       {
@@ -450 +449 @@
           if (MATELEM(N, c, d) != NULL)
             p = pAdd(p, ppMult_qq(MATELEM(uMat, r, c), MATELEM(N, c, d)));
-        MATELEM(N, nonZeroC, d) = pNeg(p);
-        if (MATELEM(N, nonZeroC, d) != NULL)
-        {
-          z = nDiv(pGetCoeff(MATELEM(N, nonZeroC, d)),
-                   pGetCoeff(MATELEM(uMat, r, nonZeroC)));
-          nNormalize(z); pDelete(&MATELEM(N, nonZeroC, d));
-          MATELEM(N, nonZeroC, d) = pNSet(z);
-        }
+        q = pNSet(nInvers(pGetCoeff(MATELEM(uMat, r, nonZeroC))));
+        MATELEM(N, nonZeroC, d) = pMult(pNeg(p), q);
+        pNormalize(MATELEM(N, nonZeroC, d));
       }
       p = pNeg(pCopy(MATELEM(yVec, r, 1)));
@@ -463 +457 @@
         if (MATELEM(xVec, c, 1) != NULL)
           p = pAdd(p, ppMult_qq(MATELEM(uMat, r, c), MATELEM(xVec, c, 1)));
-      MATELEM(xVec, nonZeroC, 1) = pNeg(p);
-      if (MATELEM(xVec, nonZeroC, 1) != NULL)
-      {
-        z = nDiv(pGetCoeff(MATELEM(xVec, nonZeroC, 1)),
-                 pGetCoeff(MATELEM(uMat, r, nonZeroC)));
-        nNormalize(z); pDelete(&MATELEM(xVec, nonZeroC, 1));
-        MATELEM(xVec, nonZeroC, 1) = pNSet(z);       
-      }
+      q = pNSet(nInvers(pGetCoeff(MATELEM(uMat, r, nonZeroC))));
+      MATELEM(xVec, nonZeroC, 1) = pMult(pNeg(p), q);
+      pNormalize(MATELEM(xVec, nonZeroC, 1));
       lastNonZeroC = nonZeroC;
     }
@@ -1537 +1526 @@
   /* solve lMat * yVec = cVec; this will always work as lMat is invertible;
      moreover, all divisions are guaranteed to be without remainder */
-  number z;
+  poly p; poly q;
   for (int r = 1; r <= m; r++)
   {
-    poly p = pNeg(pCopy(MATELEM(cVec, r, 1)));
+    p = pNeg(pCopy(MATELEM(cVec, r, 1)));
     for (int c = 1; c < r; c++)
       p = pAdd(p, ppMult_qq(MATELEM(lMat, r, c), MATELEM(yVec, c, 1) ));
-    MATELEM(yVec, r, 1) = pNeg(p);
-    if (MATELEM(yVec, r, 1) != NULL)
-    {
-      z = nDiv(pGetCoeff(MATELEM(yVec, r, 1)), pGetCoeff(MATELEM(lMat, r, r)));
-      nNormalize(z);   /* division is without remainder */
-      pDelete(&MATELEM(yVec, r, 1));
-      MATELEM(yVec, r, 1) = pNSet(z);
-    }
+    /* The following division is without remainder. */
+    q = pNSet(nInvers(pGetCoeff(MATELEM(lMat, r, r))));
+    MATELEM(yVec, r, 1) = pMult(pNeg(p), q);
+    pNormalize(MATELEM(yVec, r, 1));    
   }
   
   /* compute u * dMat * yVec and put result into yVec */
-  poly p;
   for (int r = 1; r <= m; r++)
   {
@@ -1580 +1564 @@
     xVec = mpNew(n, 1);
     matrix N = mpNew(n, n); int dim = 0;
-    poly p; poly q;
     /* solve uMat * xVec = yVec and determine a basis of the solution
        space of the homogeneous system uMat * xVec = 0;
@@ -1610 +1593 @@
           if (MATELEM(N, c, d) != NULL)
             p = pAdd(p, ppMult_qq(MATELEM(uMat, r, c), MATELEM(N, c, d)));
-        MATELEM(N, nonZeroC, d) = pNeg(p);
-        if (MATELEM(N, nonZeroC, d) != NULL)
-        {
-          z = nDiv(pGetCoeff(MATELEM(N, nonZeroC, d)),
-                   pGetCoeff(MATELEM(uMat, r, nonZeroC)));
-          nNormalize(z);   /* division may be with remainder but only takes
-                              place for dim > 0 */
-          pDelete(&MATELEM(N, nonZeroC, d));
-          MATELEM(N, nonZeroC, d) = pNSet(z);
-        }
+        /* The following division may be with remainder but only takes place
+           when dim > 0. */
+        q = pNSet(nInvers(pGetCoeff(MATELEM(uMat, r, nonZeroC))));
+        MATELEM(N, nonZeroC, d) = pMult(pNeg(p), q);
+        pNormalize(MATELEM(N, nonZeroC, d));
       }
       p = pNeg(pCopy(MATELEM(yVec, r, 1)));
@@ -1625 +1603 @@
         if (MATELEM(xVec, c, 1) != NULL)
           p = pAdd(p, ppMult_qq(MATELEM(uMat, r, c), MATELEM(xVec, c, 1)));
-      MATELEM(xVec, nonZeroC, 1) = pNeg(p);
-      if (MATELEM(xVec, nonZeroC, 1) != NULL)
-      {
-        z = nDiv(pGetCoeff(MATELEM(xVec, nonZeroC, 1)),
-                 pGetCoeff(MATELEM(uMat, r, nonZeroC)));
-        nNormalize(z);   /* division is without remainder */
-        pDelete(&MATELEM(xVec, nonZeroC, 1));
-        MATELEM(xVec, nonZeroC, 1) = pNSet(z);
-      }
+      /* The following division is without remainder. */
+      q = pNSet(nInvers(pGetCoeff(MATELEM(uMat, r, nonZeroC))));
+      MATELEM(xVec, nonZeroC, 1) = pMult(pNeg(p), q);
+      pNormalize(MATELEM(xVec, nonZeroC, 1));
       lastNonZeroC = nonZeroC;
     }
     
     /* divide xVec by l*u = lTimesU and put result in xVec */
-    number zz = pGetCoeff(lTimesU);
+    number z = nInvers(pGetCoeff(lTimesU));
     for (int c = 1; c <= n; c++)
     {
-      if (MATELEM(xVec, c, 1) != NULL)
-      {
-        z = nDiv(pGetCoeff(MATELEM(xVec, c, 1)), zz);
-        nNormalize(z);
-        pDelete(&MATELEM(xVec, c, 1));
-        MATELEM(xVec, c, 1) = pNSet(z);
-      }
-    }
+      pMult_nn(MATELEM(xVec, c, 1), z);
+      pNormalize(MATELEM(xVec, c, 1));
+    }
+    nDelete(&z);
     
     if (dim == 0)