Changeset fc2746 in git


Ignore:
Timestamp:
Mar 5, 2012, 5:24:33 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '648d28f488f6ff08f5607ff229b9ad9e4a5b93c2')
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:
7 edited

Legend:

Unmodified
Added
Removed
  • kernel/kstdfac.cc

    r9e26458 rfc2746  
    409409        {
    410410          PrintS("new D:\n");
    411           iiWriteMatrix((matrix)n->D,"D",1,0);
     411          iiWriteMatrix((matrix)n->D,"D",1,currRing,0);
    412412          PrintLn();
    413413        }
     
    501501                Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr);
    502502                PrintS("L:\n");
    503                 iiWriteMatrix((matrix)Lj->d,"L",1,0);
     503                iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0);
    504504              }
    505505#endif
     
    727727          {
    728728            PrintS("new D:\n");
    729             iiWriteMatrix((matrix)n->D,"D",1,0);
     729            iiWriteMatrix((matrix)n->D,"D",1,currRing,0);
    730730            PrintLn();
    731731          }
     
    823823                  Print("empty set s(%d) because:L[%d]\n",n->nr,Lj->nr);
    824824                  PrintS("L:\n");
    825                   iiWriteMatrix((matrix)Lj->d,"L",1,0);
     825                  iiWriteMatrix((matrix)Lj->d,"L",1,currRing,0);
    826826                }
    827827#endif
     
    957957    //{
    958958    //  PrintS("===================================================\n");
    959     //  iiWriteMatrix((matrix)r,"S",1,0);
     959    //  iiWriteMatrix((matrix)r,"S",1,currRing,0);
    960960    //  PrintS("\n===================================================\n");
    961961    //}
  • libpolys/coeffs/coeffWrite

    r9e26458 rfc2746  
    6666      if (r->minideal!=NULL)
    6767      {
    68         if (r==currRing) iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,0);
     68        if (r==currRing) iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,r,0);
    6969        else PrintS("//   minpolys=...");
    7070        PrintLn();
  • libpolys/polys/clapsing.cc

    r9e26458 rfc2746  
    12731273    Warn("char_series returns %d x %d matrix from %d input polys (%d)",
    12741274      m,n,IDELEMS(I)+1,LL.length());
    1275     iiWriteMatrix((matrix)I,"I",2,0);
     1275    iiWriteMatrix((matrix)I,"I",2,r,0);
    12761276    m=si_max(m,1);
    12771277    n=si_max(n,1);
  • libpolys/polys/matpol.h

    r9e26458 rfc2746  
    8787BOOLEAN mp_IsDiagUnit(matrix U, const ring r);
    8888
    89 void iiWriteMatrix(matrix im, const char *n, int dim, const ring r, int spaces=0);
     89/// set spaces to zero by default
     90void iiWriteMatrix(matrix im, const char *n, int dim, const ring r, int spaces);
     91
    9092char * iiStringMatrix(matrix im, int dim, const ring r, char ch=',');
    9193
  • libpolys/polys/monomials/ring.cc

    r9e26458 rfc2746  
    283283      //if (r->minideal!=NULL)
    284284      //{
    285       //  iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,0);
     285      //  iiWriteMatrix((matrix)r->minideal,"//   minpolys",1,r,0);
    286286      //  PrintLn();
    287287      //}
     
    391391      PrintS(" ...");
    392392
    393 #if 0  /*Singularg should not differ from Singular except in error case*/
     393#if MYTEST  /*Singularg should not differ from Singular except in error case*/
    394394    Print("\n//   noncommutative type:%d", (int)ncRingType(r));
    395395    Print("\n//      is skew constant:%d",r->GetNC()->IsSkewConstant);
     
    405405//        {
    406406//          PrintLn();
    407 //          iiWriteMatrix((matrix)Q,"scaQ",1);
     407          iiWriteMatrix((matrix)Q,"scaQ",1,r,0);
    408408//        }
    409409//        else
    410             PrintS(" ...");
     410//            PrintS(" ...");
    411411      }
    412412      else
     
    422422    {
    423423      PrintLn();
    424       iiWriteMatrix((matrix)r->qideal,"_",1,r);
     424      iiWriteMatrix((matrix)r->qideal,"_",1,r,0);
    425425    } else PrintS(" ...");
    426426  }
  • libpolys/polys/nc/old.gring.cc

    r9e26458 rfc2746  
    27862786  {
    27872787    PrintS("nc_CallPlural(), Input data, CCC: \n");
    2788     iiWriteMatrix(CCC, "C", 2, 4, curr);
     2788    iiWriteMatrix(CCC, "C", 2, curr, 4);
    27892789  }
    27902790  if( DDD != NULL )
    27912791  {
    27922792    PrintS("nc_CallPlural(), Input data, DDD: \n");
    2793     iiWriteMatrix(DDD, "D", 2, 4, curr);
     2793    iiWriteMatrix(DDD, "D", 2, curr, 4);
    27942794  }
    27952795#endif
     
    30103010#if OUTPUT
    30113011  PrintS("nc_CallPlural(), Computed data, C: \n");
    3012   iiWriteMatrix(C, "C", 2, 4, r);
     3012  iiWriteMatrix(C, "C", 2, r, 4);
    30133013
    30143014  PrintS("nc_CallPlural(), Computed data, D: \n");
    3015   iiWriteMatrix(D, "D", 2, 4, r);
     3015  iiWriteMatrix(D, "D", 2, r, 4);
    30163016
    30173017  Print("\nTemporary: type = %d, IsSkewConstant = %d\n", nctype, IsSkewConstant);
  • libpolys/polys/nc/sca.cc

    r9e26458 rfc2746  
    11401140#if ((defined(PDEBUG) && OUTPUT) || MYTEST)
    11411141  PrintS("Quotient: \n");
    1142   iiWriteMatrix((matrix)idQuotient,"__",1);
     1142  iiWriteMatrix((matrix)idQuotient,"__",1, rG, 0);
    11431143  PrintS("tempSCAQuotient: \n");
    1144   iiWriteMatrix((matrix)tempQ,"__",1);
     1144  iiWriteMatrix((matrix)tempQ,"__",1, rG, 0);
    11451145#endif
    11461146
     
    11631163  PrintS("SCAQuotient: \n");
    11641164  if(tempQ != NULL)
    1165     iiWriteMatrix((matrix)tempQ,"__",1);
     1165    iiWriteMatrix((matrix)tempQ,"__",1, rGR, 0);
    11661166  else
    11671167    PrintS("(NULL)\n");
Note: See TracChangeset for help on using the changeset viewer.