Changeset 0ffc823 in git

Timestamp:

Feb 27, 2009, 8:30:47 PM (15 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8066e80d7cea5de772f7b10b2b1930521cb72523

Parents:

f58aa61ada5934435d94d1d486fb70912543c11a

Message:

*levandov: early unit detection in rational GB


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

Location:

kernel

Files:

• gr_kstd2.cc (modified) (2 diffs)
• polys1.cc (modified) (2 diffs)
• ratgring.cc (modified) (4 diffs)
• ratgring.h (modified) (2 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.35 2009-02-27 16:56:51 levandov Exp $ */
+/* $Id: gr_kstd2.cc,v 1.36 2009-02-27 19:30:47 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -1190 +1190 @@
       /* enter P.p into s and L */
       {
+/* quick unit detection in the rational case */
+#ifdef HAVE_RATGRING
+        if( rIsRatGRing(currRing) )
+        {
+          if ( p_LmIsConstantRat(strat->P.p, currRing) )
+          {
+#ifdef PDEBUG
+             Print("unit element detected:"); 
+             p_wrp(strat->P.p,currRing);
+#endif
+            p_Delete(&strat->P.p,currRing, strat->tailRing);
+            strat->P.p = pOne();
+          }
+      }
+#endif
         strat->P.sev=0;
         int pos=posInS(strat,strat->sl,strat->P.p, strat->P.ecart);

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.36 2009-02-26 14:30:23 Singular Exp $ */
+/* $Id: polys1.cc,v 1.37 2009-02-27 19:30:47 levandov Exp $ */
 
 /*
@@ -1058 +1058 @@
     if (rIsRatGRing(currRing))
     {
+      /* quick unit detection in the rational case is done in gr_nc_bba */
       pContentRat(ph);
       start=ph;

kernel/ratgring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: ratgring.cc,v 1.22 2009-02-26 14:24:23 Singular Exp $
+ *  Version: $Id: ratgring.cc,v 1.23 2009-02-27 19:30:47 levandov Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -416 +416 @@
   }
 
+  if ( (p_LmIsConstantRat(p1,r)) || (p_LmIsConstantRat(p2,r)) )
+  {
+    p_Delete(&p1,r);
+    p_Delete(&p2,r);
+    return( NULL );
+  }
+
+
 /* note: prod. crit does not apply! */
   poly pL=pOne();
@@ -528 +536 @@
     return(NULL);
   }
+
+  if (p_LmIsConstantRat(p1,r))
+  {
+    return( NULL );
+  }
+
 
   int is = ishift; /* TODO */
@@ -794 +808 @@
   omFree(L);
 }
-#endif
+
+// test if monomial is a constant, i.e. if all exponents and the component
+// is zero
+BOOLEAN p_LmIsConstantRat(const poly p, const ring r)
+{
+  if (p_LmIsConstantCompRat(p, r))
+    return (p_GetComp(p, r) == 0);
+  return FALSE;
+}
+
+// test if the monomial is a constant as a vector component
+// i.e., test if all exponents are zero
+BOOLEAN p_LmIsConstantCompRat(const poly p, const ring r)
+{
+  int i = r->real_var_end;
+
+  while ( (p_GetExp(p,i,r)==0) && (i>=r->real_var_start))
+  {
+    i--;
+  }
+  return ( i+1 == r->real_var_start );
+}
+
+#endif

kernel/ratgring.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ratgring.h,v 1.11 2009-02-26 14:24:32 Singular Exp $ */
+/* $Id: ratgring.h,v 1.12 2009-02-27 19:30:47 levandov Exp $ */
 /*
 * ABSTRACT additional defines etc for --with-plural
@@ -117 +117 @@
 void pContentRat(poly &ph);
 
+BOOLEAN p_LmIsConstantRat(const poly p, const ring r);
+
+BOOLEAN p_LmIsConstantCompRat(const poly p, const ring r);
+
 #endif /* HAVE_PLURAL */
 #endif