#include "gnunet_regex_lib.h"
#include "regex_internal.h"
-/**
+/**
* Context for graph creation. Passed as the cls to
* GNUNET_REGEX_automaton_save_graph_step.
*/
* the graph.
*/
int verbose;
+
+ /**
+ * Coloring flag, if set to GNUNET_YES SCCs will be colored.
+ */
+ int coloring;
};
if (NULL == w)
continue;
-
+
if (w->index < 0)
{
scc_tarjan_strongconnect (scc_counter, w, index, stack, stack_size);
v->lowlink = (v->lowlink > w->lowlink) ? w->lowlink : v->lowlink;
}
- else if (0 != w->contained)
+ else if (1 == w->contained)
v->lowlink = (v->lowlink > w->index) ? w->index : v->lowlink;
}
if (v->lowlink == v->index)
{
- w = stack[--(*stack_size)];
- w->contained = 0;
-
- if (v != w)
+ (*scc_counter)++;
+ do
{
- (*scc_counter)++;
- while (v != w)
- {
- w->scc_id = *scc_counter;
- w = stack[--(*stack_size)];
- w->contained = 0;
- }
+ w = stack[--(*stack_size)];
+ w->contained = 0;
w->scc_id = *scc_counter;
}
+ while (w != v);
}
}
char *s_tran = NULL;
char *name;
char *to_name;
-
+
if (GNUNET_YES == ctx->verbose)
- GNUNET_asprintf (&name, "%i (%s)", s->proof_id, s->name);
+ GNUNET_asprintf (&name, "%i (%s) (%s) (%s)", s->dfs_id, s->name, s->proof,
+ GNUNET_h2s (&s->hash));
else
- GNUNET_asprintf (&name, "%i", s->proof_id);
+ GNUNET_asprintf (&name, "%i", s->dfs_id);
if (s->accepting)
+ {
+ if (GNUNET_YES == ctx->coloring)
+ {
+ GNUNET_asprintf (&s_acc,
+ "\"%s\" [shape=doublecircle, color=\"0.%i 0.8 0.95\"];\n",
+ name, s->scc_id * s->scc_id);
+ }
+ else
+ {
+ GNUNET_asprintf (&s_acc, "\"%s\" [shape=doublecircle];\n", name,
+ s->scc_id);
+ }
+ }
+ else if (GNUNET_YES == ctx->coloring)
{
GNUNET_asprintf (&s_acc,
- "\"%s\" [shape=doublecircle, color=\"0.%i 0.8 0.95\"];\n",
- name, s->scc_id);
+ "\"%s\" [shape=circle, color=\"0.%i 0.8 0.95\"];\n", name,
+ s->scc_id * s->scc_id);
}
else
{
- GNUNET_asprintf (&s_acc, "\"%s\" [color=\"0.%i 0.8 0.95\"];\n", name, s->scc_id);
+ GNUNET_asprintf (&s_acc, "\"%s\" [shape=circle];\n", name, s->scc_id);
}
- if (NULL == s_acc)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not print state %s\n", s->name);
- return;
- }
+ GNUNET_assert (NULL != s_acc);
+
fwrite (s_acc, strlen (s_acc), 1, ctx->filep);
GNUNET_free (s_acc);
s_acc = NULL;
}
if (GNUNET_YES == ctx->verbose)
- GNUNET_asprintf (&to_name, "%i (%s)", ctran->to_state->proof_id, ctran->to_state->name);
+ {
+ GNUNET_asprintf (&to_name, "%i (%s) (%s) (%s)", ctran->to_state->dfs_id,
+ ctran->to_state->name, ctran->to_state->proof,
+ GNUNET_h2s (&ctran->to_state->hash));
+ }
else
- GNUNET_asprintf (&to_name, "%i", ctran->to_state->proof_id);
-
- if (ctran->label == 0)
+ GNUNET_asprintf (&to_name, "%i", ctran->to_state->dfs_id);
+
+ if (NULL == ctran->label)
{
- GNUNET_asprintf (&s_tran,
- "\"%s\" -> \"%s\" [label = \"epsilon\", color=\"0.%i 0.8 0.95\"];\n",
- name, to_name, s->scc_id);
+ if (GNUNET_YES == ctx->coloring)
+ {
+ GNUNET_asprintf (&s_tran,
+ "\"%s\" -> \"%s\" [label = \"ε\", color=\"0.%i 0.8 0.95\"];\n",
+ name, to_name, s->scc_id * s->scc_id);
+ }
+ else
+ {
+ GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"ε\"];\n", name,
+ to_name, s->scc_id);
+ }
}
else
{
- GNUNET_asprintf (&s_tran,
- "\"%s\" -> \"%s\" [label = \"%c\", color=\"0.%i 0.8 0.95\"];\n",
- name, to_name, ctran->label, s->scc_id);
+ if (GNUNET_YES == ctx->coloring)
+ {
+ GNUNET_asprintf (&s_tran,
+ "\"%s\" -> \"%s\" [label = \"%s\", color=\"0.%i 0.8 0.95\"];\n",
+ name, to_name, ctran->label, s->scc_id * s->scc_id);
+ }
+ else
+ {
+ GNUNET_asprintf (&s_tran, "\"%s\" -> \"%s\" [label = \"%s\"];\n", name,
+ to_name, ctran->label, s->scc_id);
+ }
}
GNUNET_free (to_name);
- if (NULL == s_tran)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not print state %s\n",
- s->name);
- return;
- }
+ GNUNET_assert (NULL != s_tran);
fwrite (s_tran, strlen (s_tran), 1, ctx->filep);
GNUNET_free (s_tran);
/**
- * Save the given automaton as a GraphViz dot file
+ * Save the given automaton as a GraphViz dot file.
*
- * @param a the automaton to be saved
- * @param filename where to save the file
- * @param verbose if set to GNUNET_YES the generated graph will include extra
- * information such as the NFA states that were used to generate
- * the DFA state etc.
+ * @param a the automaton to be saved.
+ * @param filename where to save the file.
+ * @param options options for graph generation that include coloring or verbose
+ * mode
*/
void
GNUNET_REGEX_automaton_save_graph (struct GNUNET_REGEX_Automaton *a,
const char *filename,
- int verbose)
+ enum GNUNET_REGEX_GraphSavingOptions options)
{
char *start;
char *end;
struct GNUNET_REGEX_Graph_Context ctx;
-
+
if (NULL == a)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not print NFA, was NULL!");
}
ctx.filep = fopen (filename, "w");
+ ctx.verbose =
+ (0 == (options & GNUNET_REGEX_GRAPH_VERBOSE)) ? GNUNET_NO : GNUNET_YES;
+ ctx.coloring =
+ (0 == (options & GNUNET_REGEX_GRAPH_COLORING)) ? GNUNET_NO : GNUNET_YES;
if (NULL == ctx.filep)
{
}
/* First add the SCCs to the automaton, so we can color them nicely */
- scc_tarjan (a);
+ if (GNUNET_YES == ctx.coloring)
+ scc_tarjan (a);
start = "digraph G {\nrankdir=LR\n";
fwrite (start, strlen (start), 1, ctx.filep);
- GNUNET_REGEX_automaton_traverse (a, &GNUNET_REGEX_automaton_save_graph_step,
+ GNUNET_REGEX_automaton_traverse (a, a->start, NULL, NULL,
+ &GNUNET_REGEX_automaton_save_graph_step,
&ctx);
end = "\n}\n";