Changeset 780c1b in git for kernel

Timestamp:

Aug 18, 2016, 4:57:26 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f6b8d2ee25edfef0c6b3807304407993d503b025

Parents:

e6fba316e552672ba628ee059740af7822acc66a

Message:

format

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (2 diffs)
• kstd2.cc (modified) (11 diffs)
• kutil.h (modified) (2 diffs)

kernel/GBEngine/kspoly.cc

@@ -175 +175 @@
  *
  ***************************************************************/
- 
+
 int ksReducePolySig(LObject* PR,
                  TObject* PW,
@@ -373 +373 @@
   return ret;
 }
- 
+
 int ksReducePolySigRing(LObject* PR,
                  TObject* PW,

kernel/GBEngine/kstd2.cc

@@ -873 +873 @@
   printf("\nBefore sbaCheckGcdPair ");pWrite(h->p);
   #endif
-  while(sbaCheckGcdPair(h,strat)) 
+  while(sbaCheckGcdPair(h,strat))
   {
     #ifdef ADIDEBUG
@@ -886 +886 @@
   poly beforeredsig;
   beforeredsig = pCopy(h->sig);
-    
+
   if (strat->tl<0) return 1;
   //if (h->GetLmTailRing()==NULL) return 0; // HS: SHOULD NOT BE NEEDED!
@@ -929 +929 @@
       printf("\nBefore sbaCheckGcdPair ");pWrite(h->p);
       #endif
-      while(sbaCheckGcdPair(h,strat)) 
+      while(sbaCheckGcdPair(h,strat))
       {
         #ifdef ADIDEBUG
@@ -1019 +1019 @@
       }
     }
-    
+
     start = ii+1;
 
@@ -2195 +2195 @@
   sba_interreduction_operations = 0;
 #endif
-  
+
   ideal F1 = F0;
   ring sRing, currRingOld;
@@ -2351 +2351 @@
       strat->enterS(strat->L[strat->Ll-(i)], strat->sl+1, strat, strat->tl);
     }
-    strat->Ll = strat->Ll - strat->sbaEnterS; 
+    strat->Ll = strat->Ll - strat->sbaEnterS;
     strat->sbaEnterS = -1;
   }
@@ -2452 +2452 @@
     strat->P = strat->L[strat->Ll];
     strat->Ll--;
-    
+
     if(rField_is_Ring(currRing))
       strat->sbaEnterS = pGetComp(strat->P.sig) - 1;
-    
+
     #ifdef ADIDEBUG
     printf("\n-------------------------\nThis is the current element P\n");
@@ -2604 +2604 @@
       break;
     }
-    
+
     if (errorreported)  break;
 
@@ -2663 +2663 @@
 #if SBA_TAIL_RED
       if(rField_is_Ring(currRing))
-      {  
+      {
         if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
           strat->P.p = redtailSba(&(strat->P),pos-1,strat, withT);
@@ -2688 +2688 @@
       }
       // It may happen that we have lost the sig in redtailsba
-      // It cannot reduce to 0 since here we are doing just tail reduction. 
+      // It cannot reduce to 0 since here we are doing just tail reduction.
       // Best case scenerio: remains the leading term
-      if(rField_is_Ring(currRing) && strat->sigdrop)     
+      if(rField_is_Ring(currRing) && strat->sigdrop)
       {
         #ifdef ADIDEBUG
@@ -3120 +3120 @@
   //idSkipZeroes(strat->Shdl);
   //idPrint(strat->Shdl);
-  
+
   if ((strat->sbaOrder == 1 || strat->sbaOrder == 3) && sRing!=currRingOld)
   {

kernel/GBEngine/kutil.h

@@ -359 +359 @@
   int nrsyzcrit; // counts how many pairs are deleted by SyzCrit
   int nrrewcrit; // counts how many pairs are deleted by FaugereRewCrit
-  int sbaEnterS; // sba over Z strategy: if sigdrop element has _*gen(sbaEnterS+1), then 
+  int sbaEnterS; // sba over Z strategy: if sigdrop element has _*gen(sbaEnterS+1), then
                  // add directly sbaEnterS elements into S
   int blockred;  // counter for blocked reductions in redSig
@@ -719 +719 @@
                  number *coef = NULL,
                  kStrategy strat = NULL);
-                 
+
 int ksReducePolySigRing(LObject* PR,
                  TObject* PW,