Changeset a660bb2 in git

Timestamp:

Jan 22, 2016, 5:40:50 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

01f6271e1cfb6a7db18909a25eefab7cd08cc713

Parents:

b64a5f131f1c498bfaf3b8d81c7a062ed7ef5c7f

Message:

opt maps: use maMapIdeal also for module/matrix/map

Files:

• Singular/ipshell.cc (modified) (6 diffs)
• kernel/maps/find_perm.cc (modified) (1 diff)
• kernel/maps/gen_maps.cc (modified) (3 diffs)

Singular/ipshell.cc

@@ -691 +691 @@
               poly p=id->m[i];
               if ((p!=NULL) && (degs[i]!=0) &&
-              ((unsigned long)deg_monexp > (currRing->bitmask / (unsigned long)degs[i]/2)))
+              ((unsigned long)deg_monexp > (currRing->bitmask / ((unsigned long)degs[i])/2)))
               {
                 overflow=TRUE;
@@ -710 +710 @@
             poly p=(poly)tmpW.data;
             long deg=0;
-            if ((p!=NULL) && (deg=p_Totaldegree(p,src_ring)!=0) &&
-            ((unsigned long)deg_monexp > (currRing->bitmask / (unsigned long)deg/2)))
+            if ((p!=NULL) && ((deg=p_Totaldegree(p,src_ring))!=0) &&
+            ((unsigned long)deg_monexp > (currRing->bitmask / ((unsigned long)deg)/2)))
             {
               overflow=TRUE;
@@ -730 +730 @@
 #endif
       {
-        if (tmpW.rtyp==IDEAL_CMD)
+        if ((tmpW.rtyp==IDEAL_CMD)
+        ||(tmpW.rtyp==MODUL_CMD)
+        ||(tmpW.rtyp==MATRIX_CMD)
+        ||(tmpW.rtyp==MAP_CMD))
         {
-          v->rtyp=IDEAL_CMD;
+          v->rtyp=tmpW.rtyp;
           char *tmp = theMap->preimage;
           theMap->preimage=(char*)1L;
@@ -739 +742 @@
           theMap->preimage=tmp; // map gets its preimage back
         }
-        if (v->data==NULL) /*i.e. not IDEAL_CMD */
+        if (v->data==NULL) /*i.e. not IDEAL_CMD/MODUL_CMD/MATRIX_CMD/MAP */
         {
           if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,src_ring,NULL,NULL,0,nMap))
@@ -1173 +1176 @@
   return iiAssign(p,&tmp);
 }
-BOOLEAN iiBranchTo(leftv r, leftv args)
+BOOLEAN iiBranchTo(leftv, leftv args)
 {
   // <string1...stringN>,<proc>
@@ -6257 +6260 @@
   return FALSE;
 }
-BOOLEAN iiApplyBIGINTMAT(leftv res, leftv a, int op, leftv proc)
+BOOLEAN iiApplyBIGINTMAT(leftv, leftv, int, leftv)
 {
   WerrorS("not implemented");
   return TRUE;
 }
-BOOLEAN iiApplyIDEAL(leftv res, leftv a, int op, leftv proc)
+BOOLEAN iiApplyIDEAL(leftv, leftv, int, leftv)
 {
   WerrorS("not implemented");

kernel/maps/find_perm.cc

@@ -85 +85 @@
     }
   }
+  ideal ii=(ideal)m;
+  ii->rank=((ideal)to_map)->rank;
   omFreeSize(perm,(preimage_r->N+1)*sizeof(int));
   return m;

kernel/maps/gen_maps.cc

@@ -111 +111 @@
     // ----------------------------------------------------------
     // long polys in the image ?: possiblity of many common subexpressions
-    if (nMap==ndCopyMap) /* and !rIsPluralRing(image_r) */
+    if ((nMap==ndCopyMap) /* and !rIsPluralRing(image_r) */
+    && (map_id->nrows==1) /* i.e. only for ideal/map */
+    && (map_id->rank==1))
     {
       int sz=IDELEMS(map_id);
@@ -137 +139 @@
   if (TEST_OPT_PROT) PrintS("map with cache\n");
   int C=((matrix)map_id)->cols();
-  int R=1; //((matrix)map_id)->rows();
+  int R=((matrix)map_id)->rows();
   matrix m=mpNew(R,C);
   int N = preimage_r->N;
@@ -151 +153 @@
   }
   idDelete((ideal *)&cache);
+  ideal ii=(ideal)m;
+  ii->rank=((ideal)map_id)->rank;
   return (ideal)m;
 }