Changeset a660bb2 in git for kernel

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

01f6271e1cfb6a7db18909a25eefab7cd08cc713

Parents:

b64a5f131f1c498bfaf3b8d81c7a062ed7ef5c7f

Message:

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

Location:

kernel/maps

Files:

• find_perm.cc (modified) (1 diff)
• gen_maps.cc (modified) (3 diffs)

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;
 }