change interface since we don't need this information - it is already in the edge

diff --git a/Robust/src/Util/GraphNode.java b/Robust/src/Util/GraphNode.java
index 154ae59135b7bc4a40ffbf931486dedba61ee7dc..cbe96016d860db9de7fc46ac2dea65a989419b01 100755 (executable)
--- a/Robust/src/Util/GraphNode.java
+++ b/Robust/src/Util/GraphNode.java
@@ -103,6 +103,22 @@ public class GraphNode {
         return this.status;
     }
 
+    public int numedges() {
+       return edges.size();
+    }
+
+    public int numinedges() {
+       return inedges.size();
+    }
+
+    public Edge getedge(int i) {
+       return (Edge) edges.get(i);
+    }
+
+    public Edge getinedge(int i) {
+       return (Edge) inedges.get(i);
+    }
+
     public Iterator edges() {
         return edges.iterator();
     }
@@ -234,8 +250,8 @@ public class GraphNode {
 
                            for(int i=0;i<namers.size();i++) {
                                Namer name=(Namer) namers.get(i);
-                               String newlabel=name.edgeLabel(gn, edge);
-                               String newoption=name.edgeOption(gn, edge);
+                               String newlabel=name.edgeLabel(edge);
+                               String newoption=name.edgeOption(edge);
                                if (!newlabel.equals("")&& ! edgelabel.equals(""))
                                    edgelabel+=", ";
                                edgelabel+=newlabel;

diff --git a/Robust/src/Util/Namer.java b/Robust/src/Util/Namer.java
index 86d4b48b5b7e61c95f6f29f829678a73ac2c6bb5..1e8d3c383edb27b97c2a44f5810f18cd3bd1cc68 100644 (file)
--- a/Robust/src/Util/Namer.java
+++ b/Robust/src/Util/Namer.java
@@ -11,11 +11,11 @@ public class Namer {
        return gn.dotnodeparams;
     }
 
-    public String edgeLabel(GraphNode src, Edge e) {
+    public String edgeLabel(Edge e) {
        return e.getLabel();
     }
 
-    public String edgeOption(GraphNode src, Edge e) {
+    public String edgeOption(Edge e) {
        return e.dotnodeparams;
     }
 }