Changeset 7bb7da5 in git
- Timestamp:
- Nov 25, 2013, 4:05:23 PM (9 years ago)
- Branches:
- (u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
- Children:
- dc478260ef923280b78afb46f80108bc7636b34a
- Parents:
- 0615d9680ee7c46dfdc3c107760b2f351a130c31
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r0615d9 r7bb7da5 4345 4345 static BOOLEAN jjIS_RINGVAR_S(leftv res, leftv v) 4346 4346 { 4347 res->data = (char *)(long)(r_IsRingVar((char *)v->Data(), currRing)+1); 4347 res->data = (char *)(long)(r_IsRingVar((char *)v->Data(), currRing->names, 4348 currRing->N)+1); 4348 4349 return FALSE; 4349 4350 } -
Singular/subexpr.cc
r0615d9 r7bb7da5 1473 1473 { 1474 1474 int vnr; 1475 if ((vnr=r_IsRingVar(id, currRing ))>=0)1475 if ((vnr=r_IsRingVar(id, currRing->names,currRing->N))>=0) 1476 1476 { 1477 1477 poly p=pOne(); … … 1483 1483 return; 1484 1484 } 1485 if((currRing->cf->extRing!=NULL) 1486 &&((vnr=r_IsRingVar(id, currRing->cf->extRing))>=0)) 1485 if((n_NumberOfParameters(currRing->cf)>0) 1486 &&((vnr=r_IsRingVar(id, (char**)n_ParameterNames(currRing->cf), 1487 n_NumberOfParameters(currRing->cf))>=0))) 1487 1488 { 1488 1489 BOOLEAN ok=FALSE; … … 1578 1579 } 1579 1580 if (TEST_V_ALLWARN /*&& (myynest>0)*/ 1580 && ((r_IsRingVar(id, currRing)>=0) 1581 || ((currRing->cf->extRing!=NULL) 1582 &&(r_IsRingVar(id, currRing->cf->extRing)>=0)))) 1581 && ((r_IsRingVar(id, currRing->names,currRing->N)>=0) 1582 || ((n_NumberOfParameters(currRing->cf)>0) 1583 &&(r_IsRingVar(id, (char**)n_ParameterNames(currRing->cf), 1584 n_NumberOfParameters(currRing->cf))>=0)))) 1583 1585 { 1584 1586 // WARNING: do not use ring variable names in procedures -
libpolys/polys/monomials/p_polys.cc
r0615d9 r7bb7da5 1371 1371 /* i.e. it does not start with a coeff: test if it is a ringvar*/ 1372 1372 { 1373 j = r_IsRingVar(s,r );1373 j = r_IsRingVar(s,r->names,r->N); 1374 1374 if (j >= 0) 1375 1375 { … … 1384 1384 ss[0] = *s++; 1385 1385 ss[1] = '\0'; 1386 j = r_IsRingVar(ss,r );1386 j = r_IsRingVar(ss,r->names,r->N); 1387 1387 if (j >= 0) 1388 1388 { -
libpolys/polys/monomials/ring.cc
r0615d9 r7bb7da5 221 221 } 222 222 223 /*2 224 * set a new ring from the data: 225 s: name, chr: ch, varnames: rv, ordering: ord, typ: typ 226 */ 227 228 int r_IsRingVar(const char *n, ring r) 229 { 230 if ((r!=NULL) && (r->names!=NULL)) 231 { 232 for (int i=0; i<r->N; i++) 233 { 234 if (r->names[i]==NULL) return -1; 235 if (strcmp(n,r->names[i]) == 0) return (int)i; 223 224 int r_IsRingVar(const char *n, char**names,int N) 225 { 226 if (names!=NULL) 227 { 228 for (int i=0; i<N; i++) 229 { 230 if (names[i]==NULL) return -1; 231 if (strcmp(n,names[i]) == 0) return (int)i; 236 232 } 237 233 } -
libpolys/polys/monomials/ring.h
r0615d9 r7bb7da5 344 344 345 345 // #define rIsRingVar(A) r_IsRingVar(A,currRing) 346 int r_IsRingVar(const char *n, ring r);346 int r_IsRingVar(const char *n, char**names, int N); 347 347 void rWrite(ring r, BOOLEAN details = FALSE); 348 348 ring rCopy(ring r);
Note: See TracChangeset
for help on using the changeset viewer.