Changeset e9d581 in git

Timestamp:

Jul 22, 2013, 2:24:06 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

13a03bf0c76a48e756ec7fbd4e7c57a45432e301

Parents:

5b6807c5be64d7eb424e7d933a00f8cbb137d50c

Message:

add: concat for intmat, bigintmat

Location:

libpolys

Files:

• coeffs/bigintmat.cc (modified) (1 diff)
• coeffs/bigintmat.h (modified) (1 diff)
• misc/intvec.cc (modified) (1 diff)
• misc/intvec.h (modified) (1 diff)

libpolys/coeffs/bigintmat.cc

@@ -773 +773 @@
 }
 
-
-
-
-
+// columnwise concatination of two bigintmats
+bigintmat * bimConcat(bigintmat * a, bigintmat * b, const coeffs cf)
+{
+  int ac=a->cols();
+  int r=si_max(a->rows(),b->rows());
+  bigintmat * ab = new bigintmat(r,ac + b->cols(),cf);
+
+  int i,j;
+  for (i=1; i<=a->rows(); i++)
+  {
+    for (j=1; j<=ac; j++)
+    {
+      n_Delete(&(BIMATELEM(*ab,i,j)),cf);
+      BIMATELEM(*ab,i,j)=n_Copy(BIMATELEM(*a,i,j),cf);
+    }
+  }
+
+  for (i=1; i<=b->rows(); i++)
+  {
+    for (j=1; j<=b->cols(); j++)
+    {
+      n_Delete(&(BIMATELEM(*ab,i,j+ac)),cf);
+      BIMATELEM(*ab,i,j+ac)=n_Copy(BIMATELEM(*b,i,j),cf);
+    }
+  }
+
+  return ab;
+}
+

libpolys/coeffs/bigintmat.h

@@ -202 +202 @@
 intvec * bim2iv(bigintmat * b);
 bigintmat * iv2bim(intvec * b, const coeffs C);
-
-
+bigintmat * bimConcat(bigintmat * a, bigintmat * b, const coeffs C);
 #endif // #ifndef BIGINTMAT_H

libpolys/misc/intvec.cc

@@ -814 +814 @@
 }
 
+// columnwise concatination of two intvecs
+intvec * ivConcat(intvec * a, intvec * b)
+{
+  int ac=a->cols();
+  int c = ac + b->cols(); int r = si_max(a->rows(),b->rows());
+  intvec * ab = new intvec(r,c,0);
+
+  int i,j;
+  for (i=1; i<=a->rows(); i++)
+  {
+    for(j=1; j<=ac; j++)
+      IMATELEM(*ab,i,j) = IMATELEM(*a,i,j);
+  }
+  for (i=1; i<=b->rows(); i++)
+  {
+    for(j=1; j<=b->cols(); j++)
+      IMATELEM(*ab,i,j+ac) = IMATELEM(*b,i,j);
+  }
+  return ab;
+}
+
 #pragma GCC pop_options
 

libpolys/misc/intvec.h

@@ -146 +146 @@
 void     ivTriangIntern(intvec * imat, int &ready, int &all);
 intvec * ivSolveKern(intvec * imat, int ready);
+intvec * ivConcat(intvec * a, intvec * b);
 
 #ifdef MDEBUG