Changeset 75f10d in git for libpolys

Timestamp:

May 10, 2012, 1:59:15 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6f0279ecd605db3872247f2211d8efd1ac65d42a

Parents:

c8302bb70ef743b5705287005391184566e69b06

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-05-10 13:59:15+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-05-10 13:59:37+02:00

Message:

add: bigintmat stuff from master

Location:

libpolys/coeffs

Files:

• bigintmat.cc (modified) (16 diffs)
• bigintmat.h (modified) (5 diffs)

libpolys/coeffs/bigintmat.cc

@@ -32 +32 @@
   assume (i > 0 && j > 0);
   assume (i <= rows() && j <= cols());
-  
+
   set(index(i, j), n, C);
 }
@@ -40 +40 @@
   assume (i >= 0);
   assume (i<rows()*cols());
-  
+
   return n_Copy(v[i], basecoeffs());
 }
@@ -48 +48 @@
   assume (i > 0 && j > 0);
   assume (i <= rows() && j <= cols());
-  
+
   return get(index(i, j));
 }
@@ -57 +57 @@
 {
   number iop = n_Init(intop, basecoeffs());
-  
+
   inpMult(iop, basecoeffs());
-  
+
   n_Delete(&iop, basecoeffs());
 }
@@ -66 +66 @@
 {
   assume (C == NULL || C == basecoeffs());
-  
+
   const int l = rows() * cols();
 
@@ -85 +85 @@
 
   const int l = (lhr.rows())*(lhr.cols());
-  
+
   for (int i=0; i < l; i++)
   {
     if (!n_Equal(lhr[i], rhr[i], lhr.basecoeffs())) { return false; }
   }
-  
+
   return true;
 }
@@ -104 +104 @@
   if (a->cols() != b->cols()) 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;
 
@@ -115 +115 @@
   {
     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)
     {
@@ -130 +130 @@
     return bim;
   }
-  
+
   if (mn != ma) return NULL;
 
   bigintmat * bim = new bigintmat(mn, a->cols(), basecoeffs);
-  
+
   for (i=0; i<mn*a->cols(); i++)
     bim->rawset(i, n_Add((*a)[i], (*b)[i], basecoeffs), basecoeffs);
-  
+
+  return bim;
+}
+bigintmat * bimAdd(bigintmat * a, int b)
+{
+
+  const int mn = a->rows()*a->cols();
+
+  const coeffs basecoeffs = a->basecoeffs();
+  number bb=n_Init(b,basecoeffs);
+
+  int i;
+
+  bigintmat * bim = new bigintmat(a->rows(),a->cols() , basecoeffs);
+
+  for (i=0; i<mn; i++)
+    bim->rawset(i, n_Add((*a)[i], bb, basecoeffs), basecoeffs);
+
+  n_Delete(&bb,basecoeffs);
   return bim;
 }
@@ -156 +174 @@
   {
     bigintmat * bim = new bigintmat(ma, 1, basecoeffs);
-    
+
     for (i=0; i<mn; i++)
       bim->rawset(i, n_Sub((*a)[i], (*b)[i], basecoeffs), basecoeffs);
@@ -177 +195 @@
     return bim;
   }
-  
+
   if (mn != ma) return NULL;
-  
+
   bigintmat * bim = new bigintmat(mn, a->cols(), basecoeffs);
-  
+
   for (i=0; i<mn*a->cols(); i++)
     bim->rawset(i, n_Sub((*a)[i], (*b)[i], basecoeffs), basecoeffs);
-  
+
+  return bim;
+}
+
+bigintmat * bimSub(bigintmat * a, int b)
+{
+
+  const int mn = a->rows()*a->cols();
+
+  const coeffs basecoeffs = a->basecoeffs();
+  number bb=n_Init(b,basecoeffs);
+
+  int i;
+
+  bigintmat * bim = new bigintmat(a->rows(),a->cols() , basecoeffs);
+
+  for (i=0; i<mn; i++)
+    bim->rawset(i, n_Sub((*a)[i], bb, basecoeffs), basecoeffs);
+
+  n_Delete(&bb,basecoeffs);
   return bim;
 }
@@ -195 +232 @@
   const int ra = a->rows();
   const int rb = b->rows();
-  
+
   if (ca != rb)
   {
@@ -203 +240 @@
     return NULL;
   }
-  
+
   assume (ca == rb);
-  
+
   if (a->basecoeffs() != b->basecoeffs()) { return NULL; }
-  
+
   const coeffs basecoeffs = a->basecoeffs();
 
   int i, j, k;
-  
+
   number sum;
-  
+
   bigintmat * bim = new bigintmat(ra, cb, basecoeffs);
-  
+
   for (i=0; i<ra; i++)
     for (j=0; j<cb; j++)
     {
       sum = n_Init(0, basecoeffs);
-      
+
       for (k=0; k<ca; k++)
       {
         number prod = n_Mult( BIMATELEM(*a, i, k), BIMATELEM(*b, k, j), basecoeffs);
-        
+
         number sum2 = n_Add(sum, prod, basecoeffs); // no inplace add :(
-        
+
         n_Delete(&sum, basecoeffs); n_Delete(&prod, basecoeffs);
-        
+
         sum = sum2;
       }
       bim->rawset(i+1, j+1, sum, basecoeffs);
     }
+  return bim;
+}
+
+bigintmat * bimMult(bigintmat * a, int b)
+{
+
+  const int mn = a->rows()*a->cols();
+
+  const coeffs basecoeffs = a->basecoeffs();
+  number bb=n_Init(b,basecoeffs);
+
+  int i;
+
+  bigintmat * bim = new bigintmat(a->rows(),a->cols() , basecoeffs);
+
+  for (i=0; i<mn; i++)
+    bim->rawset(i, n_Mult((*a)[i], bb, basecoeffs), basecoeffs);
+
+  n_Delete(&bb,basecoeffs);
+  return bim;
+}
+
+bigintmat * bimMult(bigintmat * a, number b, const coeffs cf)
+{
+  if (cf!=a->basecoeffs()) return NULL;
+
+  const int mn = a->rows()*a->cols();
+
+  const coeffs basecoeffs = a->basecoeffs();
+
+  int i;
+
+  bigintmat * bim = new bigintmat(a->rows(),a->cols() , basecoeffs);
+
+  for (i=0; i<mn; i++)
+    bim->rawset(i, n_Mult((*a)[i], b, basecoeffs), basecoeffs);
+
   return bim;
 }
@@ -251 +325 @@
   const int l = (b->rows())*(b->cols());
   bigintmat * bim = new bigintmat(b->rows(), b->cols(), C);
-  
+
   for (int i=0; i < l; i++)
     bim->rawset(i, n_Init((*b)[i], C), C);
-  
+
   return bim;
 }
@@ -307 +381 @@
   if (b == NULL)
     return NULL;
-    
+
   return new bigintmat(b);
 }
@@ -434 +508 @@
 {
   const coeffs basecoeffs = bimat->basecoeffs();
-  
+
   number tgcd, m;
   int i=bimat->cols();

libpolys/coeffs/bigintmat.h

@@ -91 +91 @@
       return v[i];
     }
+#define BIMATELEM(M,I,J) (M)[(I-1)*(M).cols()+J-1]
 
     /// UEberladener *=-Operator (fuer int und bigint)
     /// Frage hier: *= verwenden oder lieber = und * einzeln?
     void operator*=(int intop);
-    
+
     void inpMult(number bintop, const coeffs C = NULL);
 
@@ -115 +116 @@
     {
       assume (rows() >= 0 && cols() >= 0);
-      
+
       assume (r > 0 && c > 0);
       assume (r <= rows() && r <= cols());
@@ -134 +135 @@
     /// NOTE: starts at [1,1]
     void set(int i, int j, number n, const coeffs C = NULL);
-    
+
     /// replace an entry with a copy (delete old + copy new!).
     /// NOTE: starts at [0]
@@ -152 +153 @@
       {
         n_Delete(&(v[i]), basecoeffs()); v[i] = n;
-      } else
-      {
+      }
 #ifndef NDEBUG
+      else
+      {
         Werror("wrong bigintmat index:%d\n",i);
+      }
 #endif
-      }
-    }
-    
+    }
+
     inline void rawset(int i, int j, number n, const coeffs C = NULL)
     {
@@ -177 +179 @@
 /// NOTE: NULL as a result means an error (non-compatible matrices?)
 bigintmat * bimAdd(bigintmat * a, bigintmat * b);
+bigintmat * bimAdd(bigintmat * a, int b);
 bigintmat * bimSub(bigintmat * a, bigintmat * b);
+bigintmat * bimSub(bigintmat * a, int b);
 bigintmat * bimMult(bigintmat * a, bigintmat * b);
+bigintmat * bimMult(bigintmat * a, int b);
+bigintmat * bimMult(bigintmat * a, number b, const coeffs cf);
 bigintmat * bimCopy(const bigintmat * b);