Changeset 26b68f in git for kernel/ring.cc

Timestamp:

Mar 5, 2010, 2:02:28 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

78efe9f25ea57c6afdfe8736b026e6d074a3d9d3

Parents:

c1f5e3cc27d7059b5f61b1805f24638a0836a299

Message:

removed ref from nc_struct

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

File:

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

kernel/ring.cc

@@ -381 +381 @@
 #ifndef NDEBUG
       if(r->block0[l] == 0 )
-        Print("::prefix");
+        PrintS("::prefix");
       else
         Print("::suffix (sign: %d)", r->block0[l]);
@@ -445 +445 @@
             Print("\n//    %s%s=",r->names[j-1],r->names[i-1]);
             pl = MATELEM(r->GetNC()->MT[UPMATELEM(i,j,r->N)],1,1);
-            p_Write0(pl, r->GetNC()->basering, r->GetNC()->basering);
+            p_Write0(pl, r, r);
           }
         }
@@ -454 +454 @@
     Print("\n//   noncommutative type:%d", (int)ncRingType(r));
     Print("\n//      is skew constant:%d",r->GetNC()->IsSkewConstant);
-    Print("\n//                 ncref:%d",r->GetNC()->ref);
-    Print("\n//               commref:%d",r->ref);
-    Print("\n//               baseref:%d",r->GetNC()->basering->ref);
     if( rIsSCA(r) )
     {
@@ -1700 +1697 @@
   }
   //memset: else res->qideal = NULL;
-#ifdef HAVE_PLURAL
   //memset: res->GetNC() = NULL; // copy is purely commutative!!!
-//  if (rIsPluralRing(r))
-//    nc_rCopy0(res, r); // is this correct??? imho: no!
-#endif
   return res;
 }
@@ -4034 +4027 @@
 //      for( int k = 0; k <= r->N; k++) if (r->typ[j].data.is.pVarOffset[k] != -1) Print("[%2d]: %04x; ", k, r->typ[j].data.is.pVarOffset[k]);
 
-      Print("  limit %d\n",r->typ[j].data.is.limit); 
+      Print("  limit %d\n",r->typ[j].data.is.limit);
       #ifndef NDEBUG
       PrintS("  F: ");idShow(r->typ[j].data.is.F, r, r, 1);
@@ -4214 +4207 @@
     p_DebugPrint(F->m[j], r, r, 0);
 #endif
-    
+
     for( poly p = F->m[j]; p != NULL; pIter(p) )
-    {      
+    {
       int c = p_GetComp(p, r);
 
       if( c > MIN )
       {
-#ifdef PDEBUG    
+#ifdef PDEBUG
         Print("gen[%d] -> gen(%d)\n", c, MIN + (*V)[ c - MIN - 1 ]);
 #endif
-        
+
         p_SetComp( p, MIN + (*V)[ c - MIN - 1 ], r );
       }
     }
-#ifdef PDEBUG    
+#ifdef PDEBUG
     Print("new F[%d]:", j);
     p_Test(F->m[j], r);
@@ -4301 +4294 @@
   rDebugPrint(currRing);
 #endif
-  PrintS("\n");
+  PrintLn();
 #endif
 
@@ -4317 +4310 @@
   rDebugPrint(currRing);
 #endif
-  PrintS("\n");
+  PrintLn();
 #endif
   }
@@ -4383 +4376 @@
     rDebugPrint(r);
 #endif
-    PrintS("\n");
+    PrintLn();
 #endif
 #endif
@@ -4418 +4411 @@
     rDebugPrint(r);
 #endif
-    PrintS("\n");
+    PrintLn();
 #endif
 
@@ -4748 +4741 @@
   res->OrdSgn = 1;
   rComplete(res, 1);
+#ifdef HAVE_PLURAL
+  if (rIsPluralRing(r))
+  {
+    if ( nc_rComplete(r, res, false) ) // no qideal!
+    {
+#ifndef NDEBUG
+      WarnS("error in nc_rComplete");
+#endif
+    }
+  }
+#endif
   rChangeCurrRing(res);
   return res;
@@ -4762 +4766 @@
     rDebugPrint(r);
 #endif
-    PrintS("\n");
+    PrintLn();
 #endif
 
@@ -4824 +4828 @@
     rDebugPrint(res);
 #endif
-    PrintS("\n");
-#endif
-
-
+    PrintLn();
+#endif
 
 #ifdef HAVE_PLURAL
@@ -4852 +4854 @@
     rDebugPrint(res);
 #endif
-    PrintS("\n");
-#endif
-#endif
-
+    PrintLn();
+#endif
+#endif
 
     if (r->qideal!=NULL)
@@ -4884 +4885 @@
   return res;
 }
-
-
-
-
 
 ring rCurrRingAssure_dp_S()
@@ -5110 +5107 @@
    if (rField_is_Ring_PtoM(r)) return n_Zpn;
    if (rField_is_Ring_2toM(r)) return  n_Z2n;
-  #endif          
+  #endif
 
   return n_unknown;
@@ -5541 +5538 @@
     rChangeCurrRing(dest);
 
-  const ring srcBase = src->GetNC()->basering;
+  const ring srcBase = src;
 
   assume( nSetMap(srcBase) == nSetMap(currRing) ); // currRing is important here!