Changeset 660ed3 in git

Timestamp:

May 19, 2006, 12:22:37 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

3738560c53e0c131ed96fee80506af636585777c

Parents:

0196493023ab83f32542ed429da0d4c721b4c5c8

Message:

*hannes: degBound


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

Files:

• Singular/iparith.cc (modified) (3 diffs)
• kernel/kutil.cc (modified) (2 diffs)
• kernel/kutil.h (modified) (4 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.396 2006-05-16 08:47:37 bricken Exp $ */
+/* $Id: iparith.cc,v 1.397 2006-05-19 10:22:37 Singular Exp $ */
 
 /*
@@ -2672 +2672 @@
   idSkipZeroes(result);
   res->data = (char *)result;
-  setFlag(res,FLAG_STD);
+  if(!TEST_OPT_DEGBOUND) setFlag(res,FLAG_STD);
   if (w!=NULL) atSet(res,omStrDup("isHomog"),w,INTVEC_CMD);
   return FALSE;
@@ -3919 +3919 @@
   idSkipZeroes(result);
   res->data = (char *)result;
-  setFlag(res,FLAG_STD);
+  if(!TEST_OPT_DEGBOUND) setFlag(res,FLAG_STD);
   if (w!=NULL) atSet(res,omStrDup("isHomog"),w,INTVEC_CMD);
   return FALSE;

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.22 2006-05-08 12:55:11 Singular Exp $ */
+/* $Id: kutil.cc,v 1.23 2006-05-19 10:22:36 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -900 +900 @@
 {
   assume(p_sev == pGetShortExpVector(p));
+  if (strat->noClearS) return;
   if (!pLmShortDivisibleBy(p,p_sev, strat->S[*at], ~ strat->sevS[*at])) return;
   deleteInS((*at),strat);

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.15 2006-03-20 20:33:57 wienand Exp $ */
+/* $Id: kutil.h,v 1.16 2006-05-19 10:22:36 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -279 +279 @@
   poly    t_kNoether;
   BOOLEAN * NotUsedAxis;
+  BOOLEAN * pairtest;/*used for enterOnePair*/
   poly tail;
   leftv kIdeal;
@@ -317 +318 @@
   BOOLEAN use_buckets;
   BOOLEAN interred_flag;
-  BOOLEAN *pairtest;/*used for enterOnePair*/
   // if set, pLDeg(p, l) == (pFDeg(pLast(p), pLength)
   BOOLEAN LDegLast;
@@ -328 +328 @@
   char    news;
   char    newt;/*used for messageSets*/
+  char    noClearS;
 
   skStrategy();