Changeset 84d6c3 in git


Ignore:
Timestamp:
May 9, 2000, 4:35:11 PM (24 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '79dfb9a6d258bfeb991428bdb25b8f55e9e809b2')
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:
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r87a8156 r84d6c3  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.209 2000-04-13 13:01:49 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.210 2000-05-09 14:35:11 Singular Exp $ */
    55
    66/*
     
    271271  { "random",      0, RANDOM_CMD ,        CMD_23},
    272272  { "read",        0, READ_CMD ,          CMD_12},
    273   { "reduce",      0, REDUCE_CMD ,        CMD_23},
     273  { "reduce",      0, REDUCE_CMD ,        CMD_M},
    274274  { "regularity",  0, REGULARITY_CMD ,    CMD_1},
    275275  { "reservedName",0, RESERVEDNAME_CMD ,  CMD_M},
     
    316316/* delete for next version:*/
    317317  { "IN",          1, LEAD_CMD ,          CMD_1},
    318   { "NF",          1, REDUCE_CMD ,        CMD_23},
     318  { "NF",          1, REDUCE_CMD ,        CMD_M},
    319319  { "multiplicity",1, MULTIPLICITY_CMD ,  CMD_1},
    320320  { "verbose",     2, OPTION_CMD ,        CMD_M},
     
    47894789  return setOption(res,v);
    47904790}
     4791static BOOLEAN jjREDUCE4(leftv res, leftv v)
     4792{
     4793  // poly, ideal, deg, weights
     4794  leftv u1=v;
     4795  leftv u2=v->next;
     4796  leftv u3=u2->next; u2->next=NULL;
     4797  leftv u4=u3->next;
     4798  if ((u3->Typ()!=INT_CMD)||(u4->Typ()!=INTVEC_CMD))
     4799  {
     4800    Werror("%s(`poly`,`ideal`,`int`,`intvec`) exppected",Tok2Cmdname(iiOp));
     4801    return TRUE;
     4802  }
     4803  int save_d=Kstd1_deg;
     4804  Kstd1_deg=(int)u3->Data();
     4805  kModW=(intvec *)u4->Data();
     4806  BITSET save=verbose;
     4807  verbose|=Sy_bit(V_DEG_STOP);
     4808  BOOLEAN r=jjCALL2ARG(res,v);
     4809  kModW=NULL;
     4810  Kstd1_deg=save_d;
     4811  verbose=save;
     4812  v->next->next=u3;
     4813  return r;
     4814}
    47914815static BOOLEAN jjRESERVED0(leftv res, leftv v)
    47924816{
     
    50165040,{jjNAMES0,    NAMES_CMD,       LIST_CMD,            0 }
    50175041,{jjOPTION_PL, OPTION_CMD,      STRING_CMD/*or set by p*/,-1 }
     5042,{jjCALL2ARG,  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          2  }
     5043,{jjCALL3ARG,  REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          3  }
     5044,{jjREDUCE4,   REDUCE_CMD,      IDEAL_CMD/*or set by p*/,          4  }
    50185045,{jjCALL1ARG,  RESERVEDNAME_CMD, INT_CMD,            1 }
    50195046,{jjRESERVED0, RESERVEDNAME_CMD, NONE,               0 }
  • Singular/kstd1.cc

    r87a8156 r84d6c3  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kstd1.cc,v 1.49 2000-03-31 13:44:50 Singular Exp $ */
     4/* $Id: kstd1.cc,v 1.50 2000-05-09 14:35:10 Singular Exp $ */
    55/*
    66* ABSTRACT:
     
    696696static poly redMoraNF (poly h,kStrategy strat, int flag)
    697697{
    698   poly pi;
    699698  LObject H;
    700   int o,ei,li;
     699  H.p = h;
    701700  int j = 0;
    702701  int z = 10;
    703   unsigned long not_sev;
    704   H.p = h;
    705   o = pFDeg(h);
     702  int o = pFDeg(h);
    706703  H.ecart = pLDeg(H.p,&H.length)-o;
    707704  if (flag==0) cancelunit(&H);
    708705  H.sev = pGetShortExpVector(H.p);
    709   not_sev = ~ H.sev;
     706  unsigned long not_sev = ~ H.sev;
    710707  loop
    711708  {
     
    713710    {
    714711      return H.p;
     712    }
     713    if (TEST_V_DEG_STOP)
     714    {
     715      if (kModDeg(H.p)>Kstd1_deg) pDelete1(&H.p);
     716      if (H.p==NULL) return NULL;
    715717    }
    716718    if (pShortDivisibleBy(strat->T[j].p, strat->T[j].sev, H.p, not_sev))
     
    718720      //if (strat->interpt) test_int_std(strat->kIdeal);
    719721      /*- remember the found T-poly -*/
    720       pi = strat->T[j].p;
    721       ei = strat->T[j].ecart;
    722       li = strat->T[j].length;
     722      poly pi = strat->T[j].p;
     723      int ei = strat->T[j].ecart;
     724      int li = strat->T[j].length;
    723725      /*
    724726      * the polynomial to reduce with (up to the moment) is;
     
    14701472  test&=~Sy_bit(OPT_INTSTRATEGY);
    14711473  if (TEST_OPT_STAIRCASEBOUND
     1474  && (! TEST_V_DEG_STOP)
    14721475  && (0<Kstd1_deg)
    14731476  && ((!strat->kHEdgeFound)
  • Singular/kstd1.h

    r87a8156 r84d6c3  
    44*  Computer Algebra System SINGULAR     *
    55****************************************/
    6 /* $Id: kstd1.h,v 1.12 2000-03-31 13:45:04 Singular Exp $ */
     6/* $Id: kstd1.h,v 1.13 2000-05-09 14:33:03 Singular Exp $ */
    77/*
    88* ABSTRACT
     
    767630 noRedSyz
    777731 weight
     78verbose:31 stop at certain weights
    7879*/
    7980
  • Singular/tok.h

    r87a8156 r84d6c3  
    77* ABSTRACT: tokens, types for interpreter; general macros
    88*/
    9 /* $Id: tok.h,v 1.40 2000-03-31 13:46:37 Singular Exp $ */
     9/* $Id: tok.h,v 1.41 2000-05-09 14:33:03 Singular Exp $ */
    1010
    1111#ifndef MYYSTYPE
     
    174174#define V_PROMPT    13
    175175#define V_NSB       14
    176 
    177 #define TEST_VERB_NSB              BVERBOSE(V_NSB)
     176#define V_DEG_STOP  31
     177
    178178
    179179#define OPT_PROT           0
     
    220220#define TEST_OPT_WEIGHTM           BTEST1(OPT_WEIGHTM)
    221221
    222 #endif
     222#define TEST_VERB_NSB              BVERBOSE(V_NSB)
     223#define TEST_V_DEG_STOP            BVERBOSE(V_DEG_STOP)
     224
     225#endif
Note: See TracChangeset for help on using the changeset viewer.