Changeset 510dbc in git

Timestamp:

Jun 1, 2012, 12:46:23 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

6284186fbb128f1c5a0c99ff170cec4bb5afd5a3

Parents:

98d6c34c2a74edb284caaeaec97a1295a4c2a402

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-06-01 12:46:23+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-06-01 12:46:50+02:00

Message:

add: transpose for bigintmat

Files:

• Singular/iparith.cc (modified) (1 diff)
• Singular/table.h (modified) (1 diff)
• libpolys/coeffs/bigintmat.cc (modified) (8 diffs)
• libpolys/coeffs/bigintmat.h (modified) (3 diffs)

Singular/iparith.cc

@@ -4863 +4863 @@
 {
   res->data = (char *)(long)ivTrace((intvec*)(v->Data()));
+  return FALSE;
+}
+static BOOLEAN jjTRANSP_BIM(leftv res, leftv v)
+{
+  res->data = (char *)(((bigintmat*)(v->Data()))->transpose());
   return FALSE;
 }

Singular/table.h

@@ -264 +264 @@
 ,{D(jjTRANSP_IV),  TRANSPOSE_CMD,   INTMAT_CMD,     INTVEC_CMD    , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjTRANSP_IV),  TRANSPOSE_CMD,   INTMAT_CMD,     INTMAT_CMD    , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjTRANSP_BIM), TRANSPOSE_CMD,   BIGINTMAT_CMD,  BIGINTMAT_CMD , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjmpTransp),   TRANSPOSE_CMD,   XS(MATRIX_CMD), MATRIX_CMD    , ALLOW_PLURAL |ALLOW_RING}
 ,{D(jjidTransp),   TRANSPOSE_CMD,   XS(MODUL_CMD),  MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}

libpolys/coeffs/bigintmat.cc

@@ -17 +17 @@
 #define BIMATELEM(M,I,J) (M)[ (M).index(I,J) ]
 
+bigintmat * bigintmat::transpose()
+{
+  bigintmat * t = new bigintmat(col, row, basecoeffs());
+  for (int i=1; i<=row; i++)
+  {
+    for (int j=1; j<=col; j++)
+    {
+      t->set(j, i, v[(i-1)*col+(j-1)]);
+    }
+  }
+  return t;
+}
 
 // Beginnt bei [0]
@@ -253 +265 @@
   bigintmat * bim = new bigintmat(ra, cb, basecoeffs);
 
-  for (i=0; i<ra; i++)
-    for (j=0; j<cb; j++)
+  for (i=1; i<=ra; i++)
+    for (j=1; j<=cb; j++)
     {
       sum = n_Init(0, basecoeffs);
 
-      for (k=0; k<ca; k++)
+      for (k=1; k<=ca; k++)
       {
         number prod = n_Mult( BIMATELEM(*a, i, k), BIMATELEM(*b, k, j), basecoeffs);
@@ -268 +280 @@
         sum = sum2;
       }
-      bim->rawset(i+1, j+1, sum, basecoeffs);
+      bim->rawset(i, j, sum, basecoeffs);
     }
   return bim;
@@ -407 +419 @@
 }
 
-int bigintmat::getwid(int maxwid)
-{
-  int wid=0;
-  int colwid = floor((maxwid-2*(col-1))/col);
-  for (int i=0; i<col*row; i++)
-  {
-    StringSetS("");
-    n_Write(v[i], basecoeffs());
-    char * tmp = StringAppendS("");
-//    char * ts = omStrDup(tmp);
-    const int _nl = strlen(tmp); // ts?
-    if (_nl > wid)
-    {
-      if (_nl > colwid)
-      {
-        int phwid = floor(log10(row))+floor(log10(col))+5;
-        if ((colwid > phwid) && (wid < phwid))
-          wid = phwid;
-      }
+int intArrSum(int * a, int length)
+{
+  int sum = 0;
+  for (int i=0; i<length; i++)
+    sum += a[i];
+  return sum;
+}
+
+int findLongest(int * a, int length)
+{
+  int l = 0;
+  int index;
+  for (int i=0; i<length; i++)
+  {
+    if (a[i] > l)
+    {
+      l = a[i];
+      index = i;
+    }
+  }
+  return index;
+}
+
+int getShorter (int * a, int l, int j, int cols, int rows)
+{
+  int sndlong = 0;
+  int min;
+  for (int i=0; i<rows; i++)
+  {
+    int index = cols*i+j;
+    if ((a[index] > sndlong) && (a[index] < l))
+    {
+      min = floor(log10(cols))+floor(log10(rows))+5;
+      if ((a[index] < min) && (min < l))
+        sndlong = min;
       else
-        wid = _nl;
-    }
-  }
-  return wid;
+        sndlong = a[index];
+    }
+  }
+  if (sndlong == 0)
+  {
+    min = floor(log10(cols))+floor(log10(rows))+5;
+    if (min < l)
+      sndlong = min;
+    else
+      sndlong = 1;
+  }
+  return sndlong;
+}
+
+
+int * bigintmat::getwid(int maxwid)
+{
+  int const c = /*2**/(col-1)+1;
+  if (col + c > maxwid-1) return NULL;
+  int * wv = (int*)omAlloc(sizeof(int)*col*row);
+  int * cwv = (int*)omAlloc(sizeof(int)*col);
+  for (int j=0; j<col; j++)
+  {
+    cwv[j] = 0;
+    for (int i=0; i<row; i++)
+    {
+      StringSetS("");
+      n_Write(v[col*i+j], basecoeffs());
+      char * tmp = StringAppendS("");
+      const int _nl = strlen(tmp);
+      wv[col*i+j] = _nl;
+      if (_nl > cwv[j])
+        cwv[j]=_nl;
+    }
+  }
+
+  // Groesse verkleinern, bis < maxwid
+  while (intArrSum(cwv, col)+c > maxwid)
+  {
+    int j = findLongest(cwv, col);
+    cwv[j] = getShorter(wv, cwv[j], j, col, row);
+  }
+  omFree(wv);
+  return cwv;
 }
 
@@ -439 +507 @@
   else
   {
-    int colwid = getwid(maxwid);
-    if (colwid*col+2*(col-1) > maxwid)
-      colwid = floor((maxwid-2*(col-1))/col);
+    int * colwid = getwid(maxwid);
+    if (colwid == NULL)
+    {
+      WerrorS("not enough space to print bigintmat");
+      return;
+    }
     char * ps;
-    ps = (char*) omAlloc0(sizeof(char)*(colwid*col*row+2*(col-1)*row+row));
+    int slength = 0;
+    for (int j=0; j<col; j++)
+      slength += colwid[j]*row;
+    slength += col*row+row;
+    ps = (char*) omAlloc0(sizeof(char)*(slength));
     int pos = 0;
     for (int i=0; i<col*row; i++)
@@ -452 +527 @@
       char * ts = omStrDup(temp);
       const int _nl = strlen(ts);
-      if (_nl > colwid)
+      int cj = i%col;
+      if (_nl > colwid[cj])
       {
         StringSetS("");
-        int cj = i%col;
         int ci = floor(i/col);
         StringAppend("[%d,%d]", ci+1, cj+1);
@@ -461 +536 @@
         char * ph = omStrDup(tmp);
         int phl = strlen(ph);
-        if (phl > colwid)
+        if (phl > colwid[cj])
         {
-          for (int j=0; j<colwid; j++)
-            ps[pos+j] = '*';
+          for (int j=0; j<colwid[cj]-1; j++)
+            ps[pos+j] = ' ';
+          ps[pos+colwid[cj]-1] = '*';
         }
         else
         {
-          for (int j=0; j<colwid-phl; j++)
+          for (int j=0; j<colwid[cj]-phl; j++)
             ps[pos+j] = ' ';
           for (int j=0; j<phl; j++)
-            ps[pos+colwid-phl+j] = ph[j];
+            ps[pos+colwid[cj]-phl+j] = ph[j];
         }
         omFree(ph);
@@ -477 +553 @@
       else  // Mit Leerzeichen auffÃŒllen und zahl reinschreiben
       {
-        for (int j=0; j<colwid-_nl; j++)
+        for (int j=0; j<colwid[cj]-_nl; j++)
           ps[pos+j] = ' ';
         for (int j=0; j<_nl; j++)
-          ps[pos+colwid-_nl+j] = ts[j];
-      }
-      // ", " oder "\n" einfÃŒgen
+          ps[pos+colwid[cj]-_nl+j] = ts[j];
+      }
+      // ", " und (evtl) "\n" einfÃŒgen
       if ((i+1)%col == 0)
       {
         if (i != col*row-1)
         {
-          ps[pos+colwid] = '\n';
-          pos += colwid+1;
+          ps[pos+colwid[cj]] = ',';
+          ps[pos+colwid[cj]+1] = '\n';
+          pos += colwid[cj]+2;
         }
       }
       else
       {
-        ps[pos+colwid] = ',';
-        ps[pos+colwid+1] = ' ';
-        pos += colwid+2;
-      }
-      // Hier ts zerstören
+        ps[pos+colwid[cj]] = ',';
+        pos += colwid[cj]+1;
+      }
+
+      omFree(ts);  // Hier ts zerstören
     }
     PrintS(ps);
-    omFree(ps);
+   // omFree(ps);
   }
 }

libpolys/coeffs/bigintmat.h

@@ -26 +26 @@
     bigintmat(): m_coeffs(NULL), v(NULL), row(1), col(0){}
 
+    bigintmat * transpose();
+
     bigintmat(int r, int c, const coeffs n): m_coeffs(n), v(NULL), row(r), col(c)
     {
@@ -171 +173 @@
     void pprint(int maxwid);
     int compare(const bigintmat* op) const;
-    int getwid(int maxwid);
+    int * getwid(int maxwid);
 };
 
@@ -188 +190 @@
 bigintmat * bimCopy(const bigintmat * b);
 
+int getShorter (int * a, int l, int j, int cols, int rows);
+int findLongest(int * a, int length);
+int intArrSum(int * a, int length);