Changeset a725dae in git

Timestamp:

Jan 22, 2006, 5:29:37 AM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

76a71142ba90e62cb5e72eedf1029c5f98235e46

Parents:

7f06ccaffa6e5a520078549a3e37d7d51d338274

Message:

kutil.h:
---> krude twoPow Funktion

kutil.cc:
---> krude two Pow Funktion
---> alle Kriterien in HAVE_RING2TOM reaktiviert
---> krit. Element durch Multiplikation mit Nullteiler erzeugen (in enterpairs)
      ---> Protokollausgabe Z

kstd2.cc:
---> Fehler in kFindZeroPoly behoben
---> Protokollausgabe z (für ZeroPolynom)


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

Location:

kernel

Files:

• kstd2.cc (modified) (7 diffs)
• kutil.cc (modified) (7 diffs)
• kutil.h (modified) (2 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.8 2006-01-20 01:15:07 wienand Exp $ */
+/* $Id: kstd2.cc,v 1.9 2006-01-22 04:29:37 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -164 +164 @@
 */
 
+/* now in kutil.cc
 long twoPow(long arg) {
   long t = arg;
@@ -173 +174 @@
   return result;
 }
+*/
 
 long factorial(long arg)
@@ -242 +244 @@
     tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
     for (int i = 1; i <= leadRing->N; i++) {
-      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, leadRing));
+      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, tailRing));
     }
     p_Setm(tmp2, leadRing);
@@ -269 +271 @@
     tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
     for (int i = 1; i <= leadRing->N; i++) {
-      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, leadRing));
+      pSetExp(tmp2, i, p_GetExp(zeroPoly, i, tailRing));
     }
     p_Setm(tmp2, leadRing);
@@ -311 +313 @@
 //#endif
 
-  h->SetShortExpVector();
+  h->SetShortExpVector(); 
   loop
   {
-    zeroPoly = NULL;// kFindDivisibleByZeroPoly(h);
+    zeroPoly = kFindDivisibleByZeroPoly(h);
     if (zeroPoly != NULL)
     {
+      if (TEST_OPT_PROT)
+      {
+        PrintS("z");
+      }
 #ifdef KDEBUG
       if (TEST_OPT_DEBUG)
@@ -331 +337 @@
       tmp_h.sev = pGetShortExpVector(tmp_h.p);
       tmp_h.SetpFDeg();
+/*      if (TEST_OPT_PROT)
+      {
+        tstcount ++;
+        if (tstcount > 49)
+        {
+          PrintLn();
+          p_wrp(zeroPoly,currRing);
+          PrintLn();
+          tstcount = 0;
+        }
+      } */
 
       enterT(tmp_h, strat, strat->tl + 1);

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.15 2006-01-20 01:15:07 wienand Exp $ */
+/* $Id: kutil.cc,v 1.16 2006-01-22 04:29:37 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1005 +1005 @@
   pLcm(p,strat->S[i],Lp.lcm);
   pSetm(Lp.lcm);
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RING2TOM_DEACT
   if (strat->sugarCrit && currRing->cring == 0)
 #else
@@ -1079 +1079 @@
   else /*sugarcrit*/
   {
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RING2TOM_DEACT
     if (currRing->cring == 0) {
 #endif
@@ -1144 +1144 @@
   }
 #endif
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RING2TOM_DEACT
   }
 #endif
@@ -1595 +1595 @@
 }
 
+long twoPow(long arg) {
+  long t = arg;
+  long result = 1;
+  while (t > 0) {
+    result = 2 * result;
+    t--;
+  }
+  return result;
+}
+
 /*2
 *(s[0],h),...,(s[k],h) will be put to the pairset L(via initenterpairs)
@@ -1601 +1611 @@
 void enterpairs (poly h,int k,int ecart,int pos,kStrategy strat, int atR)
 {
+#ifdef HAVE_RING2TOM
+  // enter also zero divisor * poly, if this is non zero and of smaller degree
+  if (currRing->cring == 1)
+  {
+    if (((long) ((h)->coef)) % 2 == 0)
+    {
+      long a = ((long) ((h)->coef)) / 2;
+      long b = currRing->ch - 1;
+      poly p = p_Copy(h->next, strat->tailRing);
+      while (a % 2 == 0)
+      {
+        a = a / 2;
+        b--;
+      }
+      p = p_Mult_nn(p, (number) twoPow(b), strat->tailRing);
+
+      if (p != NULL)
+      {
+        if (TEST_OPT_PROT)
+        {
+          PrintS("Z");
+        }
+        poly tmp = p_ISet((long) ((p)->coef), currRing);
+        for (int i = 1; i <= currRing->N; i++) {
+          pSetExp(tmp, i, p_GetExp(p, i, strat->tailRing));
+        }
+        p_Setm(tmp, currRing);
+        p = p_LmDeleteAndNext(p, strat->tailRing);
+        pNext(tmp) = p;
+
+        LObject h;
+        h.p = tmp;
+        h.tailRing = strat->tailRing;
+        if (TEST_OPT_INTSTRATEGY)
+        {
+          //pContent(h.p);
+          h.pCleardenom(); // also does a pContent
+        }
+        else
+        {
+          h.pNorm();
+        }
+        strat->initEcart(&h);
+        int posx;
+        if (h.p!=NULL)
+        {
+          if (strat->Ll==-1)
+            posx =0;
+          else
+              posx = strat->posInL(strat->L,strat->Ll,&h,strat);
+          h.sev = pGetShortExpVector(h.p);
+          h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing);
+          enterL(&strat->L,&strat->Ll,&strat->Lmax,h,posx);
+        }
+      }
+    }
+  }
+#endif
   int j=pos;
 
@@ -3278 +3346 @@
           pos =0;
         else
-            pos = strat->posInL(strat->L,strat->Ll,&h,strat);
+          pos = strat->posInL(strat->L,strat->Ll,&h,strat);
         h.sev = pGetShortExpVector(h.p);
         enterL(&strat->L,&strat->Ll,&strat->Lmax,h,pos);

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.10 2006-01-16 03:27:10 wienand Exp $ */
+/* $Id: kutil.h,v 1.11 2006-01-22 04:29:37 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -391 +391 @@
 #ifdef HAVE_RING2TOM
 int redRing2toM (LObject* h,kStrategy strat);
+long twoPow(long arg);
 #endif
 int redLazy (LObject* h,kStrategy strat);