Changeset 182ac7 in git

Timestamp:

May 4, 2021, 3:32:47 PM (21 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

502859fe5faa956d714f45c2e56bd4bd4736e1ad

Parents:

d56a028f6c210ff9d0a22ef03869531f6ea14743

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-05-04 15:32:47+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-05-04 15:33:55+02:00

Message:

moved kutil.cc -> kstd2.cc: ind2, ind_fact_2, removed VANIDEAL RING2TOM

Files:

• Singular/extra.cc (modified) (1 diff)
• dox/Doxyfile.in (modified) (2 diffs)
• kernel/GBEngine/kstd2.cc (modified) (1 diff)
• kernel/GBEngine/kutil.cc (modified) (1 diff)
• kernel/GBEngine/kutil.h (modified) (1 diff)

Singular/extra.cc

@@ -2847 +2847 @@
        else
   #endif
-
-
-  /*==================== DLL =================*/
-  #ifdef __CYGWIN__
-  #ifdef HAVE_DL
-  /* testing the DLL functionality under Win32 */
-        if (strcmp(sys_cmd, "DLL") == 0)
-        {
-          typedef void  (*Void_Func)();
-          typedef int  (*Int_Func)(int);
-          void *hh=dynl_open("WinDllTest.dll");
-          if ((h!=NULL) && (h->Typ()==INT_CMD))
-          {
-            int (*f)(int);
-            if (hh!=NULL)
-            {
-              int (*f)(int);
-              f=(Int_Func)dynl_sym(hh,"PlusDll");
-              int i=10;
-              if (f!=NULL) printf("%d\n",f(i));
-              else PrintS("cannot find PlusDll\n");
-            }
-          }
-          else
-          {
-            void (*f)();
-            f= (Void_Func)dynl_sym(hh,"TestDll");
-            if (f!=NULL) f();
-            else PrintS("cannot find TestDll\n");
-          }
-          return FALSE;
-        }
-        else
-  #endif
-  #endif
-  #ifdef HAVE_RING2TOM
-  /*==================== ring-GB ==================================*/
-      if (strcmp(sys_cmd, "findZeroPoly")==0)
-      {
-        ring r = currRing;
-        poly f = (poly) h->Data();
-        res->rtyp=POLY_CMD;
-        res->data=(poly) kFindZeroPoly(f, r, r);
-        return(FALSE);
-      }
-      else
-  /*==================== Creating zero polynomials =================*/
-  #ifdef HAVE_VANIDEAL
-      if (strcmp(sys_cmd, "createG0")==0)
-      {
-        /* long exp[50];
-        int N = 0;
-        while (h != NULL)
-        {
-          N += 1;
-          exp[N] = (long) h->Data();
-          // if (exp[i] % 2 != 0) exp[i] -= 1;
-          h = h->next;
-        }
-        for (int k = 1; N + k <= currRing->N; k++) exp[k] = 0;
-
-        poly t_p;
-        res->rtyp=POLY_CMD;
-        res->data= (poly) kCreateZeroPoly(exp, -1, &t_p, currRing, currRing);
-        return(FALSE); */
-
-        res->rtyp = IDEAL_CMD;
-        res->data = (ideal) createG0();
-        return(FALSE);
-      }
-      else
-  #endif
   /*==================== redNF_ring =================*/
+  #ifdef HAVE_RINGS
       if (strcmp(sys_cmd, "redNF_ring")==0)
       {

dox/Doxyfile.in

@@ -2025 +2025 @@
 HAVE_PYTHON \
 HAVE_RATGRING \
-HAVE_RING2TOM \
 HAVE_SBRK \
 HAVE_SDB \
@@ -2035 +2034 @@
 HAVE_TAIL_BIN \
 HAVE_TAIL_RING \
-HAVE_VANIDEAL \
 HAVE_WALK \
 HAVE_ZERODIVISORS \

kernel/GBEngine/kstd2.cc

@@ -522 +522 @@
   }
 }
+
+#ifdef HAVE_RINGS
+static long ind2(long arg)
+{
+  if (arg <= 0) return 0;
+  long ind = 0;
+  while (arg%2 == 0)
+  {
+    arg = arg / 2;
+    ind++;
+  }
+  return ind;
+}
+
+static long ind_fact_2(long arg)
+{
+  if (arg <= 0) return 0;
+  long ind = 0;
+  if (arg%2 == 1) { arg--; }
+  while (arg > 0)
+  {
+    ind += ind2(arg);
+    arg = arg - 2;
+  }
+  return ind;
+}
+#endif
 
 #ifdef HAVE_RINGS

kernel/GBEngine/kutil.cc

@@ -4176 +4176 @@
     j--;
   }
-}
-#endif
-
-#ifdef HAVE_RINGS
-long ind2(long arg)
-{
-  if (arg <= 0) return 0;
-  long ind = 0;
-  while (arg%2 == 0)
-  {
-    arg = arg / 2;
-    ind++;
-  }
-  return ind;
-}
-
-long ind_fact_2(long arg)
-{
-  if (arg <= 0) return 0;
-  long ind = 0;
-  if (arg%2 == 1) { arg--; }
-  while (arg > 0)
-  {
-    ind += ind2(arg);
-    arg = arg - 2;
-  }
-  return ind;
-}
-#endif
-
-#ifdef HAVE_VANIDEAL
-static long twoPow(long arg)
-{
-  return 1L << arg;
-}
-
-/*2
-* put the pair (p, f) in B and f in T
-*/
-static void enterOneZeroPairRing (poly f, poly t_p, poly p, int ecart, kStrategy strat, int atR = -1)
-{
-  int      l,j,compare,compareCoeff;
-  LObject  Lp;
-
-#ifdef KDEBUG
-  Lp.ecart=0; Lp.length=0;
-#endif
-  /*- computes the lcm(s[i],p) -*/
-  Lp.lcm = p_Lcm(p,f,Lp.lcm,currRing);
-  pSetCoeff(Lp.lcm, nLcm(pGetCoeff(p), pGetCoeff(f), currRing));
-  assume(!strat->sugarCrit);
-  assume(!strat->fromT);
-  /*
-  *the set B collects the pairs of type (S[j],p)
-  *suppose (r,p) is in B and (s,p) is the new pair and lcm(s,p) != lcm(r,p)
-  *if the leading term of s divides lcm(r,p) then (r,p) will be canceled
-  *if the leading term of r divides lcm(s,p) then (s,p) will not enter B
-  */
-  for(j = strat->Bl;j>=0;j--)
-  {
-    compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
-    compareCoeff = nDivComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
-    if (compareCoeff == 0 || compare == compareCoeff)
-    {
-      if (compare == 1)
-      {
-        strat->c3++;
-        pLmDelete(Lp.lcm);
-        return;
-      }
-      else
-      if (compare == -1)
-      {
-        deleteInL(strat->B,&strat->Bl,j,strat);
-        strat->c3++;
-      }
-    }
-    if (compare == pDivComp_EQUAL)
-    {
-      // Add hint for same LM and direction of LC (later) (TODO Oliver)
-      if (compareCoeff == 1)
-      {
-        strat->c3++;
-        pLmDelete(Lp.lcm);
-        return;
-      }
-      else
-      if (compareCoeff == -1)
-      {
-        deleteInL(strat->B,&strat->Bl,j,strat);
-        strat->c3++;
-      }
-    }
-  }
-  /*
-  *the pair (S[i],p) enters B if the spoly != 0
-  */
-  /*-  compute the short s-polynomial -*/
-  if ((f==NULL) || (p==NULL)) return;
-  pNorm(p);
-  {
-    Lp.p = ksCreateShortSpoly(f, p, strat->tailRing);
-  }
-  if (Lp.p == NULL) //deactivated, as we are adding pairs with zeropoly and not from S
-  {
-    /*- the case that the s-poly is 0 -*/
-//    if (strat->pairtest==NULL) initPairtest(strat);
-//    strat->pairtest[i] = TRUE;/*- hint for spoly(S^[i],p)=0 -*/
-//    strat->pairtest[strat->sl+1] = TRUE;
-    /*hint for spoly(S[i],p) == 0 for some i,0 <= i <= sl*/
-    /*
-    *suppose we have (s,r),(r,p),(s,p) and spoly(s,p) == 0 and (r,p) is
-    *still in B (i.e. lcm(r,p) == lcm(s,p) or the leading term of s does not
-    *divide lcm(r,p)). In the last case (s,r) can be canceled if the leading
-    *term of p divides the lcm(s,r)
-    *(this canceling should be done here because
-    *the case lcm(s,p) == lcm(s,r) is not covered in chainCrit)
-    *the first case is handeled in chainCrit
-    */
-    if (Lp.lcm!=NULL) pLmDelete(Lp.lcm);
-  }
-  else
-  {
-    /*- the pair (S[i],p) enters B -*/
-    Lp.p1 = f;
-    Lp.p2 = p;
-
-    pNext(Lp.p) = strat->tail;
-
-    LObject tmp_h(f, currRing, strat->tailRing);
-    tmp_h.SetShortExpVector();
-    strat->initEcart(&tmp_h);
-    tmp_h.sev = pGetShortExpVector(tmp_h.p);
-    tmp_h.t_p = t_p;
-
-    enterT(tmp_h, strat, strat->tl + 1);
-
-    if (atR >= 0)
-    {
-      Lp.i_r2 = atR;
-      Lp.i_r1 = strat->tl;
-    }
-
-    strat->initEcartPair(&Lp,f,p,0/*strat->ecartS[i]*/,ecart);     // Attention: TODO: break ecart
-    l = strat->posInL(strat->B,strat->Bl,&Lp,strat);
-    enterL(&strat->B, &strat->Bl, &strat->Bmax, Lp, l);
-  }
-}
-
-/* Helper for kCreateZeroPoly
- * enumerating the exponents
-ring r = 2^2, (a, b, c), lp; ideal G0 = system("createG0"); ideal G = interred(G0); ncols(G0); ncols(G);
- */
-
-static int nextZeroSimplexExponent (long exp[], long ind[], long cexp[], long cind[], long* cabsind, long step[], long bound, long N)
-/* gives the next exponent from the set H_1 */
-{
-  long add = ind2(cexp[1] + 2);
-  if ((*cabsind < bound) && (*cabsind - step[1] + add < bound))
-  {
-    cexp[1] += 2;
-    cind[1] += add;
-    *cabsind += add;
-  }
-  else
-  {
-    // cabsind >= habsind
-    if (N == 1) return 0;
-    int i = 1;
-    while (exp[i] == cexp[i] && i <= N) i++;
-    cexp[i] = exp[i];
-    *cabsind -= cind[i];
-    cind[i] = ind[i];
-    step[i] = 500000;
-    *cabsind += cind[i];
-    // Print("in: %d\n", *cabsind);
-    i += 1;
-    if (i > N) return 0;
-    do
-    {
-      step[1] = 500000;
-      for (int j = i + 1; j <= N; j++)
-      {
-        if (step[1] > step[j]) step[1] = step[j];
-      }
-      add = ind2(cexp[i] + 2);
-      if (*cabsind - step[1] + add >= bound)
-      {
-        cexp[i] = exp[i];
-        *cabsind -= cind[i];
-        cind[i] = ind[i];
-        *cabsind += cind[i];
-        step[i] = 500000;
-        i += 1;
-        if (i > N) return 0;
-      }
-      else step[1] = -1;
-    } while (step[1] != -1);
-    step[1] = 500000;
-    cexp[i] += 2;
-    cind[i] += add;
-    *cabsind += add;
-    if (add < step[i]) step[i] = add;
-    for (i = 2; i <= N; i++)
-    {
-      if (step[1] > step[i]) step[1] = step[i];
-    }
-  }
-  return 1;
-}
-
-/*
- * Creates the zero Polynomial on position exp
- * long exp[] : exponent of leading term
- * cabsind    : total 2-ind of exp (if -1 will be computed)
- * poly* t_p  : will hold the LT in tailRing
- * leadRing   : ring for the LT
- * tailRing   : ring for the tail
- */
-
-poly kCreateZeroPoly(long exp[], long cabsind, poly* t_p, ring leadRing, ring tailRing)
-{
-
-  poly zeroPoly = NULL;
-
-  number tmp1;
-  poly tmp2, tmp3;
-
-  if (cabsind == -1)
-  {
-    cabsind = 0;
-    for (int i = 1; i <= leadRing->N; i++)
-    {
-      cabsind += ind_fact_2(exp[i]);
-    }
-//    Print("cabsind: %d\n", cabsind);
-  }
-  if (cabsind < leadRing->ch)
-  {
-    zeroPoly = p_ISet(twoPow(leadRing->ch - cabsind), tailRing);
-  }
-  else
-  {
-    zeroPoly = p_ISet(1, tailRing);
-  }
-  for (int i = 1; i <= leadRing->N; i++)
-  {
-    for (long j = 1; j <= exp[i]; j++)
-    {
-      tmp1 = nInit(j);
-      tmp2 = p_ISet(1, tailRing);
-      p_SetExp(tmp2, i, 1, tailRing);
-      p_Setm(tmp2, tailRing);
-      if (nIsZero(tmp1))
-      { // should nowbe obsolet, test ! TODO OLIVER
-        zeroPoly = p_Mult_q(zeroPoly, tmp2, tailRing);
-      }
-      else
-      {
-        tmp3 = p_NSet(nCopy(tmp1), tailRing);
-        zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp3, tmp2, tailRing), tailRing);
-      }
-    }
-  }
-  tmp2 = p_NSet(nCopy(pGetCoeff(zeroPoly)), leadRing);
-  for (int i = 1; i <= leadRing->N; i++)
-  {
-    pSetExp(tmp2, i, p_GetExp(zeroPoly, i, tailRing));
-  }
-  p_Setm(tmp2, leadRing);
-  *t_p = zeroPoly;
-  zeroPoly = pNext(zeroPoly);
-  pNext(*t_p) = NULL;
-  pNext(tmp2) = zeroPoly;
-  return tmp2;
-}
-
-// #define OLI_DEBUG
-#if 0
-/*
- * Generate the s-polynomial for the virtual set of zero-polynomials
- */
-
-void initenterzeropairsRing (poly p, int ecart, kStrategy strat, int atR)
-{
-  // Initialize
-  long exp[50];            // The exponent of \hat{X} (basepoint)
-  long cexp[50];           // The current exponent for iterating over all
-  long ind[50];            // The power of 2 in the i-th component of exp
-  long cind[50];           // analog for cexp
-  long mult[50];           // How to multiply the elements of G
-  long cabsind = 0;        // The abs. index of cexp, i.e. the sum of cind
-  long habsind = 0;        // The abs. index of the coefficient of h
-  long step[50];           // The last increases
-  for (int i = 1; i <= currRing->N; i++)
-  {
-    exp[i] = p_GetExp(p, i, currRing);
-    if (exp[i] & 1 != 0)
-    {
-      exp[i] = exp[i] - 1;
-      mult[i] = 1;
-    }
-    cexp[i] = exp[i];
-    ind[i] = ind_fact_2(exp[i]);
-    cabsind += ind[i];
-    cind[i] = ind[i];
-    step[i] = 500000;
-  }
-  step[1] = 500000;
-  habsind = ind2(n_Int(pGetCoeff(p), currRing->cf);
-  long bound = currRing->ch - habsind;
-#ifdef OLI_DEBUG
-  PrintS("-------------\npoly  :");
-  wrp(p);
-  Print("\nexp   : (%d, %d)\n", exp[1] + mult[1], exp[2] + mult[1]);
-  Print("cexp  : (%d, %d)\n", cexp[1], cexp[2]);
-  Print("cind  : (%d, %d)\n", cind[1], cind[2]);
-  Print("bound : %d\n", bound);
-  Print("cind  : %d\n", cabsind);
-#endif
-  if (cabsind == 0)
-  {
-    if (!(nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N)))
-    {
-      return;
-    }
-  }
-  // Now the whole simplex
-  do
-  {
-    // Build s-polynomial
-    // 2**ind-def * mult * g - exp-def * h
-    poly t_p;
-    poly zeroPoly = kCreateZeroPoly(cexp, cabsind, &t_p, currRing, strat->tailRing);
-#ifdef OLI_DEBUG
-    Print("%d, (%d, %d), ind = (%d, %d)\n", cabsind, cexp[1], cexp[2], cind[1], cind[2]);
-    PrintS("zPoly : ");
-    wrp(zeroPoly);
-    PrintLn();
-#endif
-    enterOneZeroPairRing(zeroPoly, t_p, p, ecart, strat, atR);
-  }
-  while ( nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N) );
-}
-#endif
-
-/*
- * Create the Groebner basis of the vanishing polynomials.
- */
-
-ideal createG0()
-{
-  // Initialize
-  long exp[50];            // The exponent of \hat{X} (basepoint)
-  long cexp[50];           // The current exponent for iterating over all
-  long ind[50];            // The power of 2 in the i-th component of exp
-  long cind[50];           // analog for cexp
-  long mult[50];           // How to multiply the elements of G
-  long cabsind = 0;        // The abs. index of cexp, i.e. the sum of cind
-  long habsind = 0;        // The abs. index of the coefficient of h
-  long step[50];           // The last increases
-  for (int i = 1; i <= currRing->N; i++)
-  {
-    exp[i] = 0;
-    cexp[i] = exp[i];
-    ind[i] = 0;
-    step[i] = 500000;
-    cind[i] = ind[i];
-  }
-  long bound = currRing->ch;
-  step[1] = 500000;
-#ifdef OLI_DEBUG
-  PrintS("-------------\npoly  :");
-//  wrp(p);
-  Print("\nexp   : (%d, %d)\n", exp[1] + mult[1], exp[2] + mult[1]);
-  Print("cexp  : (%d, %d)\n", cexp[1], cexp[2]);
-  Print("cind  : (%d, %d)\n", cind[1], cind[2]);
-  Print("bound : %d\n", bound);
-  Print("cind  : %d\n", cabsind);
-#endif
-  if (cabsind == 0)
-  {
-    if (!(nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N)))
-    {
-      return idInit(1, 1);
-    }
-  }
-  ideal G0 = idInit(1, 1);
-  // Now the whole simplex
-  do
-  {
-    // Build s-polynomial
-    // 2**ind-def * mult * g - exp-def * h
-    poly t_p;
-    poly zeroPoly = kCreateZeroPoly(cexp, cabsind, &t_p, currRing, currRing);
-#ifdef OLI_DEBUG
-    Print("%d, (%d, %d), ind = (%d, %d)\n", cabsind, cexp[1], cexp[2], cind[1], cind[2]);
-    PrintS("zPoly : ");
-    wrp(zeroPoly);
-    PrintLn();
-#endif
-    // Add to ideal
-    pEnlargeSet(&(G0->m), IDELEMS(G0), 1);
-    IDELEMS(G0) += 1;
-    G0->m[IDELEMS(G0) - 1] = zeroPoly;
-  }
-  while ( nextZeroSimplexExponent(exp, ind, cexp, cind, &cabsind, step, bound, currRing->N) );
-  idSkipZeroes(G0);
-  return G0;
 }
 #endif

kernel/GBEngine/kutil.h

@@ -520 +520 @@
 void superenterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR = -1);
 void superenterpairsSig (poly h,poly hSig,int hFrom,int k,int ecart,int pos,kStrategy strat, int atR = -1);
-poly kCreateZeroPoly(long exp[], long cabsind, poly* t_p, ring leadRing, ring tailRing);
-long ind2(long arg);
-
-long ind_fact_2(long arg);
-ideal createG0();
 #endif
 int redLazy (LObject* h,kStrategy strat);