Changeset 3c8a31 in git for kernel/ring.cc

Timestamp:

Oct 29, 2004, 8:48:41 PM (20 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7d6c6f4a66db3dffba38d47c717a659d6ceee2ef

Parents:

94dc4fa9aa4baece0ee8fae8d27265dde1bae2d6

Message:

*levandov: changes for rSum - changing currRing


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

File:

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

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.26 2004-10-29 16:55:20 Singular Exp $ */
+/* $Id: ring.cc,v 1.27 2004-10-29 18:48:41 levandov Exp $ */
 
 /*
@@ -1173 +1173 @@
       for (j=i+1; j<=rVar(R1); j++)
       {
-        MATELEM(C,i,j) = pPermPoly(MATELEM(C1,i,j),perm1,R1,nMap1,par_perm1,rPar(R1));
-        MATELEM(D,i,j) = pPermPoly(MATELEM(D1,i,j),perm1,R1,nMap1,par_perm1,rPar(R1));
-        //      MATELEM(C,i,j) = p_CopyEmbed(MATELEM(C1,i,j),R1,0,param_shift);
-          //prCopyR_NoSort(MATELEM(C1,i,j),R1,sum);
-        //      MATELEM(D,i,j) = prCopyR(MATELEM(D1,i,j),R1,sum);
-        //      MATELEM(D,i,j) = p_CopyEmbed(MATELEM(D1,i,j),R1,0,param_shift);
-
+
+        MATELEM(C,i,j) = pPermPoly(MATELEM(C1,i,j),perm1,R1,nMap1,par_perm1,rPar(R1));
+        if (MATELEM(D1,i,j) != NULL)
+        {
+          MATELEM(D,i,j) = pPermPoly(MATELEM(D1,i,j),perm1,R1,nMap1,par_perm1,rPar(R1));
+        }
       }
     }
@@ -1186 +1185 @@
       for (j=i+1; j<=rVar(R2); j++)
       {
-        //      MATELEM(C,rVar(R1)+i,rVar(R1)+j) = prCopyR_NoSort(MATELEM(C2,i,j),R2,sum);
-        //      MATELEM(D,rVar(R1)+i,rVar(R1)+j) = prCopyR(MATELEM(D2,i,j),R2,sum);
-        //      MATELEM(C,rVar(R1)+i,rVar(R1)+j) = p_CopyEmbed(MATELEM(C2,i,j),R2, rVar(R1),param_shift);
-        //      MATELEM(D,rVar(R1)+i,rVar(R1)+j) = p_CopyEmbed(MATELEM(D2,i,j),R2, rVar(R1),param_shift);
-
         MATELEM(C,rVar(R1)+i,rVar(R1)+j) = pPermPoly(MATELEM(C2,i,j),perm2,R2,nMap2,par_perm2,rPar(R2));
-        MATELEM(D,rVar(R1)+i,rVar(R1)+j) = pPermPoly(MATELEM(D2,i,j),perm2,R2,nMap2,par_perm2,rPar(R2));
-      }
-    }
+        if (MATELEM(D2,i,j) != NULL)
+        {
+          MATELEM(D,rVar(R1)+i,rVar(R1)+j) = pPermPoly(MATELEM(D2,i,j),perm2,R2,nMap2,par_perm2,rPar(R2));
+        }
+      }
+    }
+    idTest((ideal)C);
+    idTest((ideal)D);
     sum->nc->C = C;
     sum->nc->D = D;
-    idTest((ideal)C);
-    idTest((ideal)D);
     if (nc_InitMultiplication(sum))
       WarnS("Error initializing multiplication!");