Changeset 045cbe in git for kernel

Timestamp:

May 17, 2016, 3:13:45 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f8fb93d1bc922d1e97207d1d5b347fe1db1eedcf

Parents:

33a3e5b152a664e98e61d5eb3db725d8b4fc1756

Message:

doc: index "factorization" for primefactors

File:

• kernel/GBEngine/kstd2.cc (modified) (2 diffs)

kernel/GBEngine/kstd2.cc

@@ -1693 +1693 @@
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG){PrintS("new s:");strat->P.wrp();PrintLn();}
+#if MYTEST
+      PrintS("New (reduced) S: "); p_DebugPrint(strat->P.p, currRing); PrintLn();
+#endif /* MYTEST */
 #endif /* KDEBUG */
 
@@ -1746 +1749 @@
 #endif
       }
-    }
-    if (strat->P.lcm!=NULL)
-    {
+      if (strat->s_poly!=NULL)
+      {
+        if (strat->s_poly(strat))
+        {
+          // we are called AFTER enterS, i.e. if we change P
+          // we have it also to S/T
+          // and add pairs
+          int pos=posInS(strat,strat->sl,strat->P.p,strat->P.ecart);
+          enterT(strat->P, strat);
+          #ifdef HAVE_RINGS
+          if (rField_is_Ring(currRing))
+            superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
+          else
+          #endif
+            enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
+          strat->enterS(strat->P, pos, strat, strat->tl);
+        }
+      }
+      #if ADIDEBUG
+      for(int iii = 0; iii<=strat->tl;iii++)
+      {
+        printf("\nT[%i] = ",iii);pWrite(strat->T[iii].p);
+      }
+      #endif
+
+      if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+//      Print("[%d]",hilbeledeg);
+      if (strat->P.lcm!=NULL)
 #ifdef HAVE_RINGS
-      if (rField_is_Ring(currRing)) pLmDelete(strat->P.lcm);
-      else
+        pLmDelete(strat->P.lcm);
 #else
         pLmFree(strat->P.lcm);
 #endif
-        strat->P.lcm=NULL;
-    }
-    if ((red_result==1) && (strat->s_poly!=NULL))
-    {
-      // the only valid entries are: strat->P.p,
-      // strat->tailRing (read-only, keep it)
-      // (and P->p1, P->p2 (read-only, must set to NULL if P.p is changed)
-      if (strat->s_poly(strat))
-      {
-        // we are called AFTER enterS, i.e. if we change P
-        // we have to add it also to S/T
-        // and add pairs
-        int pos=posInS(strat,strat->sl,strat->P.p,strat->P.ecart);
-        enterT(strat->P, strat);
-        #ifdef HAVE_RINGS
-        if (rField_is_Ring(currRing))
-          superenterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
-        else
-        #endif
-          enterpairs(strat->P.p,strat->sl,strat->P.ecart,pos,strat, strat->tl);
-        strat->enterS(strat->P, pos, strat, strat->tl);
-      }
-    }
-
-      if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
-//      Print("[%d]",hilbeledeg);
     }
     else if (strat->P.p1 == NULL && strat->minim > 0)