Changeset 5c990f1 in git for kernel/ring.cc

Timestamp:

Apr 3, 2009, 10:02:20 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9660f5c48cc33240ba1f644718ebd3f554c48fff

Parents:

5ff25a34cd1c8aae9be47c0a88b1fc0d92845df1

Message:

*motsak: fixing rOpposite (quotients)


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

File:

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

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.115 2009-03-30 09:03:08 Singular Exp $ */
+/* $Id: ring.cc,v 1.116 2009-04-03 20:02:20 motsak Exp $ */
 
 /*
@@ -4390 +4390 @@
 {
   if (src == NULL) return(NULL);
+
+#ifdef RDEBUG
+  rTest(src);
+#endif
+
   ring save = currRing;
   rChangeCurrRing(src);
 
-  ring r = rCopy0(src,TRUE); /* TRUE for copy the qideal */
+#ifdef RDEBUG
+  rTest(src);
+//  rWrite(src);
+//  rDebugPrint(src);
+#endif
+
+  
+//  ring r = rCopy0(src,TRUE); /* TRUE for copy the qideal: Why??? */
+  ring r = rCopy0(src,FALSE); /* qideal will be deleted later on!!! */
+  
   /*  rChangeCurrRing(r); */
   // change vars v1..vN -> vN..v1
@@ -4605 +4619 @@
 
 #ifdef RDEBUG
-  //   rDebugPrint(r);
   rTest(r);
 #endif
@@ -4611 +4624 @@
   rChangeCurrRing(r);
 
+#ifdef RDEBUG
+  rTest(r);
+//  rWrite(r);
+//  rDebugPrint(r);
+#endif
+
+  
 #ifdef HAVE_PLURAL
   // now, we initialize a non-comm structure on r
@@ -4647 +4667 @@
     idTest((ideal)D);
 
-    if (nc_CallPlural(C, D, NULL, NULL, r, false, false, true, r))
+    if (nc_CallPlural(C, D, NULL, NULL, r, false, false, true, r)) // no qring setup!
       WarnS("Error initializing non-commutative multiplication!");
 
+    
+#ifdef RDEBUG
+    rTest(r);
+//    rWrite(r);
+//    rDebugPrint(r);
+#endif
+
     assume( r->GetNC()->IsSkewConstant == src->GetNC()->IsSkewConstant);
-    assume( ncRingType(r) == ncRingType(src) );
 
     omFreeSize((ADDRESS)perm,(rVar(r)+1)*sizeof(int));
-
-    rChangeCurrRing(save);
 
   }
@@ -4665 +4689 @@
   {
     idDelete(&(r->qideal));
+
 #ifdef HAVE_PLURAL
-    r->qideal = idOppose(src, src->qideal);
+    r->qideal = idOppose(src, src->qideal); // into the currRing: r
 #else
-    r->qideal = idCopy( src->qideal);
+    r->qideal = id_Copy(src->qideal, currRing); // ?
 #endif
 
@@ -4674 +4699 @@
 #ifdef HAVE_PLURAL
     if( rIsPluralRing(r) )
+    {
       nc_SetupQuotient(r);
-#endif
-  }
-
+
+#ifdef RDEBUG
+      rTest(r);
+//      rWrite(r);
+//      rDebugPrint(r);
+#endif
+    }
+
+#endif
+  }
+
+
+#ifdef HAVE_PLURAL
+  if( rIsPluralRing(r) )
+    assume( ncRingType(r) == ncRingType(src) );
+#endif
+
+  
   rTest(r);