Changeset 14 for src/main/java/weka/clusterers/forMetisMQI/Uncoarse.java

Timestamp:

Sep 17, 2010, 1:09:06 PM (14 years ago)

Author:

gnappo

Message:

Ulteriori refactoring. Creato il clusterer metisMqi, con opzioni.

File:

• src/main/java/weka/clusterers/forMetisMQI/Uncoarse.java (modified) (4 diffs)

src/main/java/weka/clusterers/forMetisMQI/Uncoarse.java

@@ -4 +4 @@
 import java.util.Stack;
 
-import weka.clusterers.forMetisMQI.coarse.CoarserGraphElement;
 import weka.clusterers.forMetisMQI.graph.Bisection;
 import weka.clusterers.forMetisMQI.graph.Node;
 import weka.clusterers.forMetisMQI.graph.Subgraph;
 import weka.clusterers.forMetisMQI.graph.UndirectedGraph;
+import weka.clusterers.forMetisMQI.util.CoarserGraphElement;
 
 public class Uncoarse {
         
-        private boolean projectedBelongs(Node u, Bisection partition, CoarserGraphElement cge) {
+        private static boolean projectedBelongs(Node u, Bisection partition, CoarserGraphElement cge) {
                 Subgraph s = partition.getSubgraph();
                 Node mappedNode = cge.getMap().get(u);
@@ -24 +24 @@
          * @param cge
          */
-        public Bisection uncoarseOneStep(Bisection partition, CoarserGraphElement cge) {
+        private static Bisection uncoarseOneStep(Bisection partition, CoarserGraphElement cge) {
                 UndirectedGraph projected = cge.getProjected();
                 Subgraph part = new Subgraph(projected);
@@ -36 +36 @@
         }
         
-        public Bisection uncoarse(Stack<CoarserGraphElement> stack, Bisection partition) {
+        /**
+         * Given a bisection of the finer graph and the stack of graphs which yielded the finer graph,
+         * it returns the bisection projected into the coarser graph. 
+         * @param stack
+         * @param partition
+         * @return
+         */
+        public static Bisection uncoarse(Stack<CoarserGraphElement> stack, Bisection partition) {
                 while(stack.size() > 0) {
                         CoarserGraphElement element = stack.pop();
@@ -43 +50 @@
                 return partition;
         }
-        
-        public Uncoarse() {
-        }
-
 }