Changeset 9 for src/main/java/weka/clusterers/forMetisMQI/KLPartition.java

Timestamp:

Sep 14, 2010, 2:11:28 PM (14 years ago)

Author:

gnappo

Message:

Migrato il resto del codice verso Jung.

File:

• src/main/java/weka/clusterers/forMetisMQI/KLPartition.java (modified) (6 diffs)

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

@@ -1 +1 @@
 package weka.clusterers.forMetisMQI;
 
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
+import java.util.Set;
 
 
@@ -12 +12 @@
         private Subgraph b = null;
         
-        private List<Integer> marked = null;
+        private Set<Node> marked = null;
 
         private KLPartition() {
@@ -18 +18 @@
         
         public KLPartition(Subgraph s) {
-                Graph g  = s.getGraph();
+                UndirectedGraph g  = s.getGraph();
                 a = s;
                 b = new Subgraph(g);
-                Iterator<Integer> graphIterator =  g.iterator();
+                Iterator<Node> graphIterator =  g.getVertices().iterator();
                 while(graphIterator.hasNext()) {
-                        int u = graphIterator.next();
+                        Node u = graphIterator.next();
                         if(!s.contains(u))
-                                b.addNode(u);
+                                b.addVertex(u);
                 }
-                marked = new ArrayList<Integer>();
+                marked = new HashSet<Node>();
         }
         
-        public KLPartition(Graph g){
+        public KLPartition(UndirectedGraph g){
                 a = new Subgraph(g);
                 b = new Subgraph(g);
-                Iterator<Integer> graph = g.vtxsPermutation().iterator();
+                Iterator<Node> graph = g.vtxsPermutation().iterator();
                 int i = 0;
                 while(graph.hasNext()) {
-                        int u = graph.next();
+                        Node u = graph.next();
                         if((i%2)==0)
-                                a.addNode(u);
+                                a.addVertex(u);
                         else
-                                b.addNode(u);
+                                b.addVertex(u);
                         i++;
                 }
-                marked = new ArrayList<Integer>();
+                marked = new HashSet<Node>();
         }
         
         /**
-         * Returns the node marked as candidate for swapping or -1 if there aren't node available
+         * Returns the node marked as candidate for swapping or <code>null</code> if there aren't node available
          * for swapping.
          * @return
          */
-        public int getCandidate() {
-                int u;
-                if(a.size() > b.size()) {
+        public Node getCandidate() {
+                Node u;
+                if(a.getVertexCount() > b.getVertexCount()) {
                         u = a.getCandidate(marked);
-                        if(u == -1)
+                        if(u == null)
                                 u = b.getCandidate(marked);
                 } else {
                         u = b.getCandidate(marked);
-                        if(u == -1)
+                        if(u == null)
                                 u = a.getCandidate(marked);
                 }
-                if(u != -1) {
+                if(u != null) {
                         marked.add(u);
                 }
@@ -68 +68 @@
         }
         
-        public void swap(int u) {
+        public void swap(Node u) {
                 Subgraph from = fromSubgraph(u);
                 Subgraph to = toSubgraph(u);
-                from.remove(u);
-                to.addNode(u);
+                from.removeVertex(u);
+                to.addVertex(u);
         }
         
-        private Subgraph fromSubgraph(int u) {
+        private Subgraph fromSubgraph(Node u) {
                 Subgraph ret = null;
                 if(a.contains(u))
@@ -84 +84 @@
         }
         
-        private Subgraph toSubgraph(int u) {
+        private Subgraph toSubgraph(Node u) {
                 Subgraph ret = null;
                 if(!a.contains(u))
@@ -106 +106 @@
         }
         
-        @Override
-        public KLPartition clone(){
+        public KLPartition copy(){
                 KLPartition clone = new KLPartition();
                 clone.a = (Subgraph) a.clone();
                 clone.b = (Subgraph) b.clone();
-                clone.marked = new ArrayList<Integer>();
-                for(int i = 0; i < marked.size(); i++) {
-                        clone.marked.add(marked.get(i));
-                }
+                clone.marked = new HashSet<Node>();
                 return clone;
         }