Changeset 152d55 in git

Timestamp:

Mar 28, 2011, 5:58:06 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

f3b4ae666e6d80d92f6a7b691937cf9d8d40b497

Parents:

83f30732a27330c9f9218cccbd4faeb2571b7c5f

Message:

minor changes in routines for alg+transc ext's

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

File:

• kernel/longtrans.cc (modified) (11 diffs)

kernel/longtrans.cc

@@ -518 +518 @@
    returns the minimum of the two exponents of the
    first variable in la and lb;
+   assumes a != NULL, b != NULL;
    keeps a and b */
 int napExp(napoly a, napoly b)
 {
+  assume(a != NULL);
+  assume(b != NULL);
   while (pNext(a) != NULL) pIter(a);
   int m = p_GetExp(a, 1, nacRing);
@@ -561 +564 @@
 
 /* divides out the content of the given napoly;
-   modifies the argument */
+   assumes that ph != NULL;
+   modifies ph */
 void napContent(napoly ph)
 {
@@ -567 +571 @@
   napoly p;
 
-  assume(p != NULL);
+  assume(ph != NULL);
   p = ph;
   if (nacIsOne(pGetCoeff(p))) return;
   h = nacCopy(pGetCoeff(p));
   pIter(p);
-  do
+  while (p != NULL)
   {
     d = nacGcd(pGetCoeff(p), h, nacRing);
@@ -585 +589 @@
     pIter(p);
   }
-  while (p != NULL);
   h = nacInvers(d);
   n_Delete(&d, nacRing);
@@ -599 +602 @@
 }
 
+/* removes denominators of coefficients in ph
+   by multiplication with lcm of those;
+   if char != 0, then nothing is done;
+   modifies ph */
 void napCleardenom(napoly ph)
 {
@@ -609 +616 @@
   while (p!=NULL)
   {
-    d = nacLcm(h, pGetCoeff(p), nacRing);
+    d = nacLcm(h, pGetCoeff(p), nacRing); // uses denominator of pGetCoeff(p)
     n_Delete(&h,nacRing);
     h = d;
@@ -625 +632 @@
       pIter(p);
     }
-    n_Delete(&h,nacRing);
-  }
+  }
+  n_Delete(&h,nacRing);
   napContent(ph);
 }
 
+/* returns the gcd of all coefficients in a and b;
+   assumes a != NULL, b != NULL;
+   keeps a, keeps b */
 napoly napGcd0(napoly a, napoly b)
 {
   number x, y;
+  assume(a != NULL);
+  assume(b != NULL);
   if (!ntIsChar0) return p_ISet(1, nacRing);
   x = nacCopy(pGetCoeff(a));
-  if (nacIsOne(x))
-    return napInitz(x);
-  while (pNext(a)!=NULL)
-  {
-    pIter(a);
+  if (nacIsOne(x)) return napInitz(x);
+  pIter(a);
+  while (a!=NULL)
+  {
     y = nacGcd(x, pGetCoeff(a), nacRing);
     n_Delete(&x,nacRing);
     x = y;
-    if (nacIsOne(x))
-      return napInitz(x);
+    if (nacIsOne(x)) return napInitz(x);
+    pIter(a);
   }
   do
@@ -651 +662 @@
     n_Delete(&x,nacRing);
     x = y;
-    if (nacIsOne(x))
-      return napInitz(x);
+    if (nacIsOne(x)) return napInitz(x);
     pIter(b);
   }
@@ -659 +669 @@
 }
 
-/*3
-* result =gcd(a,b)
-*/
+/* returns the gcd of a and b;
+   if char != 0, then the constant poly 1 is returned;
+   if a = b = 0, then the constant poly 1 is returned;
+   if a = 0 != b, then b is returned;
+   if a != 0 = b, then a is returned;
+   keeps a, keeps b */
 napoly napGcd(napoly a, napoly b)
 {
   int i;
   napoly g, x, y, h;
-  if ((a==NULL)
-  || ((pNext(a)==NULL)&&(nacIsZero(pGetCoeff(a)))))
-  {
-    if ((b==NULL)
-    || ((pNext(b)==NULL)&&(nacIsZero(pGetCoeff(b)))))
-    {
-      return p_ISet(1,nacRing);
-    }
-    return napCopy(b);
-  }
-  else
-  if ((b==NULL)
-  || ((pNext(b)==NULL)&&(nacIsZero(pGetCoeff(b)))))
-  {
-    return napCopy(a);
-  }
+  if (a == NULL)
+  {
+    if (b == NULL)    return p_ISet(1,nacRing);
+    else              return napCopy(b);
+  }
+  else if (b == NULL) return napCopy(a);
+  
   if (naMinimalPoly != NULL)
-  {
+  { // we have an algebraic extension
     if (p_GetExp(a,1,nacRing) >= p_GetExp(b,1,nacRing))
     {
@@ -726 +730 @@
     return g;
   }
-  // Hmm ... this is a memory leak
-  // x = (napoly)p_Init(nacRing);
-  g=a;
-  h=b;
-  if (!ntIsChar0) x = p_ISet(1,nacRing);
-  else            x = napGcd0(g,h);
-  for (i=(ntNumbOfPar-1); i>=0; i--)
-  {
-    napSetExp(x,i+1, napExpi(i,a,b));
-    p_Setm(x,nacRing);
-  }
-  return x;
-}
-
-
+  else
+  { // we have ntNumbOfPar transcendental variables 
+    if (!ntIsChar0) x = p_ISet(1,nacRing);
+    else            x = napGcd0(a,b);
+    for (i=(ntNumbOfPar-1); i>=0; i--)
+    {
+      napSetExp(x,i+1, napExpi(i,a,b));
+      p_Setm(x,nacRing);
+    }
+    return x;
+  }
+}
+
+/* returns the lcm of all denominators in the coefficients of a;
+   if char != 0, then the constant poly 1 is returned;
+   if a = 0, then the constant poly 1 is returned;
+   keeps a */
 number napLcm(napoly a)
 {
   number h = nacInit(1,nacRing);
-
   if (ntIsChar0)
   {
     number d;
     napoly b = a;
-
     while (b!=NULL)
     {
-      d = nacLcm(h, pGetCoeff(b), nacRing);
+      d = nacLcm(h, pGetCoeff(b), nacRing); // uses denominator of pGetCoeff(b)
       n_Delete(&h,nacRing);
       h = d;
@@ -760 +764 @@
   return h;
 }
-
 
 /*2