From: Matthew Fernandez Date: Tue, 29 Jun 2021 03:57:23 +0000 (-0700) Subject: remove GVIEWER-guarded code X-Git-Tag: 2.48.0~16^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=975689afdcf38b4bae56b42858877a1ec5b69370;p=graphviz remove GVIEWER-guarded code Nothing in the build system(s) define this. A lot of this also looks broken. For example, the GVIEWER alternative of the stress_model function sets up an argv whose first string entry is not terminated. --- diff --git a/lib/sfdpgen/post_process.c b/lib/sfdpgen/post_process.c index 946a90ea5..4c79329c2 100644 --- a/lib/sfdpgen/post_process.c +++ b/lib/sfdpgen/post_process.c @@ -628,12 +628,6 @@ real StressMajorizationSmoother_smooth(StressMajorizationSmoother sm, int dim, r } while (iter++ < maxit_sm && diff > tol){ -#ifdef GVIEWER - if (Gviewer) { - drawScene(); - if (iter%2 == 0) gviewer_dump_current_frame(); - } -#endif if (sm->scheme != SM_SCHEME_STRESS_APPROX){ for (i = 0; i < m; i++){ diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c index 209ba64e0..a6d350d30 100644 --- a/lib/sfdpgen/spring_electrical.c +++ b/lib/sfdpgen/spring_electrical.c @@ -541,18 +541,6 @@ void spring_electrical_embedding_fast(int dim, SparseMatrix A0, spring_electrica //start2 = clock(); #endif -#ifdef GVIEWER - if (Gviewer){ - char lab[100]; - snprintf(lab, sizeof(lab), "sfdp, iter=%d", iter); - gviewer_set_label(lab); - gviewer_reset_graph_coord(A, dim, x); - drawScene(); - gviewer_dump_current_frame(); - //if ((adaptive_cooling && iter%100 == 0) || (!adaptive_cooling && iter%10 == 0)) gviewer_dump_current_frame(); - } -#endif - iter++; memcpy(xold, x, sizeof(real)*dim*n); Fnorm0 = Fnorm; @@ -1014,18 +1002,6 @@ void spring_electrical_embedding(int dim, SparseMatrix A0, spring_electrical_con fclose(f); } #endif -#ifdef GVIEWER - if (Gviewer){ - char lab[100]; - snprintf(lab, sizeof(lab), "sfdp, adaptive_cooling = %d iter=%d", - adaptive_cooling, iter); - gviewer_set_label(lab); - gviewer_reset_graph_coord(A, dim, x); - drawScene(); - gviewer_dump_current_frame(); - //if ((adaptive_cooling && iter%100 == 0) || (!adaptive_cooling && iter%10 == 0)) gviewer_dump_current_frame(); - } -#endif iter++; memcpy(xold, x, sizeof(real)*dim*n); @@ -2133,53 +2109,7 @@ static void multilevel_spring_electrical_embedding_core(int dim, SparseMatrix A0 Multilevel_delete(grid0); } -#ifdef GVIEWER -struct multilevel_spring_electrical_embedding_data { - int dim; - SparseMatrix A; - SparseMatrix D; - spring_electrical_control ctrl; - real *node_weights; - real *label_sizes; - real *x; - int n_edge_label_nodes; - int *edge_label_nodes; - int *flag; -}; - -void multilevel_spring_electrical_embedding_gv(void* data){ - struct multilevel_spring_electrical_embedding_data* d; - - d = (struct multilevel_spring_electrical_embedding_data*) data; - multilevel_spring_electrical_embedding_core(d->dim, d->A, d->D, d->ctrl, d->node_weights, d->label_sizes, d->x, d->n_edge_label_nodes, d->edge_label_nodes, d->flag); - gviewer_reset_graph_coord(d->A, d->dim, d->x);/* A inside spring_electrical gets deleted */ -} -void multilevel_spring_electrical_embedding(int dim, SparseMatrix A, SparseMatrix D, spring_electrical_control ctrl, real *node_weights, real *label_sizes, - real *x, int n_edge_label_nodes, int *edge_label_nodes, int *flag){ - struct multilevel_spring_electrical_embedding_data data = {dim, A, D, ctrl, node_weights, label_sizes, x, n_edge_label_nodes, edge_label_nodes, flag}; - - int argcc = 1; - char **argvv; - - if (!Gviewer) return multilevel_spring_electrical_embedding_core(dim, A, D, ctrl, node_weights, label_sizes, x, n_edge_label_nodes, edge_label_nodes, flag); - - argcc = 1; - argvv = malloc(sizeof(char*)*argcc); - argvv[0] = malloc(sizeof(char)); - argvv[0][0] = '1'; - - gviewer_set_edge_color_scheme(COLOR_SCHEME_NO); - //gviewer_set_edge_color_scheme(COLOR_SCHEME_MEDIAN_AS_GREEN); - gviewer_toggle_bgcolor(); - //gviewer_toggle_vertex(); - //gviewer_init(&argcc, argvv, 0.01, 20, 60, 2*1010, 2*770, A, dim, x, &(data), multilevel_spring_electrical_embedding_gv); - gviewer_init(&argcc, argvv, 0.01, 20, 60, 320, 320, A, dim, x, &(data), multilevel_spring_electrical_embedding_gv); - free(argvv); - -} -#else void multilevel_spring_electrical_embedding(int dim, SparseMatrix A, SparseMatrix D, spring_electrical_control ctrl, real *node_weights, real *label_sizes, real *x, int n_edge_label_nodes, int *edge_label_nodes, int *flag){ multilevel_spring_electrical_embedding_core(dim, A, D, ctrl, node_weights, label_sizes, x, n_edge_label_nodes, edge_label_nodes, flag); } -#endif diff --git a/lib/sfdpgen/stress_model.c b/lib/sfdpgen/stress_model.c index ec3967037..70799a62f 100644 --- a/lib/sfdpgen/stress_model.c +++ b/lib/sfdpgen/stress_model.c @@ -53,44 +53,6 @@ static void stress_model_core(int dim, SparseMatrix B, real **x, int edge_len_we if (A != B) SparseMatrix_delete(A); } -#ifdef GVIEWER -#include -#include -struct stress_model_data { - int dim; - SparseMatrix D; - real **x; - int edge_len_weighted; - int maxit_sm; - real tol; - int *flag; -}; - -void stress_model_gv(void* data){ - struct stress_model_data* d; - - d = (struct stress_model_data*) data; - return stress_model_core(d->dim, d->D, d->x, d->edge_len_weighted, d->maxit_sm, d->tol, d->flag); -} -void stress_model(int dim, SparseMatrix A, SparseMatrix D, real **x, int edge_len_weighted, int maxit_sm, real tol, int *flag){ - struct stress_model_data data = {dim, D, x, edge_len_weighted, maxit_sm, tol, flag}; - - int argcc = 1; - char **argvv; - - if (!Gviewer) return stress_model_core(dim, D, x, edge_len_weighted, maxit_sm, tol, flag); - argcc = 1; - argvv = malloc(sizeof(char*)*argcc); - argvv[0] = malloc(sizeof(char)); - argvv[0][0] = '1'; - gviewer_set_edge_color_scheme(COLOR_SCHEME_NO); - gviewer_toggle_bgcolor(); - gviewer_init(&argcc, argvv, 0.1, 20, 60, 720, 720, A, dim, *x, &(data), stress_model_gv); - free(argvv); - -} -#else void stress_model(int dim, SparseMatrix A, SparseMatrix D, real **x, int edge_len_weighted, int maxit_sm, real tol, int *flag){ stress_model_core(dim, D, x, edge_len_weighted, maxit_sm, tol, flag); } -#endif