Changeset 74161f1 in git

Timestamp:

Mar 1, 2018, 10:51:40 AM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f596991daf3bd5b413c1903c2e045790b58a2c9f

Parents:

7b0641e83ca14a3d6ea643856136e6aee7e1d1e1

Message:

opt: pNormalize/pCleardenom in slimgb

File:

• kernel/GBEngine/tgb.cc (modified) (9 diffs)

kernel/GBEngine/tgb.cc

@@ -60 +60 @@
 {
   assume (r == currRing);
-  if(!rField_is_Zp (r))
+  if(TEST_OPT_INTSTRATEGY)
   {
     p_Cleardenom (p, r);
@@ -983 +983 @@
   if(!(simplified))
   {
-    if(!rField_is_Zp (c->r))
+    if(TEST_OPT_INTSTRATEGY)
     {
       p_Cleardenom (P.p, c->r); //includes p_Content(P.p,c->r );
@@ -989 +989 @@
     else
       pNorm (P.p);
-    pNormalize (P.p);
+    //pNormalize (P.p);
   }
   wlen_type pq = pQuality (h, c, len);
@@ -1505 +1505 @@
   //necessary for correct weighted length
 
-  if(!rField_is_Zp (c->r))
+  if(TEST_OPT_INTSTRATEGY)
   {
     p_Cleardenom (h, c->r); //includes p_Content(h,c->r);
@@ -1511 +1511 @@
   else
     pNorm (h);
-  pNormalize (h);
+  //pNormalize (h);
 
   c->weighted_lengths[i] = pQuality (h, c, c->lengths[i]);
@@ -3774 +3774 @@
         h = S->m[i];
         h = redNFTail (h, strat->sl, strat, lengths[i]);
-        if(!rField_is_Zp (r))
+        if(TEST_OPT_INTSTRATEGY)
         {
           p_Cleardenom (h, r); //includes p_Content(h,r);
@@ -4363 +4363 @@
     if(c->strat->lenSw != NULL)
       c->strat->lenSw[j] = qal;
-    if(!rField_is_Zp (c->r))
+    if(TEST_OPT_INTSTRATEGY)
     {
       p_Cleardenom (clear_into, c->r);  //should be unnecessary
@@ -4872 +4872 @@
     kBucketSimpleContent (r[i].bucket);
     r[i].validate ();
-#ifdef TGB_DEBUG
-#endif
   }
 }
@@ -4912 +4910 @@
     kBucketClear (r[rn].bucket, &red, &red_len);
 
-    if(!rField_is_Zp (c->r))
+    if(TEST_OPT_INTSTRATEGY)
     {
       p_Cleardenom (red, c->r); //should be unnecessary
       //includes p_Content(red, c->r);
     }
-    pNormalize (red);
+    //pNormalize (red);
 
     if((!(erg.fromS)) && (TEST_V_UPTORADICAL))