Changeset b8490e7 in git

Timestamp:

Jan 20, 2002, 11:01:50 AM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')

Children:

4b1d39db44978414343ed05c49e33ba58c20ffb4

Parents:

ce7a6ade0f7e5c23e21120e313e90d7bb0f00561

Message:

*hannes: handle simple orderings -> no sorting


git-svn-id: file:///usr/local/Singular/svn/trunk@5772 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• fast_maps.cc (modified) (5 diffs)
• fast_maps.h (modified) (2 diffs)
• ring.cc (modified) (2 diffs)
• ring.h (modified) (2 diffs)

Singular/fast_maps.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 02/01
- *  Version: $Id: fast_maps.cc,v 1.26 2002-01-19 20:55:17 obachman Exp $
+ *  Version: $Id: fast_maps.cc,v 1.27 2002-01-20 10:01:48 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -275 +275 @@
 void maMap_CreateRings(ideal map_id, ring map_r, 
                        ideal image_id, ring image_r, 
-                       ring &src_r, ring &dest_r)
+                       ring &src_r, ring &dest_r, BOOLEAN &simple)
 {
 #if HAVE_SRC_R > 0
@@ -296 +296 @@
   else if (maxExp > (Exponent_t) image_r->bitmask) 
     maxExp = (Exponent_t) image_r->bitmask;
-  dest_r = rModifyRing_Simple(image_r, TRUE, TRUE, maxExp);
+  dest_r = rModifyRing_Simple(image_r, TRUE, TRUE, maxExp,  simple);
 #else
   dest_r = image_r;
@@ -349 +349 @@
   ideal dest_id, res_id;
   int length = 0;
+  BOOLEAN no_sort;
 
   // construct rings we work in: 
   // src_r: Wp with Weights set to length of poly in image_id
   // dest_r: Simple ring without degree ordering and short exponents
-  maMap_CreateRings(map_id, map_r, image_id, image_r, src_r, dest_r);
+  maMap_CreateRings(map_id, map_r, image_id, image_r, src_r, dest_r, no_sort);
   
   // construct dest_id
@@ -394 +395 @@
   if (dest_r != image_r)
   {
-    res_image_id = idrShallowCopyR(res_dest_id, dest_r, image_r);
+    if (no_sort)
+      res_image_id = idrShallowCopyR_NoSort(res_dest_id, dest_r, image_r);
+    else  
+      res_image_id = idrShallowCopyR(res_dest_id, dest_r, image_r);
     id_ShallowDelete(&res_dest_id, dest_r);
   }

Singular/fast_maps.h

@@ -8 +8 @@
  *           bricken (Michael Brickenstein) 
  *  Created: 01/02
- *  Version: $Id: fast_maps.h,v 1.15 2002-01-19 20:04:09 bricken Exp $
+ *  Version: $Id: fast_maps.h,v 1.16 2002-01-20 10:01:48 Singular Exp $
  *******************************************************************/
 
@@ -95 +95 @@
 void maMap_CreateRings(ideal map_id, ring map_r, 
                        ideal image_id, ring image_r, 
-                       ring &src_r, ring &dest_r);
+                       ring &src_r, ring &dest_r, BOOLEAN &no_sort);
 
 // collects tthe results into an ideal and destroys maideal

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.178 2002-01-19 20:04:31 obachman Exp $ */
+/* $Id: ring.cc,v 1.179 2002-01-20 10:01:48 Singular Exp $ */
 
 /*
@@ -2657 +2657 @@
 
 // construct lp ring
-ring rModifyRing_Simple(ring r, BOOLEAN ommit_degree, BOOLEAN ommit_comp, unsigned long exp_limit)
-{
+ring rModifyRing_Simple(ring r, BOOLEAN ommit_degree, BOOLEAN ommit_comp, unsigned long exp_limit, BOOLEAN &simple)
+{
+  simple=TRUE;
   if (!rHasSimpleOrder(r))
+  {
     WarnS("Hannes: you still need to implement this");
+    // simple=FALSE; // sorting needed
+  }  
   return rModifyRing(r, ommit_degree, ommit_comp, exp_limit);
 }

Singular/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.70 2002-01-19 17:11:43 obachman Exp $ */
+/* $Id: ring.h,v 1.71 2002-01-20 10:01:50 Singular Exp $ */
 
 /* includes */
@@ -268 +268 @@
 void rKillModified_Wp_Ring(ring r);
 
-ring rModifyRing_Simple(ring r, BOOLEAN omit_degree, BOOLEAN omit_comp, unsigned long exp_limit);
+ring rModifyRing_Simple(ring r, BOOLEAN omit_degree, BOOLEAN omit_comp, unsigned long exp_limit, BOOLEAN &simple);
 void rKillModifiedRing_Simple(ring r);