Changeset a82885 in git for kernel/ring.cc

Timestamp:

Jan 9, 2007, 1:36:05 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3d4a5a6feb25d26d6b5353dab0cea5db6d585dab

Parents:

651f6f6ccc0a56bd7a942ae30d458534e45e50d4

Message:

*hannes: rSum for alternating algebra fixed


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

File:

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

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.50 2007-01-03 00:17:11 motsak Exp $ */
+/* $Id: ring.cc,v 1.51 2007-01-09 12:36:05 Singular Exp $ */
 
 /*
@@ -1216 +1216 @@
 
     // !!!! BUG? C1 and C2 might live in different baserings!!!
-    // Let's assume its the currRing! :)
-    assume( R1->nc->basering == currRing );
-    assume( R2->nc->basering == currRing );
+    // it cannot be both the currRing! :)
+    // the currRing is sum!
     
     int l = rVar(R1) + rVar(R2);
@@ -1231 +1230 @@
       }
     }
+    sum->nc->C = C;
+    sum->nc->D = D;
+    if (nc_InitMultiplication(sum))
+      WarnS("Error initializing multiplication!");
     for (i=1; i< rVar(R1); i++)
     {
@@ -1243 +1246 @@
       }
     }
+    idTest((ideal)C);
     for (i=1; i< rVar(R2); i++)
     {
@@ -1248 +1252 @@
       {
         MATELEM(C,rVar(R1)+i,rVar(R1)+j) = pPermPoly(MATELEM(C2,i,j),perm2,R2,nMap2,par_perm2,rPar(R2));
-              if (MATELEM(D2,i,j) != NULL)
+        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));
@@ -1254 +1258 @@
       }
     }
-    idTest((ideal)C);
     idTest((ideal)D);
-    sum->nc->C = C;
-    sum->nc->D = D;
     if (nc_InitMultiplication(sum))
       WarnS("Error initializing multiplication!");