Changeset b541aa in git


Ignore:
Timestamp:
Feb 4, 2016, 4:20:38 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
1adac1b2916bf7e04ad3ec1f5e9c7c86be2e4de5
Parents:
97dff9a14f3e5550ae2956080f77f6d154f4f0f9
Message:
SINGULAR_4_1: ring_list
Location:
Singular
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    r97dff9 rb541aa  
    9494#include <vector>
    9595
    96 lists rDecompose(const ring r);
    9796ring rCompose(const lists  L, const BOOLEAN check_comp=TRUE);
    9897
     
    48534852    return rDecompose_CF(res,r);
    48544853  return TRUE;
     4854}
     4855static BOOLEAN jjRING_LIST(leftv res, leftv v)
     4856{
     4857  ring r=(ring)v->Data();
     4858  if (r!=NULL)
     4859    res->data = (char *)rDecompose_list_cf((ring)v->Data());
     4860  return (r==NULL)||(res->data==NULL);
    48554861}
    48564862#endif
  • Singular/ipshell.cc

    r97dff9 rb541aa  
    16901690}
    16911691#ifdef SINGULAR_4_1
    1692 static void rDecomposeC(leftv h,const coeffs C)
     1692static void rDecomposeC_41(leftv h,const coeffs C)
    16931693/* field is R or C */
    16941694{
     
    17241724  // ----------------------------------------
    17251725}
    1726 #else
     1726#endif
    17271727static void rDecomposeC(leftv h,const ring R)
    17281728/* field is R or C */
     
    17591759  // ----------------------------------------
    17601760}
    1761 #endif
    17621761
    17631762#ifdef SINGULAR_4_1
    17641763#ifdef HAVE_RINGS
    1765 void rDecomposeRing(leftv h,const coeffs C)
     1764void rDecomposeRing_41(leftv h,const coeffs C)
    17661765/* field is R or C */
    17671766{
     
    17901789}
    17911790#endif
    1792 #else
     1791#endif
     1792
    17931793#ifdef HAVE_RINGS
    17941794void rDecomposeRing(leftv h,const ring R)
     
    18191819}
    18201820#endif
    1821 #endif
    18221821
    18231822
     
    18351834  if (nCoeff_is_numeric(C))
    18361835  {
    1837     rDecomposeC(res,C);
     1836    rDecomposeC_41(res,C);
    18381837  }
    18391838#ifdef HAVE_RINGS
    18401839  else if (nCoeff_is_Ring(C))
    18411840  {
    1842     rDecomposeRing(res,C);
     1841    rDecomposeRing_41(res,C);
    18431842  }
    18441843#endif
     
    18961895
    18971896#ifdef SINGULAR_4_1
    1898 lists rDecompose(const ring r)
     1897lists rDecompose_list_cf(const ring r)
    18991898{
    19001899  assume( r != NULL );
     
    20292028#endif
    20302029
    2031 #ifndef SINGULAR_4_1
    20322030lists rDecompose(const ring r)
    20332031{
     
    22162214  return L;
    22172215}
    2218 #endif
    22192216
    22202217void rComposeC(lists L, ring R)
  • Singular/ipshell.h

    r97dff9 rb541aa  
    293293BOOLEAN iiBranchTo(leftv r, leftv args);
    294294
     295lists rDecompose(const ring r);
     296
    295297#ifdef SINGULAR_4_1
     298lists rDecompose_list_cf(const ring r);
    296299BOOLEAN rDecompose_CF(leftv res,const coeffs C);
    297300#endif
  • Singular/table.h

    r97dff9 rb541aa  
    223223,{D(jjRINGLIST),   RINGLIST_CMD,    LIST_CMD,       RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
    224224#ifdef SINGULAR_4_1
    225 ,{D(jjRINGLIST_C), RINGLIST_CMD,    LIST_CMD,       CRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
     225,{D(jjRING_LIST),  RING_LIST_CMD,   LIST_CMD,       RING_CMD      , ALLOW_PLURAL |ALLOW_RING}
     226,{D(jjRINGLIST_C), RING_LIST_CMD,   LIST_CMD,       CRING_CMD     , ALLOW_PLURAL |ALLOW_RING}
    226227,{D(jjN2_CR),      RING_CMD,        CRING_CMD,      CNUMBER_CMD   , ALLOW_PLURAL |ALLOW_RING}
    227228,{D(jjCM_CR),      RING_CMD,        CRING_CMD,      CMATRIX_CMD   , ALLOW_PLURAL |ALLOW_RING}
Note: See TracChangeset for help on using the changeset viewer.