Changeset 83bde7 in git for kernel/ring.cc

Timestamp:

Jul 7, 2010, 6:08:21 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

06662e1138acc7765201463c7220765b864749fd

Parents:

9592631b16a2dfdc56b89012975687590f3da197

Message:

rTensor -> rSumInternal

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

File:

• kernel/ring.cc (modified) (9 diffs)

kernel/ring.cc

@@ -820 +820 @@
  *         1 for compatible (and sum)
  */
-/* vartest: test for variable/paramter names
+/*
 * dp_dp: for comm. rings: use block order dp + dp/ds/wp
 */
-int rTensor(ring r1, ring r2, ring &sum, BOOLEAN vartest, BOOLEAN dp_dp)
+int rTensor(ring r1, ring r2, ring &sum, BOOLEAN dp_dp)
 {
   ring save=currRing;
@@ -836 +836 @@
       if (r1->parameter!=NULL)
       {
-        if (!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
-        {
           tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
           tmpR.parameter[0]=omStrDup(r1->parameter[0]);
           tmpR.P=1;
-        }
-        else
-        {
-          WerrorS("GF(p,n)+GF(p,n)");
-          return -1;
-        }
       }
     }
@@ -857 +849 @@
           // HANNES: TODO: delete nSetChar
           rChangeCurrRing(r1);
-          if ((!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
-              && n_Equal(r1->minpoly,r2->minpoly, r1))
+          if (n_Equal(r1->minpoly,r2->minpoly, r1))
           {
             tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
@@ -877 +868 @@
         else
         {
-          if ((!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
-              && (rPar(r2)==1))
+          if (rPar(r2)==1)
           {
             tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
@@ -896 +886 @@
         if (r2->minpoly!=NULL)
         {
-          if ((!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
-              && (rPar(r1)==1))
+          if (rPar(r1)==1)
           {
             tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
@@ -922 +911 @@
           for(j=0;j<rPar(r2);j++)
           {
-            if (vartest)
-            {
-              for(l=0;l<i;l++)
-              {
-                if(strcmp(tmpR.parameter[l],r2->parameter[j])==0)
-                  break;
-              }
-            }
-            else
-              l=i;
-            if (l==i)
-            {
-              tmpR.parameter[i]=omStrDup(r2->parameter[j]);
-              i++;
-            }
+            l=i;
+            tmpR.parameter[i]=omStrDup(r2->parameter[j]);
+            i++;
           }
           if (i!=len)
@@ -1076 +1053 @@
     if (*(r1->names[i]) == '\0')
       b = FALSE;
-    else if ((r2->parameter!=NULL) && (strlen(r1->names[i])==1))
-    {
-      if (vartest)
-      {
-        for(j=0;j<rPar(r2);j++)
-        {
-          if (strcmp(r1->names[i],r2->parameter[j])==0)
-          {
-            b=FALSE;
-            break;
-          }
-        }
-      }
-    }
 
     if (b)
@@ -1108 +1071 @@
     if (*(r2->names[i]) == '\0')
       b = FALSE;
-    else if ((r1->parameter!=NULL) && (strlen(r2->names[i])==1))
-    {
-      if (vartest)
-      {
-        for(j=0;j<rPar(r1);j++)
-        {
-          if (strcmp(r2->names[i],r1->parameter[j])==0)
-          {
-            b=FALSE;
-            break;
-          }
-        }
-      }
-    }
 
     if (b)
     {
-      if (vartest)
-      {
-        for(j=0;j<r1->N;j++)
-        {
-          if (strcmp(r1->names[j],r2->names[i])==0)
-          {
-            b=FALSE;
-            break;
-          }
-        }
-      }
-      if (b)
-      {
-        //Print("name : %d : %s\n",k,r2->names[i]);
-        names[k]=omStrDup(r2->names[i]);
-        k++;
-      }
-      //else
-      //  Print("no name (var): %s\n",r2->names[i]);
+      //Print("name : %d : %s\n",k,r2->names[i]);
+      names[k]=omStrDup(r2->names[i]);
+      k++;
     }
     //else
@@ -1532 +1465 @@
     return 0;
   }
-  return rTensor(r1,r2,sum,TRUE,FALSE);
+  return rSumInternal(r1,r2,sum,TRUE,FALSE);
 }