Changeset 6d7605 in git

Timestamp:

May 12, 2005, 10:12:30 AM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

15772766c4e2d15841019de318a47bafaffe477f

Parents:

85eb7dcc9d3372a9129b72005d9ffad7bd5123ce

Message:

*bricken: better reallocation strategy


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

Location:

kernel

Files:

• tgb.cc (modified) (5 diffs)
• tgb_internal.h (modified) (2 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.19 2005-05-12 07:44:10 bricken Exp $ */
+/* $Id: tgb.cc,v 1.20 2005-05-12 08:12:29 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1204 +1204 @@
 
   assume(h!=NULL);
-#define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->n*sizeof(type))
+#define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->array_lengths*sizeof(type))
 //  BOOLEAN corr=lenS_correct(c->strat);
   BOOLEAN R_found=FALSE;
@@ -1215 +1215 @@
   sorted_pair_node** nodes=(sorted_pair_node**) omalloc(sizeof(sorted_pair_node*)*i);
   int spc=0;
-  ENLARGE(c->T_deg, int);
-  ENLARGE(c->tmp_pair_lm,poly);
-  ENLARGE(c->tmp_spn,sorted_pair_node*);
-  ENLARGE(c->rep,int);
-  ENLARGE(c->short_Exps,long);
-  ENLARGE(c->lengths,int);
-  ENLARGE(c->states, char*);
-  ENLARGE(c->gcd_of_terms,poly);
-  ENLARGE(c->S->m,poly);
+  if(c->n>c->array_lengths){
+    c->array_lengths=c->array_lengths*2;
+    assume(c->array_lengths>=c->n);
+    ENLARGE(c->T_deg, int);
+    ENLARGE(c->tmp_pair_lm,poly);
+    ENLARGE(c->tmp_spn,sorted_pair_node*);
+    ENLARGE(c->rep,int);
+    ENLARGE(c->short_Exps,long);
+    ENLARGE(c->lengths,int);
+    ENLARGE(c->states, char*);
+    ENLARGE(c->gcd_of_terms,poly);
+    ENLARGE(c->S->m,poly);
+  }
   if (c->T_deg_full)
     ENLARGE(c->T_deg_full,int);
@@ -3077 +3081 @@
 
   int n=I->idelems();
+  c->array_lengths=n;
+
   if (TEST_OPT_PROT)
     for (i=0;i<n;i++){
@@ -3113 +3119 @@
   c->strat->sl = -1;
   i=n;
-  i=1;
+  i=1;//some strange bug else
   /* initS(c->S,NULL,c->strat); */
 /* intS start: */

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.7 2005-05-11 14:58:35 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.8 2005-05-12 08:12:30 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -113 +113 @@
   unsigned int reduction_steps;
   int n;
+  //! array_lengths should be greater equal n;
+  int array_lengths; 
   int normal_forms;
   int current_degree;