Changeset a934fb3 in git

Timestamp:

Mar 11, 2016, 3:36:57 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

23812d3dd3a69ed0874b01c271d1908acd7f0f05

Parents:

052df146007b4badfc821b69808a085b155cc991

Message:

fix: tr. #753 (non-commutative imap)

Files:

• Singular/maps_ip.cc (modified) (4 diffs)
• Tst/Short/bug_tr753.res.gz.uu (added)
• Tst/Short/bug_tr753.stat (added)
• Tst/Short/bug_tr753.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

Singular/maps_ip.cc

@@ -25 +25 @@
 // #include <kernel/longalg.h>
 
+#include <misc/options.h>
 #include <kernel/GBEngine/kstd1.h>
 #include <kernel/maps/gen_maps.h>
@@ -49 +50 @@
                      int *perm, int *par_perm, int P, nMapFunc nMap)
 {
+  BOOLEAN use_mult=FALSE;
+#ifdef HAVE_PLURAL
+  if ((what==IMAP_CMD)
+  && rIsPluralRing(currRing)
+  && rIsPluralRing(preimage_r))
+  {
+    assume(perm!=NULL);
+    int i=1;
+    while((i<currRing->N)&&(perm[i]==0)) i++;
+    if (i<currRing->N)
+    {
+      int prev_nonnull=i;
+      i++;
+      for(;i<=currRing->N;i++)
+      {
+        if (perm[prev_nonnull] > perm[i])
+        {
+          if (TEST_V_ALLWARN)
+          {
+            Warn("imap not usable for permuting variables, use map (%s <-> %s)",currRing->names[prev_nonnull-1],currRing->names[i-1]);
+          }
+          use_mult=TRUE;
+          break;
+        }
+        else
+          prev_nonnull=i;
+      }
+    }
+  }
+#endif
   int i;
   int N = preimage_r->N;
@@ -103 +134 @@
       else
         if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
-        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
+        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P,use_mult);
       else /*if (what==MAP_CMD)*/
       {
@@ -144 +175 @@
         {
           m->m[i]=p_PermPoly(((ideal)data)->m[i],perm,preimage_r,currRing,
-                          nMap,par_perm,P);
+                          nMap,par_perm,P,use_mult);
           pTest(m->m[i]);
         }

Tst/Short/ok_s.lst

@@ -57 +57 @@
 bug_tr739
 bug_tr745
+bug_tr753
 bug_genus_etc
 conv_bi

libpolys/polys/monomials/p_polys.cc

@@ -3925 +3925 @@
 */
 poly p_PermPoly (poly p, const int * perm, const ring oldRing, const ring dst,
-       nMapFunc nMap, const int *par_perm, int OldPar)
+       nMapFunc nMap, const int *par_perm, int OldPar, BOOLEAN use_mult)
 {
 #if 0
@@ -3938 +3938 @@
   assume(dst != NULL);
   assume(dst->cf != NULL);
+  #ifdef HAVE_PLURAL
+  poly tmp_mm=p_One(dst);
+  #endif
   while (p != NULL)
   {
@@ -3983 +3986 @@
             p_SetExp(qq, i, e, dst);
           else if (perm[i]>0)
+          {
+            #ifdef HAVE_PLURAL
+            if(use_mult)
+            {
+              p_SetExp(tmp_mm,perm[i],e,dst);
+              p_Setm(tmp_mm,dst);
+              qq=p_Mult_mm(qq,tmp_mm,dst);
+              p_SetExp(tmp_mm,perm[i],0,dst);
+
+            }
+            else
+            #endif
             p_AddExp(qq,perm[i], e/*p_GetExp( p,i,oldRing)*/, dst);
+          }
           else if (perm[i]<0)
           {
@@ -4124 +4140 @@
   PrintS("result: "); p_Write(result,dst,dst);
 #endif
+  #ifdef HAVE_PLURAL
+  p_LmDelete(&tmp_mm,dst);
+  #endif
   return result;
 }

libpolys/polys/monomials/p_polys.h

@@ -1915 +1915 @@
 
 poly p_PermPoly (poly p, const int * perm,const ring OldRing, const ring dst,
-                     nMapFunc nMap, const int *par_perm=NULL, int OldPar=0);
+                     nMapFunc nMap, const int *par_perm=NULL, int OldPar=0,
+                     BOOLEAN use_mult=FALSE);
 
 /*----------------------------------------------------*/