Changeset b541aa in git
- Timestamp:
- Feb 4, 2016, 4:20:38 PM (8 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 1adac1b2916bf7e04ad3ec1f5e9c7c86be2e4de5
- Parents:
- 97dff9a14f3e5550ae2956080f77f6d154f4f0f9
- Location:
- Singular
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r97dff9 rb541aa 94 94 #include <vector> 95 95 96 lists rDecompose(const ring r);97 96 ring rCompose(const lists L, const BOOLEAN check_comp=TRUE); 98 97 … … 4853 4852 return rDecompose_CF(res,r); 4854 4853 return TRUE; 4854 } 4855 static 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); 4855 4861 } 4856 4862 #endif -
Singular/ipshell.cc
r97dff9 rb541aa 1690 1690 } 1691 1691 #ifdef SINGULAR_4_1 1692 static void rDecomposeC (leftv h,const coeffs C)1692 static void rDecomposeC_41(leftv h,const coeffs C) 1693 1693 /* field is R or C */ 1694 1694 { … … 1724 1724 // ---------------------------------------- 1725 1725 } 1726 #e lse1726 #endif 1727 1727 static void rDecomposeC(leftv h,const ring R) 1728 1728 /* field is R or C */ … … 1759 1759 // ---------------------------------------- 1760 1760 } 1761 #endif1762 1761 1763 1762 #ifdef SINGULAR_4_1 1764 1763 #ifdef HAVE_RINGS 1765 void rDecomposeRing (leftv h,const coeffs C)1764 void rDecomposeRing_41(leftv h,const coeffs C) 1766 1765 /* field is R or C */ 1767 1766 { … … 1790 1789 } 1791 1790 #endif 1792 #else 1791 #endif 1792 1793 1793 #ifdef HAVE_RINGS 1794 1794 void rDecomposeRing(leftv h,const ring R) … … 1819 1819 } 1820 1820 #endif 1821 #endif1822 1821 1823 1822 … … 1835 1834 if (nCoeff_is_numeric(C)) 1836 1835 { 1837 rDecomposeC (res,C);1836 rDecomposeC_41(res,C); 1838 1837 } 1839 1838 #ifdef HAVE_RINGS 1840 1839 else if (nCoeff_is_Ring(C)) 1841 1840 { 1842 rDecomposeRing (res,C);1841 rDecomposeRing_41(res,C); 1843 1842 } 1844 1843 #endif … … 1896 1895 1897 1896 #ifdef SINGULAR_4_1 1898 lists rDecompose (const ring r)1897 lists rDecompose_list_cf(const ring r) 1899 1898 { 1900 1899 assume( r != NULL ); … … 2029 2028 #endif 2030 2029 2031 #ifndef SINGULAR_4_12032 2030 lists rDecompose(const ring r) 2033 2031 { … … 2216 2214 return L; 2217 2215 } 2218 #endif2219 2216 2220 2217 void rComposeC(lists L, ring R) -
Singular/ipshell.h
r97dff9 rb541aa 293 293 BOOLEAN iiBranchTo(leftv r, leftv args); 294 294 295 lists rDecompose(const ring r); 296 295 297 #ifdef SINGULAR_4_1 298 lists rDecompose_list_cf(const ring r); 296 299 BOOLEAN rDecompose_CF(leftv res,const coeffs C); 297 300 #endif -
Singular/table.h
r97dff9 rb541aa 223 223 ,{D(jjRINGLIST), RINGLIST_CMD, LIST_CMD, RING_CMD , ALLOW_PLURAL |ALLOW_RING} 224 224 #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} 226 227 ,{D(jjN2_CR), RING_CMD, CRING_CMD, CNUMBER_CMD , ALLOW_PLURAL |ALLOW_RING} 227 228 ,{D(jjCM_CR), RING_CMD, CRING_CMD, CMATRIX_CMD , ALLOW_PLURAL |ALLOW_RING}
Note: See TracChangeset
for help on using the changeset viewer.