From e3daaa91d5c5f77a99c33bc7601392354b5e2373 Mon Sep 17 00:00:00 2001
From: Raphael Boucherie <raphael.boucherie@inria.fr>
Date: Wed, 12 Apr 2017 17:30:32 +0200
Subject: [PATCH] Almost finished, need to fix issue with line for multiple
step
---
include/libdraw.h | 2 +-
include/libhqr.h | 9 ------
src/treedraw.c | 4 +--
testings/testing_treedraw.c | 58 +++++++++++++++++++++++++++----------
4 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/include/libdraw.h b/include/libdraw.h
index e245f75..35e836a 100644
--- a/include/libdraw.h
+++ b/include/libdraw.h
@@ -35,7 +35,7 @@ void libhqr_writeheader(FILE *tree);
void libhqr_writeend(FILE *tree);
void libhqr_drawTT(int x, int y, int w, int h, int k, FILE *tree);
void libhqr_drawTS(int x, int y, int w, int h, int k, FILE *tree);
-void libhqr_drawline(int x1, int y1, int x2, int y2, FILE *tree);
+void libhqr_drawline(int x1, int y1, int x2, int y2, int k, FILE *tree);
END_C_DECLS
diff --git a/include/libhqr.h b/include/libhqr.h
index d075339..d0da407 100644
--- a/include/libhqr.h
+++ b/include/libhqr.h
@@ -78,15 +78,6 @@ typedef enum libhqr_typefacto_ {
LIBHQR_LQ = 1,
} libhqr_typefacto_e;
-/* /\** */
-/* * @brief Structure for stocking informations in order to draw the tree */
-/* *\/ */
-/* typedef struct libhqr_treedraw_s{ */
-/* int k; /\**< The factorization step for the color *\/ */
-/* int *tiles; /\**< Table for tiles *\/ */
-/* int tiles_size; /\**< Size of the table *\/ */
-/* } libhqr_treedraw_t; */
-
/**
* @brief Minimal structure to define the shape of the matrix to factorize.
*/
diff --git a/src/treedraw.c b/src/treedraw.c
index 99b2b55..a051e2c 100644
--- a/src/treedraw.c
+++ b/src/treedraw.c
@@ -59,8 +59,8 @@ void libhqr_drawTS(int x, int y, int w, int h, int k, FILE *tree){
if(fprintf(tree,"<rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" fill =\"white\"/> \n", x2, y2, w2, h2) < 0 ) return;
}
-void libhqr_drawline(int x1, int y1, int x2, int y2, FILE *tree){
- if(fprintf(tree,"<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" style=\"fill:none;stroke:black;stroke-width:2px;\"/> \n", x1, y1, x2, y2) < 0 ) return;
+void libhqr_drawline(int x1, int y1, int x2, int y2, int k, FILE *tree){
+ if(fprintf(tree,"<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" style=\"fill:none;stroke:%s;stroke-width:2px;\"/> \n", x1, y1, x2, y2, color[k%4]) < 0 ) return;
}
void libhqr_writeend(FILE *tree){
diff --git a/testings/testing_treedraw.c b/testings/testing_treedraw.c
index b8c13a7..bb5c9e5 100644
--- a/testings/testing_treedraw.c
+++ b/testings/testing_treedraw.c
@@ -29,13 +29,13 @@ main(int argc, char ** argv)
{
libhqr_tree_t qrtree;
libhqr_tiledesc_t matrix;
- int maxMN, x1, y1, x2, y2;
+ int maxMN, x1, y1, x2, y2, k, i, j;
int *tiles;
matrix.nodes = 1;
matrix.p = 1;
- matrix.mt = 8;
+ matrix.mt = 16;
matrix.nt = 4;
- libhqr_hqr_init( &qrtree, LIBHQR_QR, &matrix, LIBHQR_BINARY_TREE, LIBHQR_FLAT_TREE, 1, 1, 0, 0);
+ libhqr_hqr_init( &qrtree, LIBHQR_QR, &matrix, LIBHQR_FLAT_TREE, LIBHQR_FLAT_TREE, 1, 2, 0, 0);
maxMN = libhqr_imax(matrix.mt, matrix.nt );
tiles = (int*)malloc(maxMN*sizeof(int));
for ( int i = 0; i < maxMN; i++){
@@ -43,18 +43,46 @@ main(int argc, char ** argv)
}
FILE *tree = fopen("tree.svg","w+");
libhqr_writeheader(tree);
- libhqr_treewalk(&qrtree, 0, tiles);
- for ( int i = 0; i < maxMN; i++){
- x1 = 50;
- y1 = y2 = 50 + 50 * i;
- x2 = 50 + 50*tiles[i];
- libhqr_drawline(x1, y1, x2, y2, tree);
- }
- for ( int i = 1; i < maxMN; i++){
- x1 = x2 = 50 + 50*tiles[i];
- y1 = 50 + 50 * i;
- y2 = 50 + 50 * (qrtree.currpiv(&qrtree, 0, i));
- libhqr_drawline(x1, y1, x2, y2, tree);
+ for (k = 0; k < 2; k++){
+ libhqr_treewalk(&qrtree, k, tiles);
+
+ /* Drawing the lines */
+ for (i = 0; i < maxMN; i++){
+ /* Drawing the horizontal line */
+ x1 = 100;
+ y1 = y2 = 100 + 100 * i;
+ x2 = 100 + 100*tiles[i];
+ libhqr_drawline(x1, y1, x2, y2, k, tree);
+ /* Drawing the vertical line */
+ if (i > 0){
+ x1 = x2 = 100 + 100 * tiles[i];
+ y1 = 100 + 100 * i;
+ y2 = 100 + 100 * (qrtree.currpiv(&qrtree, k, i));
+ libhqr_drawline(x1, y1, x2, y2, k, tree);
+ }
+ }
+
+ /* Drawing the rectangles */
+ for (i = 1; i < maxMN; i++){
+ if(qrtree.gettype(&qrtree, k, i) == 0){
+ x1 = 75 + 100 * tiles[i];
+ y1 = 75 + 100 * i;
+ libhqr_drawTS(x1, y1, WIDTH, HEIGHT, k, tree);
+ j = qrtree.currpiv(&qrtree, k, i);
+ x1 = 75 + 100 * tiles[i];
+ y1 = 75 + 100 * j;
+ libhqr_drawTT(x1, y1, WIDTH, HEIGHT, k, tree);
+ }
+ else {
+ x1 = 75 + 100 * tiles[i];
+ y1 = 75 + 100 * i;
+ libhqr_drawTS(x1, y1, WIDTH, HEIGHT, k, tree);
+ j = qrtree.currpiv(&qrtree, k, i);
+ x1 = 75 + 100 * tiles[i];
+ y1 = 75 + 100 * j;
+ libhqr_drawTT(x1, y1, WIDTH, HEIGHT, k, tree);
+ }
+ }
}
libhqr_writeend(tree);
free(tree);
--
GitLab