Changeset 454cb0 in git

Timestamp:

Feb 22, 2009, 12:22:08 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

cb2088b08c04fc873962bfeb02cfb4f0674d5dc1

Parents:

cce4a2f69a8341c6b8fbb3f1e78b41bf26ed7970

Message:

*hannes: rIsRatGRing


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

Location:

kernel

Files:

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

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.26 2009-02-21 15:25:43 levandov Exp $ */
+/* $Id: gr_kstd2.cc,v 1.27 2009-02-22 11:22:08 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -1116 +1116 @@
       pLmFree(strat->P.p);
       /* the real one */
-      if (ncRingType(currRing)==nc_lie) /* prod crit */
-        if(pHasNotCF(strat->P.p1,strat->P.p2))
-        {
+//      if (ncRingType(currRing)==nc_lie) /* prod crit */
+//        if(pHasNotCF(strat->P.p1,strat->P.p2))
+//        {
 //          strat->cp++;
-          /* prod.crit itself in nc_CreateSpoly */
-        }
+//          /* prod.crit itself in nc_CreateSpoly */
+//        }
 
       strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,currRing);

kernel/ring.h

@@ -7 +7 @@
 * ABSTRACT - the interpreter related ring operations
 */
-/* $Id: ring.h,v 1.38 2009-02-21 17:50:29 Singular Exp $ */
+/* $Id: ring.h,v 1.39 2009-02-22 11:22:08 Singular Exp $ */
 
 /* includes */
@@ -39 +39 @@
   nc_struct *n;
   return (r != NULL) && ((n=r->GetNC()) != NULL) /*&& (n->type != nc_error)*/; 
+#else
+  return false;
+#endif
+}
+
+inline bool rIsRatGRing(const ring r)
+{
+#ifdef HAVE_PLURAL
+  nc_struct *n;
+  return (r != NULL) && ((n=r->GetNC()) != NULL) 
+          && (r->real_var_start>1);
 #else
   return false;