Changeset 84d6c3 in git

Timestamp:

May 9, 2000, 4:35:11 PM (24 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

a9cf54361b742e9fc5c8efe5927396e566518869

Parents:

87a8156a442b896f42878bb29b9c2a183cd30a18

Message:

*hannes: V_DEG_STOP


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

Location:

Singular

Files:

• iparith.cc (modified) (5 diffs)
• kstd1.cc (modified) (5 diffs)
• kstd1.h (modified) (2 diffs)
• tok.h (modified) (3 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.209 2000-04-13 13:01:49 Singular Exp $ */
+/* $Id: iparith.cc,v 1.210 2000-05-09 14:35:11 Singular Exp $ */
 
 /*
@@ -271 +271 @@
   { "random",      0, RANDOM_CMD ,        CMD_23},
   { "read",        0, READ_CMD ,          CMD_12},
-  { "reduce",      0, REDUCE_CMD ,        CMD_23},
+  { "reduce",      0, REDUCE_CMD ,        CMD_M},
   { "regularity",  0, REGULARITY_CMD ,    CMD_1},
   { "reservedName",0, RESERVEDNAME_CMD ,  CMD_M},
@@ -316 +316 @@
 /* delete for next version:*/
   { "IN",          1, LEAD_CMD ,          CMD_1},
-  { "NF",          1, REDUCE_CMD ,        CMD_23},
+  { "NF",          1, REDUCE_CMD ,        CMD_M},
   { "multiplicity",1, MULTIPLICITY_CMD ,  CMD_1},
   { "verbose",     2, OPTION_CMD ,        CMD_M},
@@ -4789 +4789 @@
   return setOption(res,v);
 }
+static BOOLEAN jjREDUCE4(leftv res, leftv v)
+{
+  // poly, ideal, deg, weights
+  leftv u1=v;
+  leftv u2=v->next;
+  leftv u3=u2->next; u2->next=NULL;
+  leftv u4=u3->next;
+  if ((u3->Typ()!=INT_CMD)||(u4->Typ()!=INTVEC_CMD))
+  {
+    Werror("%s(`poly`,`ideal`,`int`,`intvec`) exppected",Tok2Cmdname(iiOp));
+    return TRUE;
+  }
+  int save_d=Kstd1_deg;
+  Kstd1_deg=(int)u3->Data();
+  kModW=(intvec *)u4->Data();
+  BITSET save=verbose;
+  verbose|=Sy_bit(V_DEG_STOP);
+  BOOLEAN r=jjCALL2ARG(res,v);
+  kModW=NULL;
+  Kstd1_deg=save_d;
+  verbose=save;
+  v->next->next=u3;
+  return r;
+}
 static BOOLEAN jjRESERVED0(leftv res, leftv v)
 {
@@ -5016 +5040 @@
 ,{jjNAMES0,    NAMES_CMD,       LIST_CMD,            0 }
 ,{jjOPTION_PL, OPTION_CMD,      STRING_CMD/*or set by p*/,-1 }
+,{jjCALL2ARG,  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          2  }
+,{jjCALL3ARG,  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          3  }
+,{jjREDUCE4,   REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          4  }
 ,{jjCALL1ARG,  RESERVEDNAME_CMD, INT_CMD,            1 }
 ,{jjRESERVED0, RESERVEDNAME_CMD, NONE,               0 }

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.49 2000-03-31 13:44:50 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.50 2000-05-09 14:35:10 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -696 +696 @@
 static poly redMoraNF (poly h,kStrategy strat, int flag)
 {
-  poly pi;
   LObject H;
-  int o,ei,li;
+  H.p = h;
   int j = 0;
   int z = 10;
-  unsigned long not_sev;
-  H.p = h;
-  o = pFDeg(h);
+  int o = pFDeg(h);
   H.ecart = pLDeg(H.p,&H.length)-o;
   if (flag==0) cancelunit(&H);
   H.sev = pGetShortExpVector(H.p);
-  not_sev = ~ H.sev;
+  unsigned long not_sev = ~ H.sev;
   loop
   {
@@ -713 +710 @@
     {
       return H.p;
+    }
+    if (TEST_V_DEG_STOP)
+    {
+      if (kModDeg(H.p)>Kstd1_deg) pDelete1(&H.p);
+      if (H.p==NULL) return NULL;
     }
     if (pShortDivisibleBy(strat->T[j].p, strat->T[j].sev, H.p, not_sev))
@@ -718 +720 @@
       //if (strat->interpt) test_int_std(strat->kIdeal);
       /*- remember the found T-poly -*/
-      pi = strat->T[j].p;
-      ei = strat->T[j].ecart;
-      li = strat->T[j].length;
+      poly pi = strat->T[j].p;
+      int ei = strat->T[j].ecart;
+      int li = strat->T[j].length;
       /*
       * the polynomial to reduce with (up to the moment) is;
@@ -1470 +1472 @@
   test&=~Sy_bit(OPT_INTSTRATEGY);
   if (TEST_OPT_STAIRCASEBOUND
+  && (! TEST_V_DEG_STOP)
   && (0<Kstd1_deg)
   && ((!strat->kHEdgeFound)

Singular/kstd1.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.h,v 1.12 2000-03-31 13:45:04 Singular Exp $ */
+/* $Id: kstd1.h,v 1.13 2000-05-09 14:33:03 Singular Exp $ */
 /*
 * ABSTRACT
@@ -76 +76 @@
 30 noRedSyz
 31 weight
+verbose:31 stop at certain weights
 */
 

Singular/tok.h

@@ -7 +7 @@
 * ABSTRACT: tokens, types for interpreter; general macros
 */
-/* $Id: tok.h,v 1.40 2000-03-31 13:46:37 Singular Exp $ */
+/* $Id: tok.h,v 1.41 2000-05-09 14:33:03 Singular Exp $ */
 
 #ifndef MYYSTYPE
@@ -174 +174 @@
 #define V_PROMPT    13
 #define V_NSB       14
-
-#define TEST_VERB_NSB              BVERBOSE(V_NSB)
+#define V_DEG_STOP  31
+
 
 #define OPT_PROT           0
@@ -220 +220 @@
 #define TEST_OPT_WEIGHTM           BTEST1(OPT_WEIGHTM)
 
-#endif
+#define TEST_VERB_NSB              BVERBOSE(V_NSB)
+#define TEST_V_DEG_STOP            BVERBOSE(V_DEG_STOP)
+
+#endif