Changeset 15940a7 in git
- Timestamp:
- May 22, 2001, 3:20:02 PM (23 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 8cf81e68a230962f11bf60eae0dea98f0246b32e
- Parents:
- 974752038319fda95513bd61e12d9b7a5441b1d9
- Location:
- Singular
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r974752 r15940a7 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: iparith.cc,v 1.26 3 2001-04-19 12:54:26Singular Exp $ */4 /* $Id: iparith.cc,v 1.264 2001-05-22 13:20:02 Singular Exp $ */ 5 5 6 6 /* … … 285 285 { "RETURN", 0, END_GRAMMAR , RETURN}, 286 286 { "ring", 0, RING_CMD , RING_CMD}, 287 { "ringlist", 0, RINGLIST_CMD , CMD_1}, 287 288 { "rvar", 0, IS_RINGVAR , CMD_1}, 288 289 { "setring", 0, SETRING_CMD , SETRING_CMD}, … … 3156 3157 return FALSE; 3157 3158 } 3159 static BOOLEAN jjRINGLIST(leftv res, leftv v) 3160 { 3161 res->data = (char *)rDecompose((ring)v->Data()); 3162 return FALSE; 3163 } 3158 3164 static BOOLEAN jjROWS(leftv res, leftv v) 3159 3165 { … … 3739 3745 ,{jjL2R, RESOLUTION_CMD, RESOLUTION_CMD, LIST_CMD } 3740 3746 ,{jjDUMMY, RESOLUTION_CMD, RESOLUTION_CMD, RESOLUTION_CMD } 3747 ,{jjRINGLIST, RINGLIST_CMD, LIST_CMD, RING_CMD } 3748 ,{jjRINGLIST, RINGLIST_CMD, LIST_CMD, QRING_CMD } 3741 3749 ,{jjDUMMY, RING_CMD, RING_CMD, RING_CMD} 3742 3750 ,{jjWRONG, ROWS_CMD, 0, POLY_CMD } -
Singular/ring.cc
r974752 r15940a7 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ring.cc,v 1.16 2 2001-03-26 19:30:23Singular Exp $ */4 /* $Id: ring.cc,v 1.163 2001-05-22 13:20:00 Singular Exp $ */ 5 5 6 6 /* … … 3878 3878 } 3879 3879 3880 lists rDecompose(ring r) 3881 { 3882 // 0: char/ cf - ring 3883 // 1: list (var) 3884 // 3: list (ord) 3885 // 4: qideal 3886 lists L=(lists)omAlloc0Bin(slists_bin); 3887 L->Init(4); 3888 // ---------------------------------------- 3889 #if 0 /* TODO */ 3890 if (rIsExtension(r)) 3891 rDecomposeCF(&(L->m[0]),r); 3892 else 3893 #endif 3894 { 3895 L->m[0].rtyp=INT_CMD; 3896 L->m[0].data=(void *)r->ch; 3897 } 3898 // ---------------------------------------- 3899 lists LL=(lists)omAlloc0Bin(slists_bin); 3900 L->m[1].rtyp=LIST_CMD; 3901 L->m[1].data=(void *)LL; 3902 LL->Init(r->N); 3903 int i; 3904 for(i=0; i<r->N; i++) 3905 { 3906 LL->m[i].rtyp=STRING_CMD; 3907 LL->m[i].data=(void *)omStrDup(r->names[i]); 3908 } 3909 // ---------------------------------------- 3910 LL=(lists)omAlloc0Bin(slists_bin); 3911 L->m[2].rtyp=LIST_CMD; 3912 L->m[2].data=(void *)LL; 3913 LL->Init((i=rBlocks(r))); 3914 lists LLL; 3915 for(; i>=0; i--) 3916 { 3917 intvec *iv; 3918 LL->m[i].rtyp=LIST_CMD; 3919 LLL=(lists)omAlloc0Bin(slists_bin); 3920 LLL->Init(2); 3921 LLL->m[0].rtyp=INT_CMD; 3922 LLL->m[0].data=(void *)r->order[i]; 3923 LLL->m[1].rtyp=INTVEC_CMD; 3924 iv=new intvec(r->block1[i]-r->block0[i]); 3925 LLL->m[1].data=(void *)iv; 3926 if ((r->wvhdl!=NULL) && (r->wvhdl[i]!=NULL)) 3927 { 3928 int j; 3929 for(j=0;j< iv->length(); j++) 3930 (*iv)[j]=r->wvhdl[i][j]; 3931 } 3932 LL->m[i].data=(void *)LLL; 3933 } 3934 // ---------------------------------------- 3935 L->m[3].rtyp=IDEAL_CMD; 3936 if (r->qideal==NULL) 3937 L->m[3].data=(void *)idInit(1,1); 3938 else 3939 L->m[3].data=(void *)idCopy(r->qideal); 3940 return L; 3941 } -
Singular/ring.h
r974752 r15940a7 7 7 * ABSTRACT - the interpreter related ring operations 8 8 */ 9 /* $Id: ring.h,v 1.6 5 2001-02-09 14:03:00 Singular Exp $ */9 /* $Id: ring.h,v 1.66 2001-05-22 13:20:00 Singular Exp $ */ 10 10 11 11 /* includes */ … … 269 269 void rSetWeightVec(ring r, int *); 270 270 271 #endif 271 lists rDecompose(ring r); 272 #endif -
Singular/tok.h
r974752 r15940a7 7 7 * ABSTRACT: tokens, types for interpreter; general macros 8 8 */ 9 /* $Id: tok.h,v 1. 49 2000-12-19 18:31:46 obachmanExp $ */9 /* $Id: tok.h,v 1.50 2001-05-22 13:20:01 Singular Exp $ */ 10 10 11 11 #ifndef MYYSTYPE … … 119 119 RESERVEDNAME_CMD, 120 120 RESULTANT_CMD, 121 RINGLIST_CMD, 121 122 ROWS_CMD, 122 123 SIMPLEX_CMD,
Note: See TracChangeset
for help on using the changeset viewer.