Changeset b8f199 in git


Ignore:
Timestamp:
Mar 16, 2011, 4:42:56 PM (13 years ago)
Author:
Frank Seelisch <seelisch@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '3720ae8bfcff4a4649ee98a15552089151d2d59b')
Children:
fddf1c0b111391917a4d5965b7ddf45adb7c05d6
Parents:
ac434faa72fa3537bfa0e82a2b6492249ea618d8
Message:
deny qring with constant generator / disable hilb/degree/std_hilb / cleanup prune

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

Legend:

Unmodified
Added
Removed
  • Singular/ipassign.cc

    rac434f rb8f199  
    601601  if ((idElem(id)>1) || rIsSCA(currRing) || (currRing->qideal!=NULL))
    602602    assumeStdFlag(a);
     603   
     604#ifdef HAVE_RINGS
     605  if (rField_is_Ring(currRing))
     606  {
     607    int constIndex = idPosConstant(id);
     608    if (constIndex != -1)
     609    WerrorS("ideal contains constant; please modify ground field/ring instead");
     610    return TRUE;
     611  }
     612#endif
    603613
    604614  if (currRing->qideal!=NULL) /* we are already in a qring! */
  • Singular/table.h

    rac434f rb8f199  
    7979,{D(jjDEG),        DEG_CMD,         INT_CMD,        VECTOR_CMD    , ALLOW_PLURAL |ALLOW_RING}
    8080,{D(jjDEG_M),      DEG_CMD,         INT_CMD,        MATRIX_CMD    , ALLOW_PLURAL |ALLOW_RING}
    81 ,{D(jjDEGREE),     DEGREE_CMD,      NONE,           IDEAL_CMD     , NO_PLURAL |ALLOW_RING}
    82 ,{D(jjDEGREE),     DEGREE_CMD,      NONE,           MODUL_CMD     , NO_PLURAL |ALLOW_RING}
     81,{D(jjDEGREE),     DEGREE_CMD,      NONE,           IDEAL_CMD     , NO_PLURAL |NO_RING}
     82,{D(jjDEGREE),     DEGREE_CMD,      NONE,           MODUL_CMD     , NO_PLURAL |NO_RING}
    8383,{D(jjDEFINED),    DEFINED_CMD,     INT_CMD,        DEF_CMD       , ALLOW_PLURAL |ALLOW_RING}
    8484#ifdef HAVE_FACTORY
     
    116116,{D(jjHIGHCORNER), HIGHCORNER_CMD,  POLY_CMD,       IDEAL_CMD     , NO_PLURAL |ALLOW_RING}
    117117,{D(jjHIGHCORNER_M), HIGHCORNER_CMD,VECTOR_CMD,     MODUL_CMD     , NO_PLURAL |ALLOW_RING}
    118 ,{D(jjHILBERT),    HILBERT_CMD,     NONE,           IDEAL_CMD     , NO_PLURAL |ALLOW_RING}
    119 ,{D(jjHILBERT),    HILBERT_CMD,     NONE,           MODUL_CMD     , NO_PLURAL |ALLOW_RING}
    120 ,{D(jjHILBERT_IV), HILBERT_CMD,     INTVEC_CMD,     INTVEC_CMD    , NO_PLURAL |ALLOW_RING}
     118,{D(jjHILBERT),    HILBERT_CMD,     NONE,           IDEAL_CMD     , NO_PLURAL |NO_RING}
     119,{D(jjHILBERT),    HILBERT_CMD,     NONE,           MODUL_CMD     , NO_PLURAL |NO_RING}
     120,{D(jjHILBERT_IV), HILBERT_CMD,     INTVEC_CMD,     INTVEC_CMD    , NO_PLURAL |NO_RING}
    121121,{D(jjHOMOG1),     HOMOG_CMD,       INT_CMD,        IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
    122122,{D(jjHOMOG1),     HOMOG_CMD,       INT_CMD,        MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}
     
    544544,{  jjWRONG2 ,    GCD_CMD,        POLY_CMD,       POLY_CMD,   POLY_CMD, NO_PLURAL |NO_RING}
    545545#endif
    546 ,{D(jjHILBERT2),  HILBERT_CMD,    INTVEC_CMD,     IDEAL_CMD,  INT_CMD, NO_PLURAL |ALLOW_RING}
    547 ,{D(jjHILBERT2),  HILBERT_CMD,    INTVEC_CMD,     MODUL_CMD,  INT_CMD, NO_PLURAL |ALLOW_RING}
     546,{D(jjHILBERT2),  HILBERT_CMD,    INTVEC_CMD,     IDEAL_CMD,  INT_CMD, NO_PLURAL |NO_RING}
     547,{D(jjHILBERT2),  HILBERT_CMD,    INTVEC_CMD,     MODUL_CMD,  INT_CMD, NO_PLURAL |NO_RING}
    548548,{D(jjHOMOG1_W),  HOMOG_CMD,      INT_CMD,        IDEAL_CMD,  INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
    549549,{D(jjHOMOG1_W),  HOMOG_CMD,      INT_CMD,        MODUL_CMD,   INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
     
    646646,{D(jjSTD_1),     STD_CMD,        IDEAL_CMD,      IDEAL_CMD,  IDEAL_CMD, ALLOW_PLURAL |ALLOW_RING}
    647647,{D(jjSTD_1),     STD_CMD,        MODUL_CMD,      MODUL_CMD,  MODUL_CMD, ALLOW_PLURAL |ALLOW_RING}
    648 ,{D(jjSTD_HILB),  STD_CMD,        IDEAL_CMD,      IDEAL_CMD,  INTVEC_CMD, NO_PLURAL |ALLOW_RING}
    649 ,{D(jjSTD_HILB),  STD_CMD,        MODUL_CMD,      MODUL_CMD,  INTVEC_CMD, NO_PLURAL |ALLOW_RING}
     648,{D(jjSTD_HILB),  STD_CMD,        IDEAL_CMD,      IDEAL_CMD,  INTVEC_CMD, NO_PLURAL |NO_RING}
     649,{D(jjSTD_HILB),  STD_CMD,        MODUL_CMD,      MODUL_CMD,  INTVEC_CMD, NO_PLURAL |NO_RING}
    650650,{D(jjVARSTR2),   VARSTR_CMD,     STRING_CMD,     RING_CMD,   INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    651651,{D(jjVARSTR2),   VARSTR_CMD,     STRING_CMD,     QRING_CMD,  INT_CMD, ALLOW_PLURAL |ALLOW_RING}
     
    682682,{D(jjFIND3),          FIND_CMD,   INT_CMD,    STRING_CMD, STRING_CMD, INT_CMD, ALLOW_PLURAL |ALLOW_RING}
    683683,{D(jjFWALK3),         FWALK_CMD,  IDEAL_CMD,  RING_CMD,   DEF_CMD,    INT_CMD, NO_PLURAL |ALLOW_RING}
    684 ,{D(jjHILBERT3),       HILBERT_CMD,INTVEC_CMD, IDEAL_CMD,  INT_CMD,    INTVEC_CMD, NO_PLURAL |ALLOW_RING}
    685 ,{D(jjHILBERT3),       HILBERT_CMD,INTVEC_CMD, MODUL_CMD,  INT_CMD,    INTVEC_CMD, NO_PLURAL |ALLOW_RING}
     684,{D(jjHILBERT3),       HILBERT_CMD,INTVEC_CMD, IDEAL_CMD,  INT_CMD,    INTVEC_CMD, NO_PLURAL |NO_RING}
     685,{D(jjHILBERT3),       HILBERT_CMD,INTVEC_CMD, MODUL_CMD,  INT_CMD,    INTVEC_CMD, NO_PLURAL |NO_RING}
    686686,{D(jjHOMOG_P_W),      HOMOG_CMD,  POLY_CMD,   POLY_CMD,   POLY_CMD,   INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
    687687,{D(jjHOMOG_P_W),      HOMOG_CMD,  VECTOR_CMD, VECTOR_CMD, POLY_CMD,   INTVEC_CMD, ALLOW_PLURAL |ALLOW_RING}
     
    745745#endif
    746746,{D(jjSTATUS3),        STATUS_CMD, INT_CMD,    LINK_CMD,   STRING_CMD, STRING_CMD, ALLOW_PLURAL |ALLOW_RING}
    747 ,{D(jjSTD_HILB_W),     STD_CMD,    IDEAL_CMD,  IDEAL_CMD,  INTVEC_CMD, INTVEC_CMD, NO_PLURAL |ALLOW_RING}
    748 ,{D(jjSTD_HILB_W),     STD_CMD,    MODUL_CMD,  MODUL_CMD,  INTVEC_CMD, INTVEC_CMD, NO_PLURAL |ALLOW_RING}
     747,{D(jjSTD_HILB_W),     STD_CMD,    IDEAL_CMD,  IDEAL_CMD,  INTVEC_CMD, INTVEC_CMD, NO_PLURAL |NO_RING}
     748,{D(jjSTD_HILB_W),     STD_CMD,    MODUL_CMD,  MODUL_CMD,  INTVEC_CMD, INTVEC_CMD, NO_PLURAL |NO_RING}
    749749,{D(jjSUBST_P),        SUBST_CMD,  POLY_CMD,   POLY_CMD,   POLY_CMD,   POLY_CMD , ALLOW_PLURAL |ALLOW_RING}
    750750,{D(jjSUBST_P),        SUBST_CMD,  POLY_CMD,   POLY_CMD,   POLY_CMD,   POLY_CMD , ALLOW_PLURAL |ALLOW_RING}
     
    816816,{D(jjCALL2ARG),  STD_CMD,         IDEAL_CMD,           2      , ALLOW_PLURAL |ALLOW_RING}
    817817,{D(jjCALL3ARG),  STD_CMD,         IDEAL_CMD,           3      , NO_PLURAL |ALLOW_RING}
    818 ,{D(jjSTD_HILB_WP), STD_CMD,       IDEAL_CMD,           4      , NO_PLURAL |ALLOW_RING}
     818,{D(jjSTD_HILB_WP), STD_CMD,       IDEAL_CMD,           4      , NO_PLURAL |NO_RING}
    819819,{D(jjQRDS),      QRDS_CMD,        LIST_CMD,            4      , ALLOW_PLURAL |ALLOW_RING}
    820820,{D(jjFactModD_M),FMD_CMD,         LIST_CMD,           -2      , ALLOW_PLURAL |ALLOW_RING}
  • kernel/ideals.cc

    rac434f rb8f199  
    12011201  if (w!=NULL) delete w;
    12021202  idDelete(&temp);
    1203 
    12041203  if(syz_ring!=orig_ring)
    12051204    rChangeCurrRing(orig_ring);
     
    38393838
    38403839/*3
    3841 * searches for units in the components of the module arg and
    3842 * returns the first one
    3843 */
    3844 static int idReadOutUnits(ideal arg,int* comp)
     3840* searches for the next unit in the components of the module arg and
     3841* returns the first one;
     3842*/
     3843static int idReadOutPivot(ideal arg,int* comp)
    38453844{
    38463845  if (idIs0(arg)) return -1;
     
    38593858      if (componentIsUsed[j]==0)
    38603859      {
     3860#ifdef HAVE_RINGS
     3861        if (pLmIsConstantComp(p) && rField_is_Ring(currRing) &&
     3862            nIsUnit(pGetCoeff(p)))
     3863        {
     3864#else
    38613865        if (pLmIsConstantComp(p))
    38623866        {
     3867#endif
    38633868          generator = i;
    38643869          componentIsUsed[j] = 1;
     
    39503955  int i,next_gen,next_comp;
    39513956  ideal res=arg;
    3952 
    39533957  if (!inPlace) res = idCopy(arg);
    39543958  res->rank=si_max(res->rank,idRankFreeModule(res));
     
    39593963  loop
    39603964  {
    3961     next_gen = idReadOutUnits(res,&next_comp);
     3965    next_gen = idReadOutPivot(res,&next_comp);
    39623966    if (next_gen<0) break;
    39633967    del++;
Note: See TracChangeset for help on using the changeset viewer.