Changeset deedf3 in git for kernel

Timestamp:

Nov 18, 2022, 5:53:30 PM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

63d2db479e6d60dfeed92ab8261e782b65a9b9ad

Parents:

0661780885c7599c6bf16f79e89ec0b5eb70cb5e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-18 17:53:30+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2022-11-18 17:56:22+01:00

Message:

removed; pCopyL2p, posInLrg0

Location:

kernel/GBEngine

Files:

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

kernel/GBEngine/kutil.cc

@@ -6124 +6124 @@
   }
   return ind;
-}
-
-int posInLrg0 (const LSet set, const int length,
-              LObject* p,const kStrategy)
-/*          if (nGreater(pGetCoeff(p), pGetCoeff(set[an]))) return en;
-        if (pLmCmp(set[i],p) == cmp_int)         en = i;
-        else if (pLmCmp(set[i],p) == -cmp_int)   an = i;
-        else
-        {
-          if (nGreater(pGetCoeff(p), pGetCoeff(set[i]))) an = i;
-          else en = i;
-        }*/
-{
-  if (length < 0) return 0;
-
-  int o = p->GetpFDeg();
-  int op = set[length].GetpFDeg();
-
-  if ((op > o) || ((op == o) && (pLmCmp(set[length].p,p->p) != -currRing->OrdSgn)))
-    return length + 1;
-  int i;
-  int an = 0;
-  int en = length;
-  loop
-  {
-    if (an >= en - 1)
-    {
-      op = set[an].GetpFDeg();
-      if ((op > o) || ((op == o) && (pLmCmp(set[an].p,p->p) != -currRing->OrdSgn)))
-        return en;
-      return an;
-    }
-    i = (an+en) / 2;
-    op = set[i].GetpFDeg();
-    if ((op > o) || ((op == o) && (pLmCmp(set[i].p,p->p) != -currRing->OrdSgn)))
-      an = i;
-    else
-      en = i;
-  }
 }
 
@@ -11732 +11693 @@
     #endif
     else if (strat->posInL==posInLSpecial) printf("posInLSpecial\n");
-    else if (strat->posInL==posInLrg0) printf("posInLrg0\n");
     else  printf("%p\n",(void*)strat->posInL);
   printf("enterS: ");
@@ -11814 +11774 @@
 }
 
-#ifdef HAVE_SHIFTBBA
-poly pCopyL2p(LObject H, kStrategy strat)
-{
-  /* restores a poly in currRing from LObject */
-  LObject h = H;
-  h.Copy();
-  poly p;
-  if (h.p == NULL)
-  {
-    if (h.t_p != NULL)
-    {
-      p = prMoveR(h.t_p, /* source ring: */ strat->tailRing, /* dest. ring: */ currRing);
-      return(p);
-    }
-    else
-    {
-      /* h.tp == NULL -> the object is NULL */
-      return(NULL);
-    }
-  }
-  /* we're here if h.p != NULL */
-  if (h.t_p == NULL)
-  {
-    /* then h.p is the whole poly in currRing */
-    p = h.p;
-    return(p);
-  }
-  /* we're here if h.p != NULL and h.t_p != NULL */
-  // clean h.p, get poly from t_p
-  pNext(h.p)=NULL;
-  pLmDelete(&h.p);
-  p = prMoveR(h.t_p, /* source ring: */ strat->tailRing,
-                     /* dest. ring: */ currRing);
-  // no need to clean h: we re-used the polys
-  return(p);
-}
-#endif
-
 //LObject pCopyp2L(poly p, kStrategy strat)
 //{
@@ -11858 +11780 @@
 
 //}
-
-// poly pCopyL2p(LObject H, kStrategy strat)
-// {
-//   /* restores a poly in currRing from LObject */
-//   LObject h = H;
-//   h.Copy();
-//   poly p;
-//   if (h.p == NULL)
-//   {
-//     if (h.t_p != NULL)
-//     {
-//       p = p_ShallowCopyDelete(h.t_p, (strat->tailRing != NULL ? strat->tailRing : currRing), strat->tailBin);
-//       return(p);
-//     }
-//     else
-//     {
-//       /* h.tp == NULL -> the object is NULL */
-//       return(NULL);
-//     }
-//   }
-//   /* we're here if h.p != NULL */
-
-//   if (h.t_p == NULL)
-//   {
-//     /* then h.p is the whole poly in tailRing */
-//     if (strat->tailBin != NULL && (pNext(h.p) != NULL))
-//     {
-//       p = p_ShallowCopyDelete(h.p, (strat->tailRing != NULL ? strat->tailRing : currRing), strat->tailBin);
-//     }
-//     return(p);
-//   }
-//   /* we're here if h.p != NULL and h.t_p != NULL */
-//   p = pCopy(pHead(h.p)); // in currRing
-//   if (strat->tailBin != NULL && (pNext(h.p) != NULL))
-//   {
-//     //    pNext(p) = p_ShallowCopyDelete(pNext(h.t_p), (strat->tailRing != NULL ? strat->tailRing : currRing), strat->tailBin);
-//     poly pp = p_Copy(pNext(h.p), strat->tailRing);
-//     //    poly p3 = p_Copy(pNext(h.p), currRing); // error
-//       // p_ShallowCopyDelete(pNext(h.p), currRing, strat->tailBin); // the same as pp
-//     poly p5 = p_ShallowCopyDelete(pNext(h.p), strat->tailRing, strat->tailBin);
-//     pNext(p) = p_ShallowCopyDelete(h.t_p, strat->tailRing, strat->tailBin);
-//     poly p4 = p_Copy(h.t_p, strat->tailRing);
-//     //    if (p.t_p != NULL) pNext(p.t_p) = pNext(p.p);
-//   }
-//   //  pTest(p);
-//   return(p);
-// }
 
 /*2

kernel/GBEngine/kutil.h

@@ -858 +858 @@
 }
 
-poly pCopyL2p(LObject h, kStrategy strat);
-
 void enterTShift(LObject p, kStrategy strat, int atT = -1);