Changeset 628f663 in git for libpolys

Timestamp:

Feb 19, 2013, 6:27:58 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

87343b4d7f38df9831596b5fcc7ded4fcff5f407

Parents:

644b311072b1277f612b8e3d8ad80e23a56d5ec0

git-author:

Martin Lee <martinlee84@web.de>2013-02-19 18:27:58+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-02-20 22:34:19+01:00

Message:

chg: towards correct imap

Location:

libpolys/polys

Files:

• ext_fields/algext.cc (modified) (3 diffs)
• monomials/p_polys.cc (modified) (4 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -921 +921 @@
 #endif
 
-number naCopyExt(number a, const coeffs src, const coeffs)
+number naCopyExt(number a, const coeffs src, const coeffs dst)
 {
   fraction fa=(fraction)a;
-  return (number)p_Copy(NUM(fa),src->extRing);
+  poly p = p_Copy(NUM(fa),src->extRing);
+  assume( rSamePolyRep(src->extRing, dst->extRing) );
+  definiteReduce(p, dst->extRing->qideal->m[0], dst);
+  return (number)p;
 }
 
@@ -995 +998 @@
   if (nCoeff_is_Q(bSrc) && nCoeff_is_Q(bDst))
   {
-    if (strcmp(rRingVar(0, src->extRing),
-               rRingVar(0, dst->extRing)) == 0)
+    if (rSamePolyRep(src->extRing, dst->extRing) && (strcmp(rRingVar(0, src->extRing), rRingVar(0, dst->extRing)) == 0))
     {
       if (src->type==n_algExt)
@@ -1009 +1011 @@
   if (nCoeff_is_Zp(bSrc) && nCoeff_is_Zp(bDst))
   {
-    if (strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0)
+    if (rSamePolyRep(src->extRing, dst->extRing) && (strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0))
     {
       if (src->type==n_algExt)

libpolys/polys/monomials/p_polys.cc

@@ -3536 +3536 @@
   rWrite(dst);
 
-  Print("\nOldPar: %d\n", OldPar);
+  /*Print("\nOldPar: %d\n", OldPar);
   for( int i = 1; i <= OldPar; i++ )
   {
     Print("par(%d) -> par/var (%d)\n", i, par_perm[i-1]);
-  }
+  }*/
 #endif
   if( z == NULL )
@@ -3593 +3593 @@
   assume( nMap != NULL );
 
-  poly qq = p_PermPoly(zz, par_perm - 1, srcExtRing, dst, nMap, NULL, rVar(srcExtRing) );
+  poly qq;
+  if (rPar (srcExtRing) || (!rPar (srcExtRing) && !rPar ()))
+  {
+    assume (par_perm != NULL);
+    qq = p_PermPoly(zz, par_perm-1, srcExtRing, dst, nMap, NULL, rVar(srcExtRing) );
+  }
+  else
+    qq = p_PermPoly(zz, par_perm, srcExtRing, dst, nMap, NULL, rVar(srcExtRing) );
 //       poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst, nMapFunc nMap, int *par_perm, int OldPar)
 
@@ -3629 +3636 @@
       qq = p_Init(dst);
       assume( nMap != NULL );
+      //PrintS("p in other branch: ");
+      //p_Write (p, oldRing); PrintLn();
+
       number n = nMap(p_GetCoeff(p, oldRing), oldRing->cf, dst->cf);
 
+      assume (n_Test (n,dst->cf));
+
       if ( nCoeff_is_algExt(dst->cf) )
+      {
+
+      //PrintS("n: ");
+      //p_Write ((poly) n, dst->cf->extRing); PrintLn();
         n_Normalize(n, dst->cf);
+      //PrintS("n nach normalize: ");
+      //p_Write ((poly)n, dst->cf->extRing); PrintLn();
+      }
 
       p_GetCoeff(qq, dst) = n;// Note: n can be a ZERO!!!
@@ -3649 +3668 @@
 
       if ( nCoeff_is_algExt(dst->cf) )
+      {
+      //PrintS("p: ");
+      //p_Write (p, oldRing); PrintLn();
+      //PrintS("aq for normalize: ");
+      //p_Write (aq, dst);PrintLn();
         p_Normalize(aq,dst);
+      //PrintS("aq after normalize: ");
+      //p_Write (aq, dst);PrintLn();
+      }
+
 
       if (aq == NULL)