Changeset 6b971d in git


Ignore:
Timestamp:
Jul 25, 2011, 7:18:06 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
15bb91833fa965fdd1eab30eb3d6abcb55565969
Parents:
3dd0640ba1b8ca0d5fc4aa74c81faaa7eb5129fc
Message:
degree returns a string now

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

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    r3dd0640 r6b971d  
    36243624static BOOLEAN jjDEGREE(leftv res, leftv v)
    36253625{
     3626  SPrintStart();
    36263627#ifdef HAVE_RINGS
    36273628  if (rField_is_Ring_Z(currRing))
    … …  
    36463647    rChangeCurrRing(origR);
    36473648    rDelete(tempR);
    3648     return FALSE;
    36493649  }
    36503650#endif
    … …  
    36523652  intvec *module_w=(intvec*)atGet(v,"isHomog",INTVEC_CMD);
    36533653  scDegree((ideal)v->Data(),module_w,currQuotient);
     3654  res->data=(void*)SPrintEnd();
    36543655  return FALSE;
    36553656}

  • Singular/table.h

    r3dd0640 r6b971d  
    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 | NO_ZERODIVISOR}
    82 ,{D(jjDEGREE),     DEGREE_CMD,      NONE,           MODUL_CMD     , NO_PLURAL |ALLOW_RING | NO_ZERODIVISOR}
     81,{D(jjDEGREE),     DEGREE_CMD,      STRING_CMD,     IDEAL_CMD     , NO_PLURAL |ALLOW_RING | NO_ZERODIVISOR}
     82,{D(jjDEGREE),     DEGREE_CMD,      STRING_CMD,     MODUL_CMD     , NO_PLURAL |ALLOW_RING | NO_ZERODIVISOR}
    8383,{D(jjDEFINED),    DEFINED_CMD,     INT_CMD,        DEF_CMD       , ALLOW_PLURAL |ALLOW_RING}
    8484#ifdef HAVE_FACTORY
Note: See TracChangeset for help on using the changeset viewer.