Changeset 4d5437 in git for kernel/maps/find_perm.cc

Timestamp:

Jan 20, 2016, 6:46:28 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c631c329ed487e0ec9b60bd41077ba19cbf17ad3

Parents:

64b03151c6cf3d29b4a4304bab7a66c2b37b5e2d

Message:

maps for ideal revisited: new: maMapIdeal as general routine

File:

• kernel/maps/find_perm.cc (modified) (5 diffs)

kernel/maps/find_perm.cc

@@ -16 +16 @@
 #include <kernel/ideals.h>
 #include <polys/monomials/ring.h>
-#include <kernel/maps/fast_maps.h>
+#include <kernel/maps/find_perm.h>
 
 static int* find_perm_for_map(const ring preimage_r, const ring image_r, const ideal image)
@@ -22 +22 @@
   int i;
   int *perm=(int *)omAlloc0((preimage_r->N+1)*sizeof(int));
-  //if (IDELEMS(image)>preimage_r->N)
-  //{
-  //  Print("elms:%d, N:%d\n",IDELEMS(image),preimage_r->N);
-  //  iiWriteMatrix((matrix)image,"_",1,image_r,0);
-  //  PrintS("preimage:\n");rWrite(preimage_r);
-  //  PrintS("image:\n");rWrite(image_r);
-  //}
-  for (i=si_min(IDELEMS(image)-1,preimage_r->N); i>=0; i--)
+  for (i=si_min(IDELEMS(image),preimage_r->N)-1; i>=0; i--)
   {
     if ((image->m[i]!=NULL)
@@ -36 +29 @@
     {
       int v=p_IsUnivariate(image->m[i],image_r);
-      if (v==0) /*not univariate */
+      if (v<=0) /*not univariate */
       {
         omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
         return NULL;
       }
-      if (v>0) /* image is univaritate */
+      else if (v>0) /* image is univaritate */
       {
         if (p_GetExp(image->m[i],v,image_r)==1)
@@ -60 +53 @@
     }
   }
+  //Print("elms:%d, N:%d\n",IDELEMS(image),preimage_r->N);
+  //iiWriteMatrix((matrix)image,"_",1,image_r,0);
+  //PrintS("\npreimage:\n");rWrite(preimage_r);
+  //PrintS("image:\n");rWrite(image_r);
+  //PrintS("\nperm:");
+  //for (i=1; i<=preimage_r->N; i++)
+  //{
+  //  Print(" %d",perm[i]);
+  //}
+  //PrintLn();
   return perm;
 }
@@ -74 +77 @@
   for (int i=R*C-1;i>=0;i--)
   {
-    m->m[i]=p_PermPoly(to_map->m[i],perm,preimage_r,image_r, nMap,NULL,0);
-    p_Test(m->m[i],image_r);
+    if (to_map->m[i]!=NULL)
+    {
+      m->m[i]=p_PermPoly(to_map->m[i],perm,preimage_r,image_r, nMap,NULL,0);
+      p_Test(m->m[i],image_r);
+    }
   }
   omFreeSize(perm,(preimage_r->N+1)*sizeof(int));