Changeset c14846c in git

Timestamp:

Sep 27, 2011, 6:06:45 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

de7521eef6abc64c1312e46961fc93fb053d9bd5

Parents:

c7aad03a695808dc3f5aaaa108a93dbc905bf922

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-27 18:06:45+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:38+01:00

Message:

fix: n?SetMap should return ndCopyMap for equal coeffs

Files:

• Singular/LIB/standard.lib (modified) (1 diff)
• libpolys/coeffs/gnumpfl.cc (modified) (3 diffs)
• libpolys/coeffs/longrat.cc (modified) (1 diff)
• libpolys/coeffs/rintegers.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/algext.cc (modified) (4 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (36 diffs)

Singular/LIB/standard.lib

@@ -892 +892 @@
   if (charstr(basering)[1]=="i") // either integer or integer,q
   {
-    if (find(option(),"prot"))  { "calling std for ideals in ring with ring coefficients"; }
+    if (find(s_opt, option()))  { "calling std for ideals in ring with ring coefficients"; }
     return (std(i));
   }

libpolys/coeffs/gnumpfl.cc

@@ -98 +98 @@
 }
 
+#if 0
 static number ngfCopyMap(number a, const coeffs r1, const coeffs r2)
 {
@@ -110 +111 @@
   return (number)b;
 }
+#endif
 
 /*2
@@ -463 +465 @@
   if (nCoeff_is_long_R(src))
   {
-    return ngfCopyMap;
+    return ndCopyMap; //ngfCopyMap;
   }
   if (nCoeff_is_R(src))

libpolys/coeffs/longrat.cc

@@ -1986 +1986 @@
   if (nCoeff_is_Q(src))
   {
-    return nlCopyMap;
+    return ndCopyMap;
   }
   if (nCoeff_is_Zp(src))

libpolys/coeffs/rintegers.cc

@@ -112 +112 @@
 }
 
+#if 0
 number nrzCopyMap(number a, const coeffs /*src*/, const coeffs dst)
 {
   return nrzCopy(a,dst);
 }
+#endif
 
 int nrzSize(number a, const coeffs)
@@ -283 +285 @@
   if (nCoeff_is_Ring_Z(src) || nCoeff_is_Ring_ModN(src) || nCoeff_is_Ring_PtoM(src))
   {
-    return nrzCopyMap;
+    return ndCopyMap; //nrzCopyMap;
   }
   if (nCoeff_is_Ring_2toM(src))

libpolys/polys/ext_fields/algext.cc

@@ -557 +557 @@
 }
 
+#if 0
 /* assumes that either src = Q(a), dst = Q(a), or
                        src = Z/p(a), dst = Z/p(a)     */
@@ -563 +564 @@
   return naCopy(a, dst);
 }
+#endif
 
 number naCopyExt(number a, const coeffs src, const coeffs dst)
@@ -639 +641 @@
     {
       if (src->type==n_algExt)
-         return naCopyMap;                       /// Q(a)   --> Q(a)
+         return ndCopyMap; // naCopyMap;         /// Q(a)   --> Q(a)
       else
          return naCopyExt;
@@ -652 +654 @@
     {
       if (src->type==n_algExt)
-        return naCopyMap;                        /// Z/p(a) --> Z/p(a)
+        return ndCopyMap; // naCopyMap;          /// Z/p(a) --> Z/p(a)
       else
          return naCopyExt;

libpolys/polys/ext_fields/transext.cc

@@ -97 +97 @@
 
 /// forward declarations
-BOOLEAN  ntGreaterZero(number a, const coeffs cf); 
+BOOLEAN  ntGreaterZero(number a, const coeffs cf);
 BOOLEAN  ntGreater(number a, number b, const coeffs cf);
 BOOLEAN  ntEqual(number a, number b, const coeffs cf);
@@ -182 +182 @@
 {
   ntTest(a); ntTest(b);
-  
+
   /// simple tests
   if (a == b) return TRUE;
   if ((IS0(a)) && (!IS0(b))) return FALSE;
   if ((IS0(b)) && (!IS0(a))) return FALSE;
-  
-  /// cheap test if gcd's have been cancelled in both numbers 
+
+  /// cheap test if gcd's have been cancelled in both numbers
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
@@ -206 +206 @@
     return TRUE;
   }
-  
+
   /* default: the more expensive multiplication test
               a/b = c/d  <==>  a*d = b*c */
@@ -383 +383 @@
   const int P = rVar(A);
   assume( P > 0 );
-  
+
   Print("//   %d parameter    : ", P);
-  
+
   for (int nop=0; nop < P; nop ++)
     Print("%s ", rRingVar(nop, A));
 
   assume( A->minideal == NULL );
-  
+
   PrintS("\n//   minpoly        : 0\n");
 
@@ -412 +412 @@
   if (IS0(a)) return ntCopy(b, cf);
   if (IS0(b)) return ntCopy(a, cf);
-  
+
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
-  
+
   poly g = p_Copy(NUM(fa), ntRing);
   if (!DENIS1(fb)) g = p_Mult_q(g, p_Copy(DEN(fb), ntRing), ntRing);
@@ -421 +421 @@
   if (!DENIS1(fa)) h = p_Mult_q(h, p_Copy(DEN(fa), ntRing), ntRing);
   g = p_Add_q(g, h, ntRing);
-  
+
   if (g == NULL) return NULL;
-  
+
   poly f;
   if      (DENIS1(fa) && DENIS1(fb))  f = NULL;
@@ -431 +431 @@
                                                    p_Copy(DEN(fb), ntRing),
                                                    ntRing);
-  
+
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = g;
@@ -445 +445 @@
   if (IS0(a)) return ntNeg(ntCopy(b, cf), cf);
   if (IS0(b)) return ntCopy(a, cf);
-  
+
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
-  
+
   poly g = p_Copy(NUM(fa), ntRing);
   if (!DENIS1(fb)) g = p_Mult_q(g, p_Copy(DEN(fb), ntRing), ntRing);
@@ -454 +454 @@
   if (!DENIS1(fa)) h = p_Mult_q(h, p_Copy(DEN(fa), ntRing), ntRing);
   g = p_Add_q(g, p_Neg(h, ntRing), ntRing);
-  
+
   if (g == NULL) return NULL;
-  
+
   poly f;
   if      (DENIS1(fa) && DENIS1(fb))  f = NULL;
@@ -464 +464 @@
                                                    p_Copy(DEN(fb), ntRing),
                                                    ntRing);
-  
+
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = g;
@@ -477 +477 @@
   ntTest(a); ntTest(b);
   if (IS0(a) || IS0(b)) return NULL;
-  
+
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
-  
+
   poly g = p_Copy(NUM(fa), ntRing);
   poly h = p_Copy(NUM(fb), ntRing);
   g = p_Mult_q(g, h, ntRing);
-  
+
   if (g == NULL) return NULL;   /* may happen due to zero divisors */
-  
+
   poly f;
   if      (DENIS1(fa) && DENIS1(fb))  f = NULL;
@@ -494 +494 @@
                                                    p_Copy(DEN(fb), ntRing),
                                                    ntRing);
-  
+
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = g;
@@ -508 +508 @@
   if (IS0(a)) return NULL;
   if (IS0(b)) WerrorS(nDivBy0);
-  
+
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
-  
+
   poly g = p_Copy(NUM(fa), ntRing);
   if (!DENIS1(fb)) g = p_Mult_q(g, p_Copy(DEN(fb), ntRing), ntRing);
-  
+
   if (g == NULL) return NULL;   /* may happen due to zero divisors */
-  
+
   poly f = p_Copy(NUM(fb), ntRing);
   if (!DENIS1(fa)) f = p_Mult_q(f, p_Copy(DEN(fa), ntRing), ntRing);
-  
+
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(result) = g;
@@ -539 +539 @@
 {
   ntTest(a);
-  
+
   /* special cases first */
   if (IS0(a))
@@ -549 +549 @@
   else if (exp ==  1) { *b = ntCopy(a, cf); return;}
   else if (exp == -1) { *b = ntInvers(a, cf); return;}
-  
+
   int expAbs = exp; if (expAbs < 0) expAbs = -expAbs;
-  
+
   /* now compute a^expAbs */
   number pow; number t;
@@ -589 +589 @@
     ntDelete(&factor, cf);
   }
-  
+
   /* invert if original exponent was negative */
   if (exp < 0)
@@ -636 +636 @@
   assume(!IS0(f));
   assume(!DENIS1(f));
-  
+
   if (!p_IsConstant(DEN(f), ntRing))
   { /* step (1); see documentation of this procedure above */
@@ -715 +715 @@
     DEN(f) = NULL;
   }
-  
+
   /* Now, due to the above computations, DEN(f) may have become the
      1-polynomial which needs to be represented by NULL: */
@@ -731 +731 @@
   ntTest(a);
   if (IS0(a)) return;
-  
+
   fraction f = (fraction)a;
   if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; return; }
-  
+
   /* check whether NUM(f) = DEN(f), and - if so - replace 'a' by 1 */
   if (p_EqualPolys(NUM(f), DEN(f), ntRing))
@@ -743 +743 @@
     return;
   }
-  
+
   if (COM(f) <= BOUND_COMPLEXITY) return;
   else definiteGcdCancellation(a, cf, TRUE);
@@ -753 +753 @@
 {
   ntTest(a);
-  
+
   fraction f = (fraction)a;
-  
+
   if (!simpleTestsHaveAlreadyBeenPerformed)
   {
     if (IS0(a)) return;
     if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; return; }
-  
+
     /* check whether NUM(f) = DEN(f), and - if so - replace 'a' by 1 */
     if (p_EqualPolys(NUM(f), DEN(f), ntRing))
@@ -770 +770 @@
     }
   }
-  
-#ifdef HAVE_FACTORY  
+
+#ifdef HAVE_FACTORY
   /* singclap_gcd destroys its arguments; we hence need copies: */
   poly pNum = p_Copy(NUM(f), ntRing);
   poly pDen = p_Copy(DEN(f), ntRing);
-  
+
   /* Note that, over Q, singclap_gcd will remove the denominators in all
      rational coefficients of pNum and pDen, before starting to compute
@@ -879 +879 @@
   fraction fb = (fraction)b;
   if ((b==NULL)||(DEN(fb)==NULL)) return ntCopy(a,cf);
-#ifdef HAVE_FACTORY  
+#ifdef HAVE_FACTORY
   fraction fa = (fraction)a;
   /* singclap_gcd destroys its arguments; we hence need copies: */
   poly pa = p_Copy(NUM(fa), ntRing);
   poly pb = p_Copy(DEN(fb), ntRing);
-  
+
   /* Note that, over Q, singclap_gcd will remove the denominators in all
      rational coefficients of pa and pb, before starting to compute
@@ -918 +918 @@
   if (a==NULL) return ntCopy(b,cf);
   if (b==NULL) return ntCopy(a,cf);
-#ifdef HAVE_FACTORY  
+#ifdef HAVE_FACTORY
   fraction fa = (fraction)a;
   fraction fb = (fraction)b;
@@ -924 +924 @@
   poly pa = p_Copy(NUM(fa), ntRing);
   poly pb = p_Copy(NUM(fb), ntRing);
-  
+
   /* Note that, over Q, singclap_gcd will remove the denominators in all
      rational coefficients of pa and pb, before starting to compute
@@ -1095 +1095 @@
   /* dst is expected to be a rational function field */
   assume(getCoeffType(dst) == ID);
-  
+
   int h = 0; /* the height of the extension tower given by dst */
   coeffs bDst = nCoeff_bottom(dst, h); /* the bottom field in the tower dst */
   coeffs bSrc = nCoeff_bottom(src, h); /* the bottom field in the tower src */
-  
+
   /* for the time being, we only provide maps if h = 1 and if b is Q or
      some field Z/pZ: */
@@ -1118 +1118 @@
   if (h != 1) return NULL;
   if ((!nCoeff_is_Zp(bDst)) && (!nCoeff_is_Q(bDst))) return NULL;
-  
+
   /* Let T denote the sequence of transcendental extension variables, i.e.,
      K[t_1, ..., t_s] =: K[T];
      Let moreover, for any such sequence T, T' denote any subsequence of T
      of the form t_1, ..., t_w with w <= s. */
-  
+
   if ((!nCoeff_is_Zp(bSrc)) && (!nCoeff_is_Q(bSrc))) return NULL;
-  
+
   if (nCoeff_is_Q(bSrc) && nCoeff_is_Q(bDst))
   {
@@ -1133 +1133 @@
                  rRingVar(i, dst->extRing)) != 0) return NULL;
       if (src->type==n_transExt)
-        return ntCopyMap;                              /// Q(T')   --> Q(T)
+        return ndCopyMap; //ntCopyMap;          /// Q(T')   --> Q(T)
       else
         return ntCopyAlg;
   }
-  
+
   if (nCoeff_is_Zp(bSrc) && nCoeff_is_Zp(bDst))
   {
@@ -1145 +1145 @@
                  rRingVar(i, dst->extRing)) != 0) return NULL;
       if (src->type==n_transExt)
-        return ntCopyMap;                              /// Z/p(T') --> Z/p(T)
+        return ndCopyMap; //ntCopyMap;         /// Z/p(T') --> Z/p(T)
       else
         return ntCopyAlg;
   }
-  
-  return NULL;                                           /// default
+
+  return NULL;                                 /// default
 }
 
@@ -1163 +1163 @@
 
   assume( infoStruct != NULL );
-  
+
   TransExtInfo *e = (TransExtInfo *)infoStruct;
-  
+
   assume( e->r                != NULL);      // extRing;
   assume( e->r->cf            != NULL);      // extRing->cf;
-  assume( e->r->minideal == NULL ); 
+  assume( e->r->minideal == NULL );
 
   assume( cf != NULL );
@@ -1174 +1174 @@
 
   cf->extRing           = e->r;
-  cf->extRing->ref ++; // increase the ref.counter for the ground poly. ring!  
+  cf->extRing->ref ++; // increase the ref.counter for the ground poly. ring!
 
   /* propagate characteristic up so that it becomes
      directly accessible in cf: */
   cf->ch = cf->extRing->cf->ch;
-  
+
   cf->cfGreaterZero  = ntGreaterZero;
   cf->cfGreater      = ntGreater;
@@ -1215 +1215 @@
   cf->cfIntDiv       = ntDiv;
   cf->cfKillChar     = ntKillChar;
-  
+
 #ifndef HAVE_FACTORY
   PrintS("// Warning: The 'factory' module is not available.\n");
@@ -1221 +1221 @@
   PrintS("//          computed fraction!\n");
 #endif
-  
+
   return FALSE;
 }
@@ -1231 +1231 @@
 
   const ring R = cf->extRing;
-  assume( R != NULL );  
+  assume( R != NULL );
   assume( 0 < iParameter && iParameter <= rVar(R) );
 
   poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
 
-//  return (number) p; 
+//  return (number) p;
 
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
@@ -1247 +1247 @@
 
 
-/// if m == var(i)/1 => return i, 
+/// if m == var(i)/1 => return i,
 int ntIsParam(number m, const coeffs cf)
 {
@@ -1260 +1260 @@
     return 0;
 
-  return p_Var( NUM(f), R ); 
-}
+  return p_Var( NUM(f), R );
+}