Changeset c481b8 in git

Timestamp:

Feb 24, 2006, 8:25:34 AM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9c6d49554ae6de78686962450083ecb4df5d9cd6

Parents:

c72471e62710d737a6a64bb0569be9c2fc77b65f

Message:

*bricken: lastchange now only active at TGB_RESORT_PAIRS


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

Location:

kernel

Files:

• tgb.cc (modified) (6 diffs)
• tgb_internal.h (modified) (3 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.70 2006-02-24 06:55:04 bricken Exp $ */
+/* $Id: tgb.cc,v 1.71 2006-02-24 07:25:33 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1592 +1592 @@
     return;
   }
+  #ifdef TGB_RESORT_PAIRS
   c->replaced=new bool[c->n];
   c->used_b=FALSE;
-  
+  #endif
   red_object* buf=(red_object*) omalloc(i*sizeof(red_object));
   c->normal_forms+=i;
@@ -1624 +1625 @@
 #endif
   multi_reduction(buf, i, c);
+  #ifdef TGB_RESORT_PAIRS
   if (c->used_b) {
     if (TEST_OPT_PROT)
@@ -1638 +1640 @@
     qsort(c->apairs,c->pair_top+1,sizeof(sorted_pair_node*),tgb_pair_better_gen2);
   }
+  #endif
 #ifdef TGB_DEBUG
  {
@@ -1747 +1750 @@
     id_Delete(&add2, c->r);
   }
+  #ifdef TGB_RESORT_PAIRS
   delete c->replaced;
   c->replaced=NULL;
   c->used_b=FALSE;
+  #endif
   return;
 }
@@ -2778 +2783 @@
     if(pos_in_c>=0)
     {
+      #ifdef TGB_RESORT_PAIRS
       c->used_b=TRUE;
       c->replaced[pos_in_c]=TRUE;
+      #endif
       c->S->m[pos_in_c]=clear_into;
       c->lengths[pos_in_c]=new_length;

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.27 2006-02-24 06:55:05 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.28 2006-02-24 07:25:34 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -120 +120 @@
   BOOLEAN* modifiedS;
   #endif
+  #ifdef TGB_RESORT_PAIRS
   bool* replaced;
- 
+  #endif
   poly_list_node* to_destroy;
   //for F4
@@ -149 +150 @@
   BOOLEAN F4_mode;
   BOOLEAN nc;
+  #ifdef TGB_RESORT_PAIRS
   BOOLEAN used_b;
+  #endif
 };
 class red_object{