Changeset a63783 in git

Timestamp:

Jun 17, 2016, 5:07:37 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1798a00a38186e92d8d8d6dc786ccdf6aad508cd

Parents:

2268ed1be40fc852617a276b8e205c5086d79e12

Message:

fix: F5C over Rings

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (1 diff)
• kstd2.cc (modified) (1 diff)
• kutil.cc (modified) (3 diffs)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kstd1.cc

@@ -1508 +1508 @@
     strat->red2 = redHomog;
   }
-#if defined(HAVE_RINGS)
   if (rField_is_Ring(currRing))
   {
     if(rHasLocalOrMixedOrdering(currRing))
-      {strat->red = redRiloc;}
+      {strat->red2 = redRiloc;}
     else
       {strat->red2 = redRing;}
   }
-#endif
   if (currRing->pLexOrder && strat->honey)
     strat->initEcart = initEcartNormal;

kernel/GBEngine/kstd2.cc

@@ -3284 +3284 @@
           }
           strat->initEcart(&h);
-          pos = strat->Ll+1;
+          if(rField_is_Ring(currRing))
+            pos = posInLF5CRing(strat->L, Ll_old+1,strat->Ll,&h,strat);
+          else
+            pos = strat->Ll+1;
           h.sev = pGetShortExpVector(h.p);
           enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);

kernel/GBEngine/kutil.cc

@@ -5955 +5955 @@
   int i;
   int an = 0;
+  int en= length;
+  loop
+  {
+    if (an >= en-1)
+    {
+      op = set[an].GetpFDeg();
+      if ((op > o)
+      || ((op == o) && (pLtCmpOrdSgnDiffM(set[an].p,p->p))))
+        return en;
+      return an;
+    }
+    i=(an+en) / 2;
+    op = set[i].GetpFDeg();
+    if ((op > o)
+    || ((op == o) && (pLtCmpOrdSgnDiffM(set[i].p,p->p))))
+      an=i;
+    else
+      en=i;
+  }
+}
+
+int posInLF5CRing (const LSet set, int start,const int length,
+              LObject* p,const kStrategy strat)
+{
+  if (length<0) return 0;
+  if(start == (length +1)) return (length+1);
+  int o = p->GetpFDeg();
+  int op = set[length].GetpFDeg();
+
+  if ((op > o)
+  || ((op == o) && (pLtCmpOrdSgnDiffM(set[length].p,p->p))))
+    return length+1;
+  int i;
+  int an = start;
   int en= length;
   loop
@@ -9646 +9680 @@
   else if (BTEST1(12) || BTEST1(14) || BTEST1(16) || BTEST1(18))
     strat->posInT = posInT1;
-#ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
   {
@@ -9654 +9687 @@
     strat->posInT = posInT11;
   }
-#endif
   strat->posInLDependsOnLength = FALSE;
   strat->posInLSba  = posInLSig;

kernel/GBEngine/kutil.h

@@ -470 +470 @@
 int posInL11Ring (const LSet set, const int length,
              LObject* L,const kStrategy strat);
+int posInLF5CRing (const LSet set, int start , const int length,
+             LObject* L,const kStrategy strat);
 int posInL11Ringls (const LSet set, const int length,
              LObject* L,const kStrategy strat);