Changeset 06662e in git

Timestamp:

Jul 7, 2010, 7:56:32 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

7c5dd189445ad8976fffa1f14278ff4b3f086575

Parents:

83bde7677e30b29c0175c6ded6bfb22ed67a40ec

Message:

rTensor -> rSumInternal

git-svn-id: file:///usr/local/Singular/svn/trunk@12952 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• ring.cc (modified) (2 diffs)
• ring.h (modified) (1 diff)

kernel/ring.cc

@@ -126 +126 @@
     //setCharacteristic( c );
 #endif
-  }
-}
-
-void rNameCheck(ring R)
-{
-  int i,j;
-  for(i=0;i<R->N-1;i++)
-  {
-    for(j=i+1;j<R->N;j++)
-    {
-      if (strcmp(R->names[i],R->names[j])==0)
-      {
-        Warn("name conflict var(%d) and var(%d): `%s`, rename to `@(%d)`",i+1,j+1,R->names[i],j+1);
-        omFree(R->names[j]);
-        R->names[j]=(char *)omAlloc(10);
-        sprintf(R->names[j],"@(%d)",j+1);
-      }
-    }
-  }
-  for(i=0;i<R->P; i++)
-  {
-    for(j=0;j<R->N;j++)
-    {
-      if (strcmp(R->parameter[i],R->names[j])==0)
-      {
-        Warn("name conflict par(%d) and var(%d): `%s`, rename to `@@(%d)`",i+1,j+1,R->names[j],i+1);
-        omFree(R->parameter[i]);
-        R->parameter[i]=(char *)omAlloc(10);
-        sprintf(R->parameter[i],"@@(%d)",i+1);
-      }
-    }
   }
 }
@@ -823 +792 @@
 * dp_dp: for comm. rings: use block order dp + dp/ds/wp
 */
-int rTensor(ring r1, ring r2, ring &sum, BOOLEAN dp_dp)
+int rSumInternal(ring r1, ring r2, ring &sum, BOOLEAN dp_dp)
 {
   ring save=currRing;

kernel/ring.h

@@ -71 +71 @@
 ring   rCopy(ring r);
 ring   rCopy0(const ring r, BOOLEAN copy_qideal = TRUE, BOOLEAN copy_ordering = TRUE);
-void   rNameCheck(ring R);
 ring   rOpposite(ring r);
 ring   rEnvelope(ring r);