Changeset c6a876 in git

Timestamp:

Aug 12, 2016, 3:59:29 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

e009effbfaa9d4f42b1ec6659250bc3481449fb5

Parents:

0c669f797f1425a0c889419c6dcb158f6278afa1

Message:

chg: format, minor opt.

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (4 diffs)
• kutil.cc (modified) (14 diffs)

kernel/GBEngine/kstd1.cc

@@ -1765 +1765 @@
       printf("\nBefore Ll = %i\n", strat->Ll);
       #endif
-      if(!rField_is_Ring(strat->tailRing) || rHasLocalOrMixedOrdering(currRing))
-        red_result = strat->red(&strat->P,strat);
+      red_result = strat->red(&strat->P,strat);
       #ifdef ADIDEBUG
       printf("\nThis is P nach red:\n");p_Write(strat->P.p,strat->tailRing);p_Write(strat->P.p1,strat->tailRing);p_Write(strat->P.p2,strat->tailRing);
@@ -1841 +1840 @@
       if (strat->P.lcm!=NULL)
       {
-        if (rField_is_Ring(currRing)) 
+        if (rField_is_Ring(currRing))
           pLmDelete(strat->P.lcm);
         else
@@ -2561 +2560 @@
     //This is how we set the SBA algorithm;
     int totalsbaruns = 1,blockedreductions = 20,blockred = 0,loops = 0;
-    while(sigdrop && (loops < totalsbaruns || totalsbaruns == -1) 
+    while(sigdrop && (loops < totalsbaruns || totalsbaruns == -1)
                   && (blockred <= blockedreductions))
     {
@@ -2679 +2678 @@
             r=sba(r,Q,*w,hilb,strat);
           else
-          { 
+          {
             r=sba(r,Q,NULL,hilb,strat);
           }

kernel/GBEngine/kutil.cc

@@ -13 +13 @@
 
 //#define ADIDEBUG 1
-//All vs Just strategy over rings: 
-// 1 - Just 
+//All vs Just strategy over rings:
+// 1 - Just
 // 0 - All
 #define ALL_VS_JUST 0
@@ -582 +582 @@
         {
           pDelete(&p);
-          p = NULL;
         }
         break;
@@ -1769 +1768 @@
 
   pNext(gcd) = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(si), m2, strat->tailRing), strat->tailRing);
-  
+
 #ifdef KDEBUG
   if (TEST_OPT_DEBUG)
@@ -1857 +1856 @@
     h.p = pNeg(h.p);
   }
-  
+
     if(rField_is_Ring(currRing) &&  pLtCmp(h.sig,sig) == -1)
     {
@@ -2768 +2767 @@
   pWrite(m2);
 #endif
-  
+
   // get multiplied signatures for testing
   pSigMult = pp_Mult_mm(pSigMult,m1,currRing);
@@ -2875 +2874 @@
     Lp.sevSig = p_GetShortExpVector(Lp.sig,currRing);
   }
-  
-  #if 0  
+
+  #if 0
   if(sigCmp==0)
   {
@@ -4831 +4830 @@
           return;
         }
-        
+
       }
       #else
@@ -5227 +5226 @@
     int o = p_Deg(p,currRing);
     int op = p_Deg(set[mon],currRing);
-    
+
     if ((op < o)
     || ((op == o) && (pLtCmp(set[mon],p) == -1)))
@@ -5257 +5256 @@
     int o = p_Deg(p,currRing);
     int op = p_Deg(set[length],currRing);
-    
+
     if ((op < o)
     || ((op == o) && (pLtCmp(set[length],p) == -1)))
@@ -7138 +7137 @@
 #endif
     if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing)
-    && (!rField_is_Ring(currRing) || 
+    && (!rField_is_Ring(currRing) ||
     (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing) && pLtCmp(sig,strat->syz[k]) == 1)))
     {
@@ -7195 +7194 @@
 #endif
       if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing)
-      && (!rField_is_Ring(currRing) || 
+      && (!rField_is_Ring(currRing) ||
       (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing) && pLtCmp(sig,strat->syz[k]) == 1)))
       {
@@ -9615 +9614 @@
                               strat->L[cc].sig, ~strat->L[cc].sevSig, currRing)
                               #ifdef HAVE_RINGS
-                              &&((!rField_is_Ring(currRing)) 
+                              &&((!rField_is_Ring(currRing))
                               || (n_DivBy(pGetCoeff(strat->L[cc].sig),pGetCoeff(strat->syz[atT]),currRing) && (pLtCmp(strat->L[cc].sig,strat->syz[atT])==1)))
                               #endif
@@ -11071 +11070 @@
   if(deleted)
     strat->initEcart(h);
-  
+
 }
 
@@ -11887 +11886 @@
   // clean h.p, get poly from t_p
   pNext(h.p)=NULL;
-  pDelete(&h.p);
+  pLmDelete(&h.p);
   p = prMoveR(h.t_p, /* source ring: */ strat->tailRing,
                      /* dest. ring: */ currRing);