Changeset 03b1019 in git

Timestamp:

May 1, 2005, 9:56:36 PM (18 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

a0ddf2ce9398ab9d21db077c3aab6d162a7a76ad

Parents:

1e975e5126b0e8c7606f27ce3d820fad6d693183

Message:

*levandov: added dots for nc relations if r is not a currRing and other minor fixes


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

File:

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

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.34 2005-04-29 17:35:18 Singular Exp $ */
+/* $Id: ring.cc,v 1.35 2005-05-01 19:56:36 levandov Exp $ */
 
 /*
@@ -325 +325 @@
   }
 #ifdef HAVE_PLURAL
-  if ((r->nc!=NULL) && (r==currRing))
-  {
-    poly pl=NULL;
-    int nl;
+  if (r->nc!=NULL)
+  {
     PrintS("\n//   noncommutative relations:");
-    //    Print("\n//   noncommutative relations (type %d):",(int)r->nc->type);
-    for (int i = 1; i<r->N; i++)
-    {
-      for (int j = i+1; j<=r->N; j++)
-      {
-        nl=nIsOne(p_GetCoeff(MATELEM(r->nc->C,i,j),r));
-        if ((MATELEM(r->nc->D,i,j)!=NULL)||(!nl))
-        {
-          Print("\n//    %s%s=",r->names[j-1],r->names[i-1]);
-          pl=MATELEM(r->nc->MT[UPMATELEM(i,j,r->N)],1,1);
-          pWrite0(pl);
-        }
-      }
-    }
+    if (r==currRing)
+    {
+      poly pl=NULL;
+      int nl;
+      int i,j;
+      //    Print("\n//   noncommutative relations (type %d):",(int)r->nc->type);
+      for (i = 1; i<r->N; i++)
+      {
+        for (j = i+1; j<=r->N; j++)
+        {
+          nl = nIsOne(p_GetCoeff(MATELEM(r->nc->C,i,j),r));
+          if ( (MATELEM(r->nc->D,i,j)!=NULL) || (!nl) )
+          {
+            Print("\n//    %s%s=",r->names[j-1],r->names[i-1]);
+            pl = MATELEM(r->nc->MT[UPMATELEM(i,j,r->N)],1,1);
+            pWrite0(pl);
+          }
+        }
+      }
+    }
+    else PrintS(" ...");
 #ifdef PDEBUG
     Print("\n//   noncommutative type:%d",r->nc->type);
@@ -1097 +1102 @@
     if ( !R1_is_nc ) nc_rCreateNCcomm(R1);
     if ( !R2_is_nc ) nc_rCreateNCcomm(R2);
-    /* nc types */
+    /* nc->type's */
     sum->nc->type = nc_undef;
     nc_type t1 = R1->nc->type, t2 = R2->nc->type;
@@ -1140 +1145 @@
     if (sum->nc->type == nc_undef)
       WarnS("Error on recognizing nc types");
-    /* multiplication matrices */
-//     ring old_ring = currRing;
-//     rChangeCurrRing(sum);
-/* find permutations of vars and pars */
+    /* multiplication matrices business: */
+    /* find permutations of vars and pars */
     int *perm1 = (int *)omAlloc0((rVar(R1)+1)*sizeof(int));
     int *par_perm1 = NULL;
@@ -1150 +1153 @@
     int *par_perm2 = NULL;
     if (rPar(R2)!=0) par_perm2=(int *)omAlloc0((rPar(R2)+1)*sizeof(int));
-    //    maFindPerm(char **preim_names, int preim_n, char **preim_par, int preim_p,
-    //                char **names,       int n,       char **par,       int nop,
-    //                int * perm, int *par_perm, int ch);
     maFindPerm(R1->names,  rVar(R1),  R1->parameter,  rPar(R1),
                sum->names, rVar(sum), sum->parameter, rPar(sum),
@@ -1207 +1207 @@
     rDelete(R1);
     rDelete(R2);
-    /* TODO: delete perm arrays */
+    /* delete perm arrays */
     if (perm1!=NULL) omFree((ADDRESS)perm1);
     if (perm2!=NULL) omFree((ADDRESS)perm2);
@@ -3832 +3832 @@
     return r;
   }
+  if ( rIsPluralRing(src) )
   {
   rChangeCurrRing(r);  /* we were not in r */
@@ -3877 +3878 @@
   rChangeCurrRing(save);
   }
-#endif
+#endif /* HAVE_PLURAL */
   return r;
 }
@@ -3890 +3891 @@
   if ( stat <=0 )
     WarnS("Error in rEnvelope at rSum");
-  /* now create the qideal for qrings */
-//    if (R->qideal != NULL)
-//    {
-//      ring save = currRing;
-//      rChangeCurrRing(Ropp);
-//      ideal Q = idCopy(R->qideal);
-//      ideal Qop = idOppose(R,Q);
-//      rChangeCurrRing(Renv);
-//      ideal Qenv = idInit(Q->ncols+Qop->ncols,1);
-//      int i;
-//      for (i=0; i< Q->ncols; i++)
-//      {
-//        Qenv->m[i] = maIMap(R,Q->m[i]);
-//      }
-//      for (i=0; i<= Qop->ncols; i++)
-//      {
-//        Qenv->m[Q->ncols+i] = maIMap(Ropp,Qop->m[i]);
-//      }
-//      /* should we run twostd on the result? */
-//      Renv->qideal = Qenv;
-//      rChangeCurrRing(save);
-//    }
   rTest(Renv);
   return Renv;