Changeset 85eb7d in git

Timestamp:

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

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

6d760524ba873f5c3e70a9354a4a6b6996c0f442

Parents:

513490ba100f81af3b2ca50d41b50c4ad79862f6

Message:

*bricken: cleaned


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

File:

• kernel/tgb.cc (modified) (5 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.18 2005-05-12 07:01:21 bricken Exp $ */
+/* $Id: tgb.cc,v 1.19 2005-05-12 07:44:10 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1023 +1023 @@
   c->tmp_spn=(sorted_pair_node**) omrealloc(c->tmp_spn,c->n*sizeof(sorted_pair_node*));
   c->tmp_spn[i]=(sorted_pair_node*) omalloc(sizeof(sorted_pair_node));
-#define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->n*sizeof(int))
+
   hp=omrealloc(c->rep, c->n *sizeof(int));
   if (hp!=NULL){
@@ -1204 +1204 @@
 
   assume(h!=NULL);
+#define ENLARGE(pointer, type) pointer=(type*) omrealloc(pointer, c->n*sizeof(type))
 //  BOOLEAN corr=lenS_correct(c->strat);
   BOOLEAN R_found=FALSE;
@@ -1214 +1215 @@
   sorted_pair_node** nodes=(sorted_pair_node**) omalloc(sizeof(sorted_pair_node*)*i);
   int spc=0;
-  c->T_deg=(int*) omrealloc(c->T_deg,c->n*sizeof(int));
+  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);
   c->T_deg[i]=pTotaldegree(h);
   if(c->T_deg_full){
-    c->T_deg_full=(int*) omrealloc(c->T_deg_full,c->n*sizeof(int));
     c->T_deg_full[i]=pTotaldegree_full(h);
   }
-  c->tmp_pair_lm=(poly*) omrealloc(c->tmp_pair_lm,c->n*sizeof(poly));
+  
+
   c->tmp_pair_lm[i]=pOne_Special(c->r);
-  c->tmp_spn=(sorted_pair_node**) omrealloc(c->tmp_spn,c->n*sizeof(sorted_pair_node*));
+
+
   c->tmp_spn[i]=(sorted_pair_node*) omalloc(sizeof(sorted_pair_node));
 
-  hp=omrealloc(c->rep, c->n *sizeof(int));
-  if (hp!=NULL){
-    c->rep=(int*) hp;
-  } else {
-    exit(1);
-  }
-  c->short_Exps=(long *) omrealloc(c->short_Exps ,c->n*sizeof(long));
-
-  hp=omrealloc(c->lengths, c->n *sizeof(int));
-  if (hp!=NULL){
-    c->lengths=(int*) hp;
-  } else {
-    exit(1);
-  }
+
   c->lengths[i]=pLength(h);
-  hp=omrealloc(c->states, c->n * sizeof(char*));
  
-    c->states=(char**) hp;
-  c->gcd_of_terms=(poly*) omrealloc(c->gcd_of_terms, c->n *sizeof(poly));
   c->gcd_of_terms[i]=gcd_of_terms(h,c->r);
   c->rep[i]=i;
@@ -1250 +1246 @@
   else
     c->states[i]=NULL;
-  hp=omrealloc(c->S->m,c->n*sizeof(poly));
-  if (hp!=NULL){
-    c->S->m=(poly*) hp;
-  } else {
-    exit(1);
-  }
+  
+  
   c->S->m[i]=h;
   c->short_Exps[i]=p_GetShortExpVector(h,c->r);
+#undef ENLARGE
   for (j=0;j<i;j++){