Changeset 7bb7da5 in git

Timestamp:

Nov 25, 2013, 4:05:23 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '5bec8f88c9ee2573d328cf7c3aff2bcb301d2395')

Children:

dc478260ef923280b78afb46f80108bc7636b34a

Parents:

0615d9680ee7c46dfdc3c107760b2f351a130c31

Message:

chg: r_IsRingVar (extensions may not be singular rings, but uuse coeffs interface)

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/subexpr.cc (modified) (3 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/iparith.cc

@@ -4345 +4345 @@
 static BOOLEAN jjIS_RINGVAR_S(leftv res, leftv v)
 {
-  res->data = (char *)(long)(r_IsRingVar((char *)v->Data(), currRing)+1);
+  res->data = (char *)(long)(r_IsRingVar((char *)v->Data(), currRing->names,
+                                                            currRing->N)+1);
   return FALSE;
 }

Singular/subexpr.cc

@@ -1473 +1473 @@
     {
       int vnr;
-      if ((vnr=r_IsRingVar(id, currRing))>=0)
+      if ((vnr=r_IsRingVar(id, currRing->names,currRing->N))>=0)
       {
         poly p=pOne();
@@ -1483 +1483 @@
         return;
       }
-      if((currRing->cf->extRing!=NULL)
-      &&((vnr=r_IsRingVar(id, currRing->cf->extRing))>=0))
+      if((n_NumberOfParameters(currRing->cf)>0)
+      &&((vnr=r_IsRingVar(id, (char**)n_ParameterNames(currRing->cf),
+                              n_NumberOfParameters(currRing->cf))>=0)))
       {
         BOOLEAN ok=FALSE;
@@ -1578 +1579 @@
         }
         if (TEST_V_ALLWARN /*&& (myynest>0)*/
-        && ((r_IsRingVar(id, currRing)>=0)
-          || ((currRing->cf->extRing!=NULL)
-             &&(r_IsRingVar(id, currRing->cf->extRing)>=0))))
+        && ((r_IsRingVar(id, currRing->names,currRing->N)>=0)
+          || ((n_NumberOfParameters(currRing->cf)>0)
+             &&(r_IsRingVar(id, (char**)n_ParameterNames(currRing->cf),
+                                n_NumberOfParameters(currRing->cf))>=0))))
         {
         // WARNING: do not use ring variable names in procedures

libpolys/polys/monomials/p_polys.cc

@@ -1371 +1371 @@
   /* i.e. it does not start with a coeff: test if it is a ringvar*/
   {
-    j = r_IsRingVar(s,r);
+    j = r_IsRingVar(s,r->names,r->N);
     if (j >= 0)
     {
@@ -1384 +1384 @@
     ss[0] = *s++;
     ss[1] = '\0';
-    j = r_IsRingVar(ss,r);
+    j = r_IsRingVar(ss,r->names,r->N);
     if (j >= 0)
     {

libpolys/polys/monomials/ring.cc

@@ -221 +221 @@
 }
 
-/*2
- * set a new ring from the data:
- s: name, chr: ch, varnames: rv, ordering: ord, typ: typ
- */
-
-int r_IsRingVar(const char *n, ring r)
-{
-  if ((r!=NULL) && (r->names!=NULL))
-  {
-    for (int i=0; i<r->N; i++)
-    {
-      if (r->names[i]==NULL) return -1;
-      if (strcmp(n,r->names[i]) == 0) return (int)i;
+
+int r_IsRingVar(const char *n, char**names,int N)
+{
+  if (names!=NULL)
+  {
+    for (int i=0; i<N; i++)
+    {
+      if (names[i]==NULL) return -1;
+      if (strcmp(n,names[i]) == 0) return (int)i;
     }
   }

libpolys/polys/monomials/ring.h

@@ -344 +344 @@
 
 // #define rIsRingVar(A) r_IsRingVar(A,currRing)
-int    r_IsRingVar(const char *n, ring r);
+int    r_IsRingVar(const char *n, char**names, int N);
 void   rWrite(ring r, BOOLEAN details = FALSE);
 ring   rCopy(ring r);