Changeset efb860 in git

Timestamp:

Oct 5, 2006, 8:26:10 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f5bfe4a0668705d924990d960a15282b2a2a3ac1

Parents:

ded4ee6c4c561eaf2513cbc7df1f8b1d60dd0ed1

Message:

*hannes: kFindDivisibleByInS improved


git-svn-id: file:///usr/local/Singular/svn/trunk@9444 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• kstd1.cc (modified) (3 diffs)
• kstd2.cc (modified) (6 diffs)
• kutil.h (modified) (2 diffs)
• tgb.cc (modified) (5 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.11 2006-05-19 13:33:25 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.12 2006-10-05 18:26:09 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -295 +295 @@
       if (at <= strat->Ll)
       {
-        if (kFindDivisibleByInS(strat->S, strat->sevS, strat->sl, h) < 0)
+        if (kFindDivisibleByInS(strat, h) < 0)
         {
           if (strat->honey && !strat->posInLDependsOnLength)
@@ -416 +416 @@
         if (at <= strat->Ll)
         {
-          if (kFindDivisibleByInS(strat->S, strat->sevS, strat->sl, h) < 0)
+          if (kFindDivisibleByInS(strat, h) < 0)
             return 1;
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.20 2006-10-05 10:28:47 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.21 2006-10-05 18:26:10 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -81 +81 @@
 
 // same as above, only with set S
-int kFindDivisibleByInS(const polyset &S, const unsigned long* sev, const int sl, LObject* L)
+int kFindDivisibleByInS(const kStrategy strat, LObject* L)
 {
   unsigned long not_sev = ~L->sev;
@@ -88 +88 @@
 
   pAssume(~not_sev == p_GetShortExpVector(p, currRing));
+  int ende=posInS(strat,strat->sl,p,0)+1;
+  if (ende>strat->sl) ende=strat->sl;
   loop
   {
-    if (j > sl) return -1;
+    if (j > ende) return -1;
 #if defined(PDEBUG) || defined(PDIV_DEBUG)
-    if (p_LmShortDivisibleBy(S[j], sev[j],
+    if (p_LmShortDivisibleBy(strat->S[j], strat->sevS[j],
                              p, not_sev, currRing))
         return j;
 #else
-    if ( !(sev[j] & not_sev) &&
-         p_LmDivisibleBy(S[j], p, currRing))
+    if ( !(strat->sevS[j] & not_sev) &&
+         p_LmDivisibleBy(strat->S[j], p, currRing))
       return j;
 #endif
@@ -555 +557 @@
       {
 #if 0
-        if (kFindDivisibleByInS(strat->S, strat->sevS, strat->sl, h) < 0)
+        if (kFindDivisibleByInS(strat, h) < 0)
           return 1;
 #endif
@@ -706 +708 @@
       if (at <= strat->Ll)
       {
-        if (kFindDivisibleByInS(strat->S, strat->sevS, strat->sl, h) < 0)
+        if (kFindDivisibleByInS(strat, h) < 0)
           return 1;
         enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
@@ -753 +755 @@
 #endif
 */
-      j=kFindDivisibleByInS(strat->S,strat->sevS,strat->sl,&P);
+      j=kFindDivisibleByInS(strat,&P);
     if (j>=0)
     {

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.18 2006-08-14 17:08:37 wienand Exp $ */
+/* $Id: kutil.h,v 1.19 2006-10-05 18:26:10 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -444 +444 @@
                         const int tl, const LObject* L, const int start=0);
 // same with S
-int kFindDivisibleByInS(const polyset &S, const unsigned long* sev,
-                        const int sl, LObject* L);
+int kFindDivisibleByInS(const kStrategy strat, LObject* L);
 
 TObject*

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.100 2006-07-06 07:00:15 bricken Exp $ */
+/* $Id: tgb.cc,v 1.101 2006-10-05 18:26:10 Singular Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -770 +770 @@
     P.p=strat->S[i];
     P.sev=strat->sevS[i];
-    if(kFindDivisibleByInS(strat->S,strat->sevS,strat->sl,&P)!=i)
+    if(kFindDivisibleByInS(strat,&P)!=i)
     {
       deleteInS(i,strat);
@@ -1547 +1547 @@
   loop
     {
-
-      j=kFindDivisibleByInS(strat->S,strat->sevS,strat->sl,&P);
+      j=kFindDivisibleByInS(strat,&P);
       if ((j>=0) && ((!n)||
         ((strat->lenS[j]<=n) &&
@@ -1554 +1553 @@
          (strat->lenSw[j]<=n)))))
       {
-
-
         nNormalize(pGetCoeff(P.p));
 #ifdef KDEBUG
@@ -2029 +2026 @@
       loop
       {
-          j=kFindDivisibleByInS(strat->S,strat->sevS,sl,&P);
+          j=kFindDivisibleByInS(strat,&P);
           if (j>=0)
           {