]> granicus.if.org Git - graphviz/commitdiff
projects / graphviz / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9a1d234)
tred: add option to output information on removed edges to stderr
authorJannick <thirdedition@gmx.net>
Mon, 2 Mar 2020 15:22:39 +0000 (16:22 +0100)
committerJannick <thirdedition@gmx.net>
Mon, 2 Mar 2020 15:22:39 +0000 (16:22 +0100)
* cmd/tools/tred.1:
  - add documentation of '-r' flag
* cmd/tools/tred.c:
  - add command line flag '-r'
  - update usage screen
  - add output to stderr information of removed edges, format:
    'removed edge: <graph name>: "<head name>" -> "<tail name>"'

cmd/tools/tred.1 patch | blob | history
cmd/tools/tred.c patch | blob | history

diff --git a/cmd/tools/tred.1 b/cmd/tools/tred.1
index b2fa95b35f15805ae7b51e49ae50e38a83c095f1..1b89772005342c05111451da4d40e855ac267f81 100644 (file)
--- a/cmd/tools/tred.1
+++ b/cmd/tools/tred.1
@@ -4,7 +4,7 @@ tred \- transitive reduction filter for directed graphs
 .SH SYNOPSIS
 .B tred
 [
-.B \-v?
+.B \-vr?
 ]
 [
 .I files
@@ -27,7 +27,10 @@ Undirected graphs are silently ignored.
 The following options are supported:
 .TP
 .B \-v
-Verbose output.
+Verbose output to stderr.
+.TP
+.B \-r
+Print information of removed edges to stderr.
 .TP
 .B \-?
 Print usage information.
diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index 7465660f5d8983a4a732ca2ee874f2ea8fc3c2d3..d3917d5ba2bc0662972bb1cc83f5093fec33cfc3 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -49,6 +49,7 @@ typedef struct {
 static char **Files;
 static char *CmdName;
 static int Verbose;
+static int PrintRemovedEdges;
 
 typedef struct blk_t {
     Agedge_t **data;
@@ -164,6 +165,7 @@ static int dfs(Agnode_t * n, nodeinfo_t* ninfo, int warn, estack_t* sp)
     Agnode_t* v;
     Agnode_t* hd;
     Agnode_t* oldhd;
+    int do_delete;
 
     dummy.out.base.tag.objtype = AGOUTEDGE;
     dummy.out.node = n;
@@ -210,20 +212,27 @@ static int dfs(Agnode_t * n, nodeinfo_t* ninfo, int warn, estack_t* sp)
     }
     oldhd = NULL;
     for (e = agfstout(g, n); e; e = f) {
+        do_delete = 0;
        f = agnxtout(g, e);
        hd = aghead(e);
         if (oldhd == hd)
-           agdelete(g, e);
+           do_delete = 1;
         else {
             oldhd = hd;
-           if (DIST(ninfo, hd)>1) agdelete(g, e);
-       }
+            if (DIST(ninfo, hd)>1) do_delete = 1;
+        }
+        if(do_delete) {
+            if(PrintRemovedEdges) fprintf(stderr,"removed edge: %s: \"%s\" -> \"%s\"\n"
+                          , agnameof(g), agnameof(aghead(e)), agnameof(agtail(e)));
+            agdelete(g, e);
+        }
     }
     return warn;
 }
 
-static char *useString = "Usage: %s [-v?] <files>\n\
-  -v - verbose\n\
+static char *useString = "Usage: %s [-vr?] <files>\n\
+  -v - verbose (to stderr)\n\
+  -r - print removed edges to stderr\n\
   -? - print usage\n\
 If no files are specified, stdin is used\n";
 
@@ -239,11 +248,14 @@ static void init(int argc, char *argv[])
 
     CmdName = argv[0];
     opterr = 0;
-    while ((c = getopt(argc, argv, "v")) != -1) {
+    while ((c = getopt(argc, argv, "vr")) != -1) {
        switch (c) {
        case 'v':
            Verbose = 1;
            break;
+       case 'r':
+        PrintRemovedEdges = 1;
+        break;
        case '?':
            if (optopt == '?')
                usage(0);
Unnamed repository; edit this file 'description' to name the repository.