Changeset b3594cb in git

Timestamp:

Nov 28, 2022, 4:48:26 PM (17 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8b6880871eb7f0dea5b3bbc2efc8c11035bf5d3ba1848a8b477dcf2db252b506e9fd7ceba77fd054

Parents:

584b82fab1aca9df1e4e790a4ca42e6c4c2ff11a

Message:

removed unused routines from kstd2

Location:

kernel/GBEngine

Files:

• kChinese.cc (modified) (2 diffs)
• kspoly.cc (modified) (4 diffs)
• kstd2.cc (modified) (9 diffs)

kernel/GBEngine/kChinese.cc

@@ -375 +375 @@
 }
 
+#if 0
+// debug for send_poly
 void test_n(poly n)
 {
@@ -395 +397 @@
 }
 #endif
+#endif

kernel/GBEngine/kspoly.cc

@@ -42 +42 @@
  *
  ***************************************************************/
+#ifdef STDZ_EXCHANGE_DURING_REDUCTION
 int ksReducePolyZ(LObject* PR,
                  TObject* PW,
@@ -184 +185 @@
   return ret;
 }
+#endif
 
 int ksReducePoly(LObject* PR,
@@ -342 +344 @@
 
 #ifdef HAVE_RINGS
+#ifdef STDZ_EXCHANGE_DURING_REDUCTION
 int ksReducePolyGCD(LObject* PR,
                  TObject* PW,
@@ -466 +469 @@
   return ret;
 }
+#endif
 #endif
 

kernel/GBEngine/kstd2.cc

@@ -84 +84 @@
                 LObject* L,const kStrategy strat);
 
+#ifdef STDZ_EXCHANGE_DURING_REDUCTION
 int kFindSameLMInT_Z(const kStrategy strat, const LObject* L, const int start)
 {
@@ -139 +140 @@
   }
 }
+#endif
+
 // return -1 if T[0] (w/o coeff) does not divide the leading monomial
 // (only for euclidean rings (n_QuotRem)
@@ -488 +491 @@
   int ende=strat->sl;
 #endif
-  if(rField_is_Ring(currRing))
-  {
-    loop
-    {
-      if (j > ende) return -1;
-#if defined(PDEBUG) || defined(PDIV_DEBUG)
-      if (p_LmShortDivisibleBy(strat->S[j], strat->sevS[j],
-                             p, not_sev, currRing))
-#else
-      if ( !(strat->sevS[j] & not_sev) &&
-         p_LmDivisibleBy(strat->S[j], p, currRing))
-#endif
-      {
-        if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), currRing->cf))
-          return j;
-      }
-      j++;
-    }
-  }
-  else
-  {
-    loop
-    {
-      if (j > ende) return -1;
-#if defined(PDEBUG) || defined(PDIV_DEBUG)
-      if (p_LmShortDivisibleBy(strat->S[j], strat->sevS[j],
-                             p, not_sev, currRing))
-#else
-      if ( !(strat->sevS[j] & not_sev) &&
-         p_LmDivisibleBy(strat->S[j], p, currRing))
-#endif
-      {
-        return j;
-      }
-      j++;
-    }
-  }
-}
-
-int kFindNextDivisibleByInS_noCF(const kStrategy strat, int start,int max_ind, LObject* L)
-{
-  unsigned long not_sev = ~L->sev;
-  poly p = L->GetLmCurrRing();
-  int j = start;
-
-  pAssume(~not_sev == p_GetShortExpVector(p, currRing));
-#if 1
-  int ende=max_ind;
-#else
-  int ende=strat->sl;
-#endif
   loop
   {
@@ -557 +509 @@
 
 #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)
 {
@@ -576 +516 @@
   while (arg > 0)
   {
-    ind += ind2(arg);
+    ind += SI_LOG2_LONG(arg);
     arg = arg - 2;
   }
@@ -595 +535 @@
 
   int k_ind2 = 0;
-  int a_ind2 = ind2(a);
+  int a_ind2 = SI_LOG2_LONG(a);
 
   // unsigned long k = 1;
@@ -621 +561 @@
         s_exp = s_exp - 1;
       }
-      while ( (0 < ind2(s_exp)) && (ind2(s_exp) <= too_much) )
-      {
-        too_much = too_much - ind2(s_exp);
+      while ( (0 < SI_LOG2_LONG(s_exp)) && (SI_LOG2_LONG(s_exp) <= too_much) )
+      {
+        too_much = too_much - SI_LOG2_LONG(s_exp);
         s_exp = s_exp - 2;
       }
@@ -2207 +2147 @@
     && (nonorm)
     && (!n_DivBy(pGetCoeff(P.p),pGetCoeff(strat->S[j]),currRing->cf)))
-      j=kFindNextDivisibleByInS_noCF(strat,j+1,max_ind,&P);
+      j=kFindNextDivisibleByInS(strat,j+1,max_ind,&P);
     if (j>=0)
     {
@@ -2215 +2155 @@
       {
         int sll;
-        jj=kFindNextDivisibleByInS_noCF(strat,jj+1,max_ind,&P);
+        jj=kFindNextDivisibleByInS(strat,jj+1,max_ind,&P);
         if (jj<0) break;
         if ((!nonorm)