Peter Bruin on Thu, 14 Feb 2019 17:57:42 +0100


[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]

patch: shallowmatconcat -> vconcat in ZM_mul_sw


Bonjour,

Here is a patch to replace shallowmatconcat by vconcat/shallowconcat in
ZM_mul_sw, inspired by Bill's recent commit 379102847.

Thanks,

Peter


>From 9270be70836c0722bae27aca7614fb6466df30d9 Mon Sep 17 00:00:00 2001
From: Peter Bruin <P.J.Bruin@math.leidenuniv.nl>
Date: Thu, 14 Feb 2019 17:47:23 +0100
Subject: [PATCH] ZM_mul_sw: use vconcat instead of shallowmatconcat

---
 src/basemath/ZV.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/basemath/ZV.c b/src/basemath/ZV.c
index 4ab40da28..03f104bca 100644
--- a/src/basemath/ZV.c
+++ b/src/basemath/ZV.c
@@ -358,8 +358,8 @@ ZM_mul_sw(GEN A, GEN B, long m, long n, long p)
   C22 = add_slices(m2, p2, V2, 0, m2, 0, p2, M3, 0, m2, 0, p2);
   if (gc_needed(av, 1))
     gerepileall(av, 4, &C11, &C12, &C21, &C22);  /* destroy V2, M3 */
-  C = mkmat2(mkcol2(C11, C21), mkcol2(C12, C22));
-  return gerepilecopy(av, shallowmatconcat(C));
+  C = shallowconcat(vconcat(C11, C21), vconcat(C12, C22));
+  return gerepilecopy(av, C);
 }
 
 /* x[i,]*y. Assume lg(x) > 1 and 0 < i < lgcols(x) */
-- 
2.19.2