Changeset 86016d in git for kernel/ring.cc

Timestamp:

Feb 1, 2007, 12:51:25 AM (17 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c591ad0eb4ed9f5be86c0c85d2412be2ad6be556

Parents:

1cc61e18c0d6c70b177099c23a52159afb280bb4

Message:

*motsak:
 !+!: factors of SCA, debug print for SCA, "kill squares" in std.
  * : ncRingType, naming, formatting, unified NC setup.


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

File:

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

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.55 2007-01-29 18:08:21 Singular Exp $ */
+/* $Id: ring.cc,v 1.56 2007-01-31 23:51:24 motsak Exp $ */
 
 /*
@@ -26 +26 @@
 #ifdef HAVE_PLURAL
 #include "gring.h"
+#include "sca.h"
 #endif
 #include "maps.h"
@@ -390 +391 @@
     else PrintS(" ...");
 #ifdef PDEBUG
-    Print("\n//   noncommutative type:%d",r->nc->type);
+    Print("\n//   noncommutative type:%d", (int)ncRingType(r));
     Print("\n//   is skew constant:%d",r->nc->IsSkewConstant);
+    if( rIsSCA(r) )
+    {
+      Print("\n//   alternating variables: [%d, %d]", scaFirstAltVar(r), scaLastAltVar(r));
+      const ideal Q = r->nc->SCAQuotient(); // resides within r!
+      if (Q!=NULL)
+      {
+        PrintS("\n//   quotient of sca by ideal");
+        if (r==currRing)
+        {
+          PrintLn();
+          iiWriteMatrix((matrix)Q,"__",1);
+        }
+        else PrintS(" ...");
+      }
+    }
     Print("\n//   ref:%d",r->nc->ref);
 #endif
@@ -1157 +1173 @@
     if ( !R2_is_nc ) nc_rCreateNCcomm(R2);
     /* nc->type's */
-    sum->nc->type = nc_undef;
-    nc_type t1 = R1->nc->type, t2 = R2->nc->type;
-    if ( t1==t2) sum->nc->type = t1;
+    ncRingType(sum, nc_undef);
+    nc_type t1 = ncRingType(R1), t2 = ncRingType(R2);
+    if ( t1==t2) ncRingType(sum, t1);
     else
     {
-      if ( (t1==nc_general) || (t2==nc_general) ) sum->nc->type = nc_general;
-    }
-    if (sum->nc->type == nc_undef) /* not yet done */
+      if ( (t1==nc_general) || (t2==nc_general) ) ncRingType(sum, nc_general);
+    }
+    if (ncRingType(sum) == nc_undef) /* not yet done */
     {
       switch (t1)
       {
         case nc_comm:
-          sum->nc->type = t2;
+          ncRingType(sum, t2);
           break;
         case nc_lie:
@@ -1175 +1191 @@
           {
             case nc_skew:
-              sum->nc->type = nc_general;  break;
+              ncRingType(sum, nc_general);  break;
             case nc_comm:
-              sum->nc->type = nc_lie;  break;
+              ncRingType(sum, nc_lie);  break;
             default:
               /*sum->nc->type = nc_undef;*/  break;
@@ -1186 +1202 @@
           {
             case nc_lie:
-              sum->nc->type = nc_lie;  break;
+              ncRingType(sum, nc_lie);  break;
             case nc_comm:
-              sum->nc->type = nc_skew;  break;
+              ncRingType(sum, nc_skew);  break;
             default:
               /*sum->nc->type = nc_undef;*/  break;
@@ -1197 +1213 @@
       }
     }
-    if (sum->nc->type == nc_undef)
+    if (ncRingType(sum) == nc_undef)
       WarnS("Error on recognizing nc types");
     /* multiplication matrices business: */
@@ -3950 +3966 @@
   r->nc->ref      = 1; /* in spite of rCopy(src)? */
   r->nc->basering = r;
-  r->nc->type     =  src->nc->type;
+  ncRingType(r, ncRingType(src));
   int *perm       = (int *)omAlloc0((rVar(r)+1)*sizeof(int));
   int *par_perm   = NULL;