From 34a835766f7b5dd1d5b3ecd85d243b4bdb4d3347 Mon Sep 17 00:00:00 2001
From: Raphael Boucherie <rboucher@zimbra.inria.fr>
Date: Mon, 3 Apr 2017 18:02:52 +0200
Subject: [PATCH] added temporary Makefile
---
Makefile | 11 +++++++++++
include/libhqr.h | 2 +-
src/treewalk.c | 19 ++++++++++++++-----
testings/testing_treewalk.c | 1 -
4 files changed, 26 insertions(+), 7 deletions(-)
create mode 100644 Makefile
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a7156c3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+
+
+
+testing_pivgen :
+ gcc -Iinclude/ src/* testings/testing_pivgen.c -lm
+
+testing_treewalk :
+ gcc -Iinclude/ src/* testings/testing_treewalk.c -lm
+
+clean :
+ rm testing_pivgen testing_treewalk src/*~ testings/*~ include/*~
diff --git a/include/libhqr.h b/include/libhqr.h
index 5421c0d..85a4589 100644
--- a/include/libhqr.h
+++ b/include/libhqr.h
@@ -184,7 +184,7 @@ void libhqr_hqr_finalize( libhqr_tree_t *qrtree );
* function for treewalk
*/
-void libhqr_treewalk(libhqr_tree_t *qrtree,int k);
+void libhqr_treewalk(const libhqr_tree_t *qrtree,int k);
/*
* Debugging functions
diff --git a/src/treewalk.c b/src/treewalk.c
index acb5fab..de909c4 100644
--- a/src/treewalk.c
+++ b/src/treewalk.c
@@ -141,7 +141,18 @@ void libhqr_queue_tile_delete (libhqr_queue_tile_t ** queue_tile)
* LIBHQR_TREEWALK
***************************************************/
-void libhqr_treewalk(libhqr_tree_t *qrtree,int k){
+/**
+ * libhqr_treewalk
+ *
+ * @param[in] arg
+ * Arguments specific to the reduction tree used
+ *
+ * @param[in] k
+ * Factorization step
+ *
+ */
+
+void libhqr_treewalk(const libhqr_tree_t *qrtree,int k){
int pivot = qrtree->mt;
printf("%d\n" , pivot);
int p = pivot;
@@ -149,9 +160,8 @@ void libhqr_treewalk(libhqr_tree_t *qrtree,int k){
int a,b;
libhqr_queue_tile_t *tt = libhqr_queue_tile_new();
libhqr_queue_tile_t *ts = libhqr_queue_tile_new();
- while(p = qrtree->nextpiv(qrtree, k, pivot, p) != -1){
- while(qrtree->prevpiv(qrtree, k, pivot, p)){
- p = qrtree->prevpiv(qrtree, k, pivot, p);
+ while(p = qrtree->nextpiv(qrtree, k, pivot, p)){
+ while(p = qrtree->prevpiv(qrtree, k, pivot, p)){
printf("%d\n" , p);
if(qrtree->gettype(qrtree, k, p)){
libhqr_queue_tile_post(&tt,p);
@@ -171,7 +181,6 @@ void libhqr_treewalk(libhqr_tree_t *qrtree,int k){
printf("%d\n" , a);
}
libhqr_queue_tile_last(&tt);
- p = tt->numero;
libhqr_queue_tile_get(&tt);
}
}
diff --git a/testings/testing_treewalk.c b/testings/testing_treewalk.c
index 3ca3a0e..58dc610 100644
--- a/testings/testing_treewalk.c
+++ b/testings/testing_treewalk.c
@@ -43,7 +43,6 @@ int main(int argc, char ** argv)
rc = libhqr_tree_check( &matrix, &qrtree );
printf("%d\n", rc);
for (k=0; k<minMN; k++) {
-
libhqr_treewalk( &qrtree, k);
}
libhqr_hqr_finalize( &qrtree );
--
GitLab