Changeset 82f0a0 in git

Timestamp:

Mar 31, 2000, 3:46:37 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

32b04047175450d7f08bf7246ee082c2f88b4a2e

Parents:

600ac43bf6be4e2598175f66e5bf2093fb56aee3

Message:

*hannes: option infredtail


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

Location:

Singular

Files:

• kutil.cc (modified) (3 diffs)
• misc.cc (modified) (1 diff)
• tok.h (modified) (5 diffs)

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.52 2000-03-31 13:18:22 Singular Exp $ */
+/* $Id: kutil.cc,v 1.53 2000-03-31 13:45:27 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2249 +2249 @@
     int op = pFDeg(hn);
     BOOLEAN save_HE=strat->kHEdgeFound;
-    strat->kHEdgeFound |= ((Kstd1_deg>0) && (op<=Kstd1_deg));
+    strat->kHEdgeFound |= ((Kstd1_deg>0) && (op<=Kstd1_deg))
+                          || TEST_OPT_INFREDTAIL;
     loop
     {
@@ -2262 +2263 @@
         )
         {
+          strat->redTailChange=TRUE;
           ksOldSpolyTail(strat->S[j], p, h, strat->kNoether);
           hn = pNext(h);

Singular/misc.cc

@@ -304 +304 @@
   {"redTail",      Sy_bit(OPT_REDTAIL),        ~Sy_bit(OPT_REDTAIL)  },
   {"intStrategy",  Sy_bit(OPT_INTSTRATEGY),    ~Sy_bit(OPT_INTSTRATEGY)  },
+  {"infRedTail",   Sy_bit(OPT_INFREDTAIL),     ~Sy_bit(OPT_INFREDTAIL)  },
   /* 30: use not regularity for syz */
   {"notRegularity",Sy_bit(OPT_NOTREGULARITY),  ~Sy_bit(OPT_NOTREGULARITY)  },

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.39 2000-02-10 16:09:03 Singular Exp $ */
+/* $Id: tok.h,v 1.40 2000-03-31 13:46:37 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -187 +187 @@
 #define OPT_RETURN_SB      9
 #define OPT_FASTHC        10
+#define OPT_REDBEST       20
 #define OPT_KEEPVARS      21
 #define OPT_STAIRCASEBOUND 22
@@ -193 +194 @@
 #define OPT_REDTAIL       25
 #define OPT_INTSTRATEGY   26
+#define OPT_INFREDTAIL    28
 #define OPT_SB_1          29
 #define OPT_NOTREGULARITY 30
@@ -204 +206 @@
 #define TEST_OPT_MOREPAIRS         BTEST1(OPT_MOREPAIRS)
 #define TEST_OPT_FASTHC            BTEST1(OPT_FASTHC)
+#define TEST_OPT_REDBEST           BTEST1(OPT_REDBEST)
 #define TEST_OPT_INTSTRATEGY       BTEST1(OPT_INTSTRATEGY)
 #define TEST_OPT_CANCELUNIT        BTEST1(OPT_CANCELUNIT)
@@ -212 +215 @@
 #define TEST_OPT_STAIRCASEBOUND    BTEST1(OPT_STAIRCASEBOUND)
 #define TEST_OPT_REDTAIL           BTEST1(OPT_REDTAIL)
+#define TEST_OPT_INFREDTAIL        BTEST1(OPT_INFREDTAIL)
 #define TEST_OPT_SB_1              BTEST1(OPT_SB_1)
 #define TEST_OPT_NOTREGULARITY     BTEST1(OPT_NOTREGULARITY)