Changeset 01eca5 in git

Timestamp:

Apr 26, 2007, 7:40:59 AM (16 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

cb637fad8051814719a0ea36ed4b65a20f1114cc

Parents:

91a62a9b0d894256f34fe96f2db36abd82719469

Message:

*bricken: some cleanup


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

File:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.151 2007-04-03 15:16:39 Singular Exp $ */
+/* $Id: tgb.cc,v 1.152 2007-04-26 05:40:59 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -2392 +2392 @@
   #ifdef USE_NORO
   //Print("module rank%d\n",c->S->rank);
-  const BOOLEAN use_noro=((!(c->nc))&&(c->S->rank<=1)&&(rField_is_Zp(c->r)));
+  const BOOLEAN use_noro=((!(c->nc))&&(c->S->rank<=1)&&(rField_is_Zp(c->r)) &&(!(c->eliminationProblem))&&(npPrimeM<=32003));
   #else
   const BOOLEAN use_noro=FALSE;
@@ -2786 +2786 @@
         si->expected_length=pQuality(p,this,pLength(p));
         si->deg=pTotaldegree_full(p);
-        if (!rField_is_Zp(r)){
+        /*if (!rField_is_Zp(r)){
+          pContent(p);
           pCleardenom(p);
-        }
+        }*/
         si->lcm_of_lm=p;
 
@@ -3340 +3341 @@
           if (!rField_is_Zp(r))
           {
+            pCleardenom(h);
             pContent(h);
-            pCleardenom(h);//should be unnecessary
+            
           } else pNorm(h);
           //TODO:GCD of TERMS
@@ -3847 +3849 @@
     if (!rField_is_Zp(c->r))
     {
+      pCleardenom(clear_into);//should be unnecessary
       pContent(clear_into);
-      pCleardenom(clear_into);//should be unnecessary
+      
     }
     else
@@ -4331 +4334 @@
     if (!rField_is_Zp(c->r))
     {
+      pCleardenom(red);//should be unnecessary
       pContent(red);
-      pCleardenom(red);//should be unnecessary
+      
 
     }