Changeset 0b4ec2 in git

Timestamp:

Feb 23, 2009, 12:26:29 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e5408173a819cf24009069d4443ae2c98be47c45

Parents:

05eb8c338d5239a2e038f0b776772d795b3ac14e

Message:

*hannes: use rIsRatGRing


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

Location:

kernel

Files:

• gr_kstd2.cc (modified) (4 diffs)
• kutil.cc (modified) (4 diffs)
• ring.h (modified) (2 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.27 2009-02-22 11:22:08 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.28 2009-02-23 11:26:29 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -170 +170 @@
   if (p==NULL) return;
   poly root=p;
-  assume(currRing->real_var_start>0);
+  assume(rIsRatGRing(currRing));
   poly f=pHead(p);
   int i;
@@ -981 +981 @@
     strat->red = redGrFirst;
 #ifdef HAVE_RATGRING
-  if (currRing->real_var_start>0)
+  if (rIsRatGRing(currRing))
   {
     int ii=IDELEMS(F)-1;
@@ -1074 +1074 @@
   nc_gr_initBba(F,strat);
   initBuchMoraPos(strat);
-  if (currRing->real_var_start>0)
+  if (rIsRatGRing(currRing))
   {
     strat->posInL=posInL0; // by pCmp of lcm

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.122 2009-02-23 10:59:20 Singular Exp $ */
+/* $Id: kutil.cc,v 1.123 2009-02-23 11:26:29 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -160 +160 @@
   {
 #ifdef HAVE_PLURAL
-    if (currRing->real_var_start>0)
+    if (rIsRatGRing(currRing))
     {
       if (_p_LmDivisibleByPart(p,currRing,
@@ -2296 +2296 @@
     if (new_pair) 
     {
-#ifdef HAVE_PLURAL
-      if (currRing->real_var_start>0)
-        chainCritPart(h,ecart,strat);
-      else
-#endif
       strat->chainCrit(h,ecart,strat);
     }
@@ -5548 +5543 @@
   }
 #endif
+#ifdef HAVE_PLURAL
+  if (rIsRatGRing(currRing))
+  {
+     strat->chainCrit=chainCritPart;
+  }
+#endif
 
   strat->sugarCrit =        TEST_OPT_SUGARCRIT;

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.39 2009-02-22 11:22:08 Singular Exp $ */
+/* $Id: ring.h,v 1.40 2009-02-23 11:26:29 Singular Exp $ */
 
 /* includes */
@@ -48 +48 @@
 #ifdef HAVE_PLURAL
   nc_struct *n;
-  return (r != NULL) && ((n=r->GetNC()) != NULL) 
+  return (r != NULL) /* && ((n=r->GetNC()) != NULL) */
           && (r->real_var_start>1);
 #else