Changeset 0723d5 in git for libpolys/polys/monomials/p_polys.cc

Timestamp:

Feb 21, 2013, 11:03:42 AM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

507427e9e0bf212d166ab8f3bb970f562784a172

Parents:

644b311072b1277f612b8e3d8ad80e23a56d5ec087343b4d7f38df9831596b5fcc7ded4fcff5f407

Message:

Merge pull request #291 from mmklee/imap

Imap

File:

• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)

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 ((par_perm == NULL) && (rPar(dst) != 0 && rVar (srcExtRing) > 0))
+  {
+    int* perm;
+    perm=(int *)omAlloc0((rVar(srcExtRing)+1)*sizeof(int));
+    perm[0]= 0;
+    for(int i=si_min(rVar(srcExtRing),rPar(dst));i>0;i--)
+      perm[i]=-i;
+    qq = p_PermPoly(zz, perm, srcExtRing, dst, nMap, NULL, rVar(srcExtRing)-1);
+    omFreeSize ((ADDRESS)perm, (rVar(srcExtRing)+1)*sizeof(int));
+  }
+  else
+    qq = p_PermPoly(zz, par_perm-1, srcExtRing, dst, nMap, NULL, rVar (srcExtRing)-1);
+
+  assume (p_Test (qq, dst));
+
 //       poly p_PermPoly (poly p, int * perm, const ring oldRing, const ring dst, nMapFunc nMap, int *par_perm, int OldPar)
 
@@ -3629 +3645 @@
       qq = p_Init(dst);
       assume( nMap != NULL );
+
       number n = nMap(p_GetCoeff(p, oldRing), oldRing->cf, dst->cf);
+
+      assume (n_Test (n,dst->cf));
 
       if ( nCoeff_is_algExt(dst->cf) )
@@ -3749 +3768 @@
         }
       }
-      if ( mapped_to_par && nCoeff_is_algExt(dst->cf) )
+      if ( mapped_to_par && qq!= NULL && nCoeff_is_algExt(dst->cf) )
       {
         number n = p_GetCoeff(qq, dst);