Changeset fc2746 in git

Timestamp:

Mar 5, 2012, 5:24:33 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

de0a2a63707154c996bdb17673b41439c4a047f6

Parents:

9e26458fea6f12f6acae94134fb3c4bc0178ecd7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-05 17:24:33+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-05 17:42:52+01:00

Message:

fix the usage of iiWriteMatrix

NOTE: trailing (int)0 have been treated wrongly as (ring)NULL...

Files:

• kernel/kstdfac.cc (modified) (5 diffs)
• libpolys/coeffs/coeffWrite (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/polys/matpol.h (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)
• libpolys/polys/nc/old.gring.cc (modified) (2 diffs)
• libpolys/polys/nc/sca.cc (modified) (2 diffs)

kernel/kstdfac.cc

@@ -409 +409 @@
         {
           PrintS("new D:\n");
-          iiWriteMatrix((matrix)n->D,"D",1,0);
+          iiWriteMatrix((matrix)n->D,"D",1,currRing,0);
           PrintLn();
         }
@@ -501 +501 @@
                 Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr);
                 PrintS("L:\n");
-                iiWriteMatrix((matrix)Lj->d,"L",1,0);
+                iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0);
               }
 #endif
@@ -727 +727 @@
           {
             PrintS("new D:\n");
-            iiWriteMatrix((matrix)n->D,"D",1,0);
+            iiWriteMatrix((matrix)n->D,"D",1,currRing,0);
             PrintLn();
           }
@@ -823 +823 @@
                   Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr);
                   PrintS("L:\n");
-                  iiWriteMatrix((matrix)Lj->d,"L",1,0);
+                  iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0);
                 }
 #endif
@@ -957 +957 @@
     //{
     //  PrintS("===================================================\n");
-    //  iiWriteMatrix((matrix)r,"S",1,0);
+    //  iiWriteMatrix((matrix)r,"S",1,currRing,0);
     //  PrintS("\n===================================================\n");
     //}

libpolys/coeffs/coeffWrite

@@ -66 +66 @@
       if (r->minideal!=NULL)
       {
-        if (r==currRing) iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,0);
+        if (r==currRing) iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,r,0);
         else PrintS("//   minpolys=...");
         PrintLn();

libpolys/polys/clapsing.cc

@@ -1273 +1273 @@
     Warn("char_series returns %d x %d matrix from %d input polys (%d)",
       m,n,IDELEMS(I)+1,LL.length());
-    iiWriteMatrix((matrix)I,"I",2,0);
+    iiWriteMatrix((matrix)I,"I",2,r,0);
     m=si_max(m,1);
     n=si_max(n,1);

libpolys/polys/matpol.h

@@ -87 +87 @@
 BOOLEAN mp_IsDiagUnit(matrix U, const ring r);
 
-void iiWriteMatrix(matrix im, const char *n, int dim, const ring r, int spaces=0);
+/// set spaces to zero by default
+void iiWriteMatrix(matrix im, const char *n, int dim, const ring r, int spaces);
+
 char * iiStringMatrix(matrix im, int dim, const ring r, char ch=',');
 

libpolys/polys/monomials/ring.cc

@@ -283 +283 @@
       //if (r->minideal!=NULL)
       //{
-      //  iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,0);
+      //  iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,r,0);
       //  PrintLn();
       //}
@@ -391 +391 @@
       PrintS(" ...");
 
-#if 0  /*Singularg should not differ from Singular except in error case*/
+#if MYTEST  /*Singularg should not differ from Singular except in error case*/
     Print("\n//   noncommutative type:%d", (int)ncRingType(r));
     Print("\n//      is skew constant:%d",r->GetNC()->IsSkewConstant);
@@ -405 +405 @@
 //        {
 //          PrintLn();
-//          iiWriteMatrix((matrix)Q,"scaQ",1);
+          iiWriteMatrix((matrix)Q,"scaQ",1,r,0);
 //        }
 //        else
-            PrintS(" ...");
+//            PrintS(" ...");
       }
       else
@@ -422 +422 @@
     {
       PrintLn();
-      iiWriteMatrix((matrix)r->qideal,"_",1,r);
+      iiWriteMatrix((matrix)r->qideal,"_",1,r,0);
     } else PrintS(" ...");
   }

libpolys/polys/nc/old.gring.cc

@@ -2786 +2786 @@
   {
     PrintS("nc_CallPlural(), Input data, CCC: \n");
-    iiWriteMatrix(CCC, "C", 2, 4, curr);
+    iiWriteMatrix(CCC, "C", 2, curr, 4);
   }
   if( DDD != NULL )
   {
     PrintS("nc_CallPlural(), Input data, DDD: \n");
-    iiWriteMatrix(DDD, "D", 2, 4, curr);
+    iiWriteMatrix(DDD, "D", 2, curr, 4);
   }
 #endif
@@ -3010 +3010 @@
 #if OUTPUT
   PrintS("nc_CallPlural(), Computed data, C: \n");
-  iiWriteMatrix(C, "C", 2, 4, r);
+  iiWriteMatrix(C, "C", 2, r, 4);
 
   PrintS("nc_CallPlural(), Computed data, D: \n");
-  iiWriteMatrix(D, "D", 2, 4, r);
+  iiWriteMatrix(D, "D", 2, r, 4);
 
   Print("\nTemporary: type = %d, IsSkewConstant = %d\n", nctype, IsSkewConstant);

libpolys/polys/nc/sca.cc

@@ -1140 +1140 @@
 #if ((defined(PDEBUG) && OUTPUT) || MYTEST)
   PrintS("Quotient: \n");
-  iiWriteMatrix((matrix)idQuotient,"__",1);
+  iiWriteMatrix((matrix)idQuotient,"__",1, rG, 0);
   PrintS("tempSCAQuotient: \n");
-  iiWriteMatrix((matrix)tempQ,"__",1);
+  iiWriteMatrix((matrix)tempQ,"__",1, rG, 0);
 #endif
 
@@ -1163 +1163 @@
   PrintS("SCAQuotient: \n");
   if(tempQ != NULL)
-    iiWriteMatrix((matrix)tempQ,"__",1);
+    iiWriteMatrix((matrix)tempQ,"__",1, rGR, 0);
   else
     PrintS("(NULL)\n");