Changeset 276224e in git

Timestamp:

Jan 21, 2016, 3:42:55 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

832330cabd87add905ae9ab4b43ee3df820ab6d6

Parents:

0033756c7f43b52dd1b86cb72c77e877b5c384dc

Message:

opt. maps: find more permutations

File:

• kernel/maps/find_perm.cc (modified) (1 diff)

kernel/maps/find_perm.cc

@@ -24 +24 @@
   for (i=si_min(IDELEMS(image),preimage_r->N)-1; i>=0; i--)
   {
-    if ((image->m[i]!=NULL)
-    && (pNext(image->m[i])==NULL)
-    && (n_IsOne(pGetCoeff(image->m[i]),image_r)))
+    if (image->m[i]!=NULL)
     {
-      int v=p_IsUnivariate(image->m[i],image_r);
-      if (v<=0) /*not univariate */
+      if((pNext(image->m[i])==NULL)
+      && (n_IsOne(pGetCoeff(image->m[i]),image_r)))
+      {
+        int v=p_IsUnivariate(image->m[i],image_r);
+        if (v<=0) /*not univariate */
+        {
+          omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
+          return NULL;
+        }
+        else if (v>0) /* image is univaritate */
+        {
+          if (p_GetExp(image->m[i],v,image_r)==1)
+          {
+            perm[i+1]=v; /* and of exp 1 */
+          }
+          else
+          {
+            omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
+            return NULL;
+          }
+        }
+      }
+      else /* image is not a monomial */
       {
         omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
         return NULL;
       }
-      else if (v>0) /* image is univaritate */
-      {
-        if (p_GetExp(image->m[i],v,image_r)==1)
-        {
-          perm[i+1]=v; /* and of exp 1 */
-        }
-        else
-        {
-          omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
-          return NULL;
-        }
-      }
-    }
-    else /* image is not a monomial */
-    {
-      omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
-      return NULL;
     }
   }