Changeset 43cbc0 in git

Timestamp:

Feb 23, 2009, 8:22:27 PM (14 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

e8e2b6921594abbde4a1dccae43bc5f6b73440d1

Parents:

51542244f370752f7a57d84632cc1650dc8a4ed5

Message:

*levandov: massive attack of RATGRING things on BB algorithm


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

Location:

kernel

Files:

• gr_kstd2.cc (modified) (2 diffs)
• gring.cc (modified) (3 diffs)
• kutil.cc (modified) (8 diffs)
• ratgring.cc (modified) (2 diffs)
• ratgring.h (modified) (2 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.28 2009-02-23 11:26:29 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.29 2009-02-23 19:22:27 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -1123 +1123 @@
 //        }
 
-      strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,currRing);
+      
+      if( ! rIsRatGRing(currRing) )
+      { 
+        strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,currRing);
+      }
+      else
+      {
+        /* rational case */
+        strat->P.p = nc_rat_CreateSpoly(strat->P.p1,strat->P.p2,currRing->real_var_start-1,currRing);
+      }
+
 
 #ifdef PDEBUG

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.68 2008-07-26 14:28:03 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.69 2009-02-23 19:22:27 levandov Exp $
  *******************************************************************/
 
@@ -45 +45 @@
 #include <ncSAMult.h> // for CMultiplier etc classes
 #include <ncSAFormula.h> // for CFormulaPowerMultiplier and enum Enum_ncSAType
+
+#ifdef HAVE_RATGRING
+#include "ratgring.h"
+#endif
 
 
@@ -1896 +1900 @@
   }
 
-  poly m = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);
+  poly m; 
+  if ( ! rIsRatGRing(currRing))
+  {
+    m = p_Lcm(p1, p2, si_max(lCompP1, lCompP2), r);
+  }
+  else
+  {
+    /* rational version */
+    m = p_LcmRat(p1, p2, si_max(lCompP1, lCompP2), r);
+  }
 
 //  n_Delete(&p_GetCoeff(m, r), r);

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.127 2009-02-23 13:32:35 Singular Exp $ */
+/* $Id: kutil.cc,v 1.128 2009-02-23 19:22:27 levandov Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -53 +53 @@
 #include "shiftgb.h"
 #include "prCopy.h"
+
+#ifdef HAVE_RATGRING
+#include "ratgring.h"
+#endif
 
 #ifdef KDEBUG
@@ -1366 +1370 @@
 */
 
-
 void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
 {
@@ -1382 +1385 @@
   Lp.lcm = pInit();
 
+#ifndef HAVE_RATGRING
   pLcm(p,strat->S[i],Lp.lcm);
+#elif defined(HAVE_RATGRING)
+  //  if (rIsRatGRing(currRing))
+  pLcmRat(p,strat->S[i],Lp.lcm, currRing->real_var_start); // int rat_shift
+#endif
   pSetm(Lp.lcm);
 
@@ -2298 +2306 @@
     if (new_pair) 
     {
+#ifdef HAVE_RATGRING
+      if (currRing->real_var_start>0)
+        chainCritPart(h,ecart,strat);
+      else
+#endif
       strat->chainCrit(h,ecart,strat);
     }
@@ -5549 +5562 @@
   {
      strat->chainCrit=chainCritPart;
+     /* enterOnePairNormal get rational part in it */
   }
 #endif
@@ -5565 +5579 @@
 #ifdef HAVE_PLURAL
   // and r is plural_ring
+  //  hence this holds for r a rational_plural_ring
   if( rIsPluralRing(currRing) || (rIsSCA(currRing) && !strat->z2homog) )
   {    //or it has non-quasi-comm type... later
@@ -7195 +7210 @@
     if (new_pair)
     {
-#ifdef HAVE_RATGRING
-      if (currRing->real_var_start>0)
-        chainCritPart(h,ecart,strat);
-      else
-#endif
       strat->chainCrit(h,ecart,strat);
     }

kernel/ratgring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: ratgring.cc,v 1.14 2009-02-21 19:30:56 levandov Exp $
+ *  Version: $Id: ratgring.cc,v 1.15 2009-02-23 19:22:27 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -37 +37 @@
   /* Don't do a pSetm here, otherwise hres/lres chockes */ 
 }
+
+/*2
+* returns the rational LCM of the head terms of a and b
+* without coefficient!!!
+*/
+poly p_LcmRat(const poly a, const poly b, const long lCompM, const ring r)
+{
+  poly m = // p_One( r);
+          p_Init(r);
+
+  const int pVariables = r->N;
+
+  //  for (int i = pVariables; i>=r->real_var_start; i--)
+  for (int i = r->real_var_end; i>=r->real_var_start; i--)
+  {
+    const int lExpA = p_GetExp (a, i, r);
+    const int lExpB = p_GetExp (b, i, r);
+
+    p_SetExp (m, i, si_max(lExpA, lExpB), r);
+  }
+
+  p_SetComp (m, lCompM, r);
+  p_Setm(m,r);
+  n_New(&(p_GetCoeff(m, r)), r);
+
+  return(m);
+};
 
 // void pLcmRat(poly a, poly b, poly m, poly pshift)

kernel/ratgring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ratgring.h,v 1.7 2009-02-21 19:30:56 levandov Exp $ */
+/* $Id: ratgring.h,v 1.8 2009-02-23 19:22:27 levandov Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -21 +21 @@
 void pLcmRat(poly a, poly b, poly m, int rat_shift);
 
-//void pLcmRat(poly a, poly b, poly m, poly pshift);
+poly p_LcmRat(const poly a, const poly b, const long lCompM, const ring r);
 
 poly p_GetCoeffRat(poly p, int ishift, ring r);