Changeset eea50a in git for libpolys/coeffs/bigintmat.cc

Timestamp:

Jun 20, 2012, 12:28:22 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

afda228e98d9cb285f30c2bb20125b83462b7ecd

Parents:

91c8a9344b090c87f8af8b4f8f02bfca00510479

Message:

fix: bigintmat-transpose

File:

• libpolys/coeffs/bigintmat.cc (modified) (3 diffs)

libpolys/coeffs/bigintmat.cc

@@ -24 +24 @@
     for (int j=1; j<=col; j++)
     {
-      t->set(j, i, v[(i-1)*col+(j-1)]);
+      t->set(j, i, BIMATELEM(*this,i,j));
     }
   }
@@ -115 +115 @@
 {
   if (a->cols() != b->cols()) return NULL;
+  if (a->rows() != b->rows()) return NULL;
   if (a->basecoeffs() != b->basecoeffs()) { return NULL; }
 
-  const int mn = si_min(a->rows(),b->rows());
-  const int ma = si_max(a->rows(),b->rows());
-
   const coeffs basecoeffs = a->basecoeffs();
 
   int i;
 
-  if (a->cols() == 1)
-  {
-    bigintmat * bim = new bigintmat(ma, 1, basecoeffs);
-
-    for (i=0; i<mn; i++)
-      bim->rawset(i, n_Add((*a)[i], (*b)[i], basecoeffs), basecoeffs);
-
-    if (ma > mn)
-    {
-      if (ma == a->rows())
-        for(i=mn; i<ma; i++)
-          bim->set(i, (*a)[i], basecoeffs);
-      else
-        for(i=mn; i<ma; i++)
-          bim->set(i, (*b)[i], basecoeffs);
-    }
-    return bim;
-  }
-
-  if (mn != ma) return NULL;
-
-  bigintmat * bim = new bigintmat(mn, a->cols(), basecoeffs);
-
-  for (i=0; i<mn*a->cols(); i++)
+  bigintmat * bim = new bigintmat(a->rows(), a->cols(), basecoeffs);
+
+  for (i=a->rows()*a->cols()-1;i>=0; i--)
     bim->rawset(i, n_Add((*a)[i], (*b)[i], basecoeffs), basecoeffs);
 
@@ -174 +151 @@
 {
   if (a->cols() != b->cols()) return NULL;
+  if (a->rows() != b->rows()) return NULL;
   if (a->basecoeffs() != b->basecoeffs()) { return NULL; }
 
-  const int mn = si_min(a->rows(),b->rows());
-  const int ma = si_max(a->rows(),b->rows());
-
   const coeffs basecoeffs = a->basecoeffs();
 
   int i;
 
-  if (a->cols() == 1)
-  {
-    bigintmat * bim = new bigintmat(ma, 1, basecoeffs);
-
-    for (i=0; i<mn; i++)
-      bim->rawset(i, n_Sub((*a)[i], (*b)[i], basecoeffs), basecoeffs);
-
-    if (ma > mn)
-    {
-      if (ma == a->rows())
-      {
-        for(i=mn; i<ma; i++)
-          bim->set(i, (*a)[i], basecoeffs);
-      }
-      else
-        for(i=mn; i<ma; i++)
-        {
-          number n = b->get(i);
-          n = n_Neg(n, basecoeffs);
-          bim->rawset(i, n, basecoeffs);
-        }
-    }
-    return bim;
-  }
-
-  if (mn != ma) return NULL;
-
-  bigintmat * bim = new bigintmat(mn, a->cols(), basecoeffs);
-
-  for (i=0; i<mn*a->cols(); i++)
+  bigintmat * bim = new bigintmat(a->rows(), a->cols(), basecoeffs);
+
+  for (i=a->rows()*a->cols()-1;i>=0; i--)
     bim->rawset(i, n_Sub((*a)[i], (*b)[i], basecoeffs), basecoeffs);