Changeset be56124 in git

Timestamp:

Aug 28, 2013, 12:36:11 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

8f761ae82f2bae65cb1dee517949807fa5bea8bb

Parents:

fa601bae3b282a1d9ecb0b4cd31ebb37b467e9a42e416bb313f3d70371bd9a38ab5c86e29244f713

Message:

Merge pull request #347 from mmklee/finduni

Finduni

Files:

• Singular/LIB/factor.lib (deleted)
• Tst/New.lst (modified) (1 diff)
• Tst/New/finduni.res.gz.uu (added)
• Tst/New/finduni.stat (added)
• Tst/New/finduni.tst (added)
• libpolys/coeffs/shortfl.cc (modified) (3 diffs)
• libpolys/polys/clapconv.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (6 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (3 diffs)

Tst/New.lst

@@ -1 +1 @@
 New/algext_numbers.tst
 New/bigints.tst
+New/finduni.tst
 New/gf_coeff_short.tst
 New/gf_fetch.tst

libpolys/coeffs/shortfl.cc

@@ -441 +441 @@
   mpf_init(e);
   mpf_set_z(e,z);
+  int sign= mpf_sgn(e);
+  mpf_abs (e, e);
 
   /* if number was an integer, we are done*/
@@ -453 +455 @@
     signed long int exp;
     basis = mpf_get_d_2exp(&exp, e);
-    float f= mpf_sgn(e)*ldexp(basis,exp);
+    float f= sign*ldexp(basis,exp);
     mpf_clear(e);
     return nf(f).N();
@@ -479 +481 @@
   signed long int exp;
   basis = mpf_get_d_2exp(&exp, q);
-  float f = mpf_sgn(e)*ldexp(basis,exp);
+  float f = sign*ldexp(basis,exp);
   mpf_clear(e);
   mpf_clear(d);

libpolys/polys/clapconv.cc

@@ -323 +323 @@
 
     // test if denominator is constant
-    if (!p_IsConstantPoly(DEN (p_GetCoeff (p,r)),r) && !errorreported)
+    if (!p_IsConstantPoly(DEN (p_GetCoeff (p,r)),r->cf->extRing) && !errorreported)
       WerrorS("conversion error: denominator!= 1");
 

libpolys/polys/ext_fields/transext.cc

@@ -1156 +1156 @@
 
   if (IS0(a)) return;
+  if (NUM(f)!=NULL) p_Normalize(NUM(f), ntRing);
+  if (DEN(f)!=NULL) p_Normalize(DEN(f), ntRing);
   if (!simpleTestsHaveAlreadyBeenPerformed)
   {
-    p_Normalize(NUM(f), ntRing);
-    if (DEN(f)!=NULL) p_Normalize(DEN(f), ntRing);
+    //p_Normalize(NUM(f), ntRing);
+    //if (DEN(f)!=NULL) p_Normalize(DEN(f), ntRing);
     if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; return; }
 
@@ -1172 +1174 @@
     }
   }
-  if (rField_is_Q(ntRing))
+  /*if (rField_is_Q(ntRing))
   {
     number c=n_Copy(pGetCoeff(NUM(f)),ntCoeffs);
@@ -1224 +1226 @@
       }
     }
-  }
+  }*/
 
 #ifdef HAVE_FACTORY
@@ -1231 +1233 @@
     pGcd = singclap_gcd_r(NUM(f), DEN(f), ntRing);
   if (p_IsConstant(pGcd, ntRing)
-  //&& n_IsOne(p_GetCoeff(pGcd, ntRing), ntCoeffs)
+  && n_IsOne(p_GetCoeff(pGcd, ntRing), ntCoeffs)
   )
   { /* gcd = 1; nothing to cancel;
@@ -1400 +1402 @@
   poly pb = p_Copy(DEN(fb), ntRing);
 
+  poly pGcd;
+  if (nCoeff_is_Q(ntCoeffs))
+  {
+    if (p_IsConstant(pa,ntRing) && p_IsConstant(pb,ntRing))
+    {
+      pGcd = pa;
+      p_SetCoeff (pGcd, n_Gcd (pGetCoeff(pGcd), pGetCoeff(pb), ntCoeffs), ntRing);
+    }
+    else
+    {
+      number contentpa, contentpb, tmp;
+
+      contentpb= p_GetCoeff(pb, ntRing);
+      pIter(pb);
+      while (pb != NULL)
+      {
+        tmp = n_Gcd(contentpb, p_GetCoeff(pb, ntRing) , ntCoeffs);
+        n_Delete(&contentpb, ntCoeffs);
+        contentpb = tmp;
+        pIter(pb);
+      }
+
+      contentpa= p_GetCoeff(pa, ntRing);
+      pIter(pa);
+      while (pa != NULL)
+      {
+        tmp = n_Gcd(contentpa, p_GetCoeff(pa, ntRing), ntCoeffs);
+        n_Delete(&contentpa, ntCoeffs);
+        contentpa = tmp;
+        pIter(pa);
+      }
+
+      tmp= n_Gcd (contentpb, contentpa, ntCoeffs);
+      n_Delete(&contentpa, ntCoeffs);
+      n_Delete(&contentpb, ntCoeffs);
+      contentpa= tmp;
+      p_Delete(&pb, ntRing);
+      p_Delete(&pa, ntRing);
+
+      /* singclap_gcd destroys its arguments; we hence need copies: */
+      pGcd = singclap_gcd(p_Copy(NUM(fa),ntRing), p_Copy(DEN(fb),ntRing), ntRing);
+      pGcd= p_Mult_nn (pGcd, contentpa, ntRing);
+      n_Delete(&contentpa, ntCoeffs);
+    }
+  }
+  else
+    pGcd = singclap_gcd(pa, pb, cf->extRing);
+
   /* Note that, over Q, singclap_gcd will remove the denominators in all
      rational coefficients of pa and pb, before starting to compute
      the gcd. Thus, we do not need to ensure that the coefficients of
      pa and pb live in Z; they may well be elements of Q\Z. */
-  poly pGcd = singclap_gcd(pa, pb, ntRing);
+
   if (p_IsConstant(pGcd, ntRing) &&
       n_IsOne(p_GetCoeff(pGcd, ntRing), ntCoeffs))
@@ -1442 +1492 @@
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
-  /* singclap_gcd destroys its arguments; we hence need copies: */
+
   poly pa = p_Copy(NUM(fa), ntRing);
   poly pb = p_Copy(NUM(fb), ntRing);
 
+  poly pGcd;
+  if (nCoeff_is_Q(ntCoeffs))
+  {
+    if (p_IsConstant(pa,ntRing) && p_IsConstant(pb,ntRing))
+    {
+      pGcd = pa;
+      p_SetCoeff (pGcd, n_Gcd (pGetCoeff(pGcd), pGetCoeff(pb), ntCoeffs), ntRing);
+    }
+    else
+    {
+      number contentpa, contentpb, tmp;
+
+      contentpb= p_GetCoeff(pb, ntRing);
+      pIter(pb);
+      while (pb != NULL)
+      {
+        tmp = n_Gcd(contentpb, p_GetCoeff(pb, ntRing) , ntCoeffs);
+        n_Delete(&contentpb, ntCoeffs);
+        contentpb = tmp;
+        pIter(pb);
+      }
+
+      contentpa= p_GetCoeff(pa, ntRing);
+      pIter(pa);
+      while (pa != NULL)
+      {
+        tmp = n_Gcd(contentpa, p_GetCoeff(pa, ntRing), ntCoeffs);
+        n_Delete(&contentpa, ntCoeffs);
+        contentpa = tmp;
+        pIter(pa);
+      }
+
+      tmp= n_Gcd (contentpb, contentpa, ntCoeffs);
+      n_Delete(&contentpa, ntCoeffs);
+      n_Delete(&contentpb, ntCoeffs);
+      contentpa= tmp;
+      p_Delete(&pb, ntRing);
+      p_Delete(&pa, ntRing);
+
+      /* singclap_gcd destroys its arguments; we hence need copies: */
+      pGcd = singclap_gcd(p_Copy(NUM(fa),ntRing), p_Copy(NUM(fb),ntRing), ntRing);
+      pGcd= p_Mult_nn (pGcd, contentpa, ntRing);
+      n_Delete(&contentpa, ntCoeffs);
+    }
+  }
+  else
+    pGcd = singclap_gcd(pa, pb, cf->extRing);
   /* Note that, over Q, singclap_gcd will remove the denominators in all
      rational coefficients of pa and pb, before starting to compute
      the gcd. Thus, we do not need to ensure that the coefficients of
      pa and pb live in Z; they may well be elements of Q\Z. */
-  poly pGcd = singclap_gcd(pa, pb, cf->extRing);
+
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = pGcd;

libpolys/polys/monomials/p_polys.cc

@@ -2172 +2172 @@
         n_Delete(&h,r->cf->extRing->cf);
       }
-      else
+      /*else
       {
       // special handling for rat. functions.:
@@ -2196 +2196 @@
         }
         /* hzz contains the gcd of all numerators in f*/
-        h=n_Invers(hzz,r->cf->extRing->cf);
+        /*h=n_Invers(hzz,r->cf->extRing->cf);
         n_Delete(&hzz,r->cf->extRing->cf);
         n_Normalize(h,r->cf->extRing->cf);
@@ -2211 +2211 @@
         }
         n_Delete(&h,r->cf->extRing->cf);
-      }
+      }*/
     }
   }