Changeset 279976 in git for kernel/GBEngine

Timestamp:

Dec 2, 2014, 4:06:31 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

a62aaf77249f98fad26ba201fd0f646f392e5fcc

Parents:

f4d443ff78003857bf776ab6de03f795ab39102c

Message:

revisiting kstd1::mora: cleanup

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (1 diff)
• kutil.cc (modified) (4 diffs)

kernel/GBEngine/kstd1.cc

@@ -1441 +1441 @@
   }
 
-    #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing))
-      strat->red = redRiloc;
-  #endif
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
+    strat->red = redRiloc;
+#endif
 
   /*reads the ecartWeights used for Graebes method from the

kernel/GBEngine/kutil.cc

@@ -1193 +1193 @@
   // basic product criterion
   pLcm(p,strat->S[i],Lp.lcm);
+  pSetm(Lp.lcm);
 
   #if ADIDEBUG
@@ -1198 +1199 @@
   #endif
 
-  pSetm(Lp.lcm);
   assume(!strat->sugarCrit);
   if (pHasNotCF(p,strat->S[i]) && n_IsUnit(pGetCoeff(p),currRing->cf)
@@ -1252 +1252 @@
         break;
       }
-      else
-      if (compare == -1)
+      else if (compare == -1)
       {
 #ifdef KDEBUG
@@ -5574 +5573 @@
         else
         {
-          if (Ln.p!=NULL) Ln.p=pAdd(Ln.p,mm);
-          else if (Ln.t_p!=NULL)  Ln.t_p=p_Add_q(Ln.t_p,mm,strat->tailRing);
+          if ((Ln.t_p!=NULL)&&(Ln.p==NULL))
+            Ln.GetP();
+          if (Ln.p!=NULL)
+          {
+            Ln.p=pAdd(Ln.p,mm);
+            if (Ln.t_p!=NULL)
+            {
+              pNext(Ln.t_p)=NULL;
+              p_LmDelete(Ln.t_p,strat->tailRing);
+            }
+          }
         }
       }