diff options
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda/endomorph/DependencyGraph.java')
| -rw-r--r-- | src/uk/ac/ox/cs/pagoda/endomorph/DependencyGraph.java | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/uk/ac/ox/cs/pagoda/endomorph/DependencyGraph.java b/src/uk/ac/ox/cs/pagoda/endomorph/DependencyGraph.java index 307fa33..e7f1c96 100644 --- a/src/uk/ac/ox/cs/pagoda/endomorph/DependencyGraph.java +++ b/src/uk/ac/ox/cs/pagoda/endomorph/DependencyGraph.java | |||
| @@ -1,22 +1,13 @@ | |||
| 1 | package uk.ac.ox.cs.pagoda.endomorph; | 1 | package uk.ac.ox.cs.pagoda.endomorph; |
| 2 | 2 | ||
| 3 | import java.util.Arrays; | 3 | import uk.ac.ox.cs.pagoda.summary.Edge; |
| 4 | import java.util.Collection; | 4 | import uk.ac.ox.cs.pagoda.summary.Graph; |
| 5 | import java.util.Comparator; | 5 | import uk.ac.ox.cs.pagoda.summary.Node; |
| 6 | import java.util.HashMap; | 6 | import uk.ac.ox.cs.pagoda.summary.NodeTuple; |
| 7 | import java.util.HashSet; | 7 | import uk.ac.ox.cs.pagoda.util.Timer; |
| 8 | import java.util.Iterator; | 8 | import uk.ac.ox.cs.pagoda.util.Utility; |
| 9 | import java.util.LinkedList; | ||
| 10 | import java.util.Map; | ||
| 11 | import java.util.Queue; | ||
| 12 | import java.util.Set; | ||
| 13 | 9 | ||
| 14 | import uk.ac.ox.cs.pagoda.summary.Edge; | 10 | import java.util.*; |
| 15 | import uk.ac.ox.cs.pagoda.summary.Graph; | ||
| 16 | import uk.ac.ox.cs.pagoda.summary.Node; | ||
| 17 | import uk.ac.ox.cs.pagoda.summary.NodeTuple; | ||
| 18 | import uk.ac.ox.cs.pagoda.util.Timer; | ||
| 19 | import uk.ac.ox.cs.pagoda.util.Utility; | ||
| 20 | 11 | ||
| 21 | public class DependencyGraph { | 12 | public class DependencyGraph { |
| 22 | 13 | ||
| @@ -82,7 +73,7 @@ public class DependencyGraph { | |||
| 82 | private int compareNode(Node o1, Node o2) { | 73 | private int compareNode(Node o1, Node o2) { |
| 83 | int result = o1.getConcepts().size() - o2.getConcepts().size(); | 74 | int result = o1.getConcepts().size() - o2.getConcepts().size(); |
| 84 | if (result != 0) return dir(result); | 75 | if (result != 0) return dir(result); |
| 85 | Edge[] edge1 = graph.getOutGoingEdges(o1), edge2 = graph.getOutGoingEdges(o2);; | 76 | Edge[] edge1 = graph.getOutGoingEdges(o1), edge2 = graph.getOutGoingEdges(o2); |
| 86 | int len1 = edge1 == null ? 0 : edge1.length, len2 = edge2 == null ? 0 : edge2.length; | 77 | int len1 = edge1 == null ? 0 : edge1.length, len2 = edge2 == null ? 0 : edge2.length; |
| 87 | result = len1 - len2; | 78 | result = len1 - len2; |
| 88 | if (result != 0) return dir(result); | 79 | if (result != 0) return dir(result); |
| @@ -124,7 +115,7 @@ public class DependencyGraph { | |||
| 124 | // print(); | 115 | // print(); |
| 125 | 116 | ||
| 126 | topolocialOrder = null; | 117 | topolocialOrder = null; |
| 127 | Utility.logInfo("link: " + link); | 118 | Utility.logDebug("link: " + link); |
| 128 | } | 119 | } |
| 129 | 120 | ||
| 130 | LinkedList<Clique> topolocialOrder = null; | 121 | LinkedList<Clique> topolocialOrder = null; |
