Changeset 9ae29a in git for kernel/ring.cc

Timestamp:

Jul 7, 2010, 8:02:01 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

99af0d3e643769a827817de5d58cba7541a19539

Parents:

7c5dd189445ad8976fffa1f14278ff4b3f086575

Message:

rTensor -> rSumInternal

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

File:

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

kernel/ring.cc

@@ -789 +789 @@
  *         1 for compatible (and sum)
  */
-/*
+/* vartest: test for variable/paramter names
 * dp_dp: for comm. rings: use block order dp + dp/ds/wp
 */
-int rSumInternal(ring r1, ring r2, ring &sum, BOOLEAN dp_dp)
+int rSumInternal(ring r1, ring r2, ring &sum, BOOLEAN vartest, BOOLEAN dp_dp)
 {
   ring save=currRing;
@@ -805 +805 @@
       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;
+        }
       }
     }
@@ -818 +826 @@
           // HANNES: TODO: delete nSetChar
           rChangeCurrRing(r1);
-          if (n_Equal(r1->minpoly,r2->minpoly, r1))
+          if ((!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
+              && n_Equal(r1->minpoly,r2->minpoly, r1))
           {
             tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
@@ -837 +846 @@
         else
         {
-          if (rPar(r2)==1)
+          if ((!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
+              && (rPar(r2)==1))
           {
             tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
@@ -855 +865 @@
         if (r2->minpoly!=NULL)
         {
-          if (rPar(r1)==1)
+          if ((!vartest || (strcmp(r1->parameter[0],r2->parameter[0])==0)) /* 1 par */
+              && (rPar(r1)==1))
           {
             tmpR.parameter=(char **)omAllocBin(char_ptr_bin);
@@ -880 +891 @@
           for(j=0;j<rPar(r2);j++)
           {
-            l=i;
-            tmpR.parameter[i]=omStrDup(r2->parameter[j]);
-            i++;
+            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++;
+            }
           }
           if (i!=len)
@@ -1022 +1045 @@
     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)
@@ -1040 +1077 @@
     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)
     {
-      //Print("name : %d : %s\n",k,r2->names[i]);
-      names[k]=omStrDup(r2->names[i]);
-      k++;
+      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]);
     }
     //else