Changeset 4c80eb in git for kernel/tgb.cc

Timestamp:

Feb 20, 2006, 2:14:00 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

abfc3bece5f42e6e4907d3d0719efc6021cb6a93

Parents:

839ec19c4ad0dc6a59849ee222f43327491e54d6

Message:

*bricken: some optimizations


git-svn-id: file:///usr/local/Singular/svn/trunk@8961 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.60 2006-02-20 12:40:13 bricken Exp $ */
+/* $Id: tgb.cc,v 1.61 2006-02-20 13:13:59 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -713 +713 @@
 
 
-static int add_to_reductors(slimgb_alg* c, poly h, int len){
+static int add_to_reductors(slimgb_alg* c, poly h, int len, BOOLEAN simplified){
   //inDebug(h);
   assume(lenS_correct(c->strat));
@@ -727 +727 @@
   P.p=h; /*p_Copy(h,c->r);*/
   P.FDeg=pFDeg(P.p,c->r);
- 
-  if (!rField_is_Zp(c->r)){ 
-    pCleardenom(P.p);
-    pContent(P.p); //is a duplicate call, but belongs here
-    
-  }
-  else                     
-    pNorm(P.p);
-  pNormalize(P.p);
+  if (!simplified){
+      if (!rField_is_Zp(c->r)){ 
+        pCleardenom(P.p);
+        pContent(P.p); //is a duplicate call, but belongs here
+        
+      }
+      else                     
+        pNorm(P.p);
+    pNormalize(P.p);
+  }
   wlen_type pq=pQuality(h,c,len);
   i=simple_posInS(c->strat,h,len,pq);
@@ -1079 +1080 @@
   else                     
     pNorm(h);
+  pNormalize(h);
+  
   c->weighted_lengths[i]=pQuality(h, c, c->lengths[i]);
   c->gcd_of_terms[i]=got;
@@ -1279 +1282 @@
   nodes=NULL;
 
-  add_to_reductors(c, h, c->lengths[c->n-1]);
+  add_to_reductors(c, h, c->lengths[c->n-1], TRUE);
   //i=posInS(c->strat,c->strat->sl,h,0 ecart);
   if (!(c->nc)){