Changeset 11 for src/main/java/weka/clusterers/forMetisMQI/graph/Subgraph.java

Timestamp:

Sep 16, 2010, 10:44:40 AM (14 years ago)

Author:

gnappo

Message:

Un po' di refactoring e implementazione dell'algoritmo di raffinamento.

Location:

src/main/java/weka/clusterers/forMetisMQI/graph

Files:

• . (added)
• Subgraph.java (moved) (moved from src/main/java/weka/clusterers/forMetisMQI/Subgraph.java) (5 diffs)

src/main/java/weka/clusterers/forMetisMQI/graph/Subgraph.java

@@ -1 @@
-package weka.clusterers.forMetisMQI;
+package weka.clusterers.forMetisMQI.graph;
 
 import java.util.ArrayList;
@@ -11 +11 @@
 import java.util.Map.Entry;
 
+import edu.uci.ics.jung.algorithms.filters.FilterUtils;
+
+
 public class Subgraph {
         
@@ -17 +20 @@
         private Set<Node> nodes = null;
         
-//      private BitSet nodes = null;
-//      private List<Integer> listOfNodes = null;
         private HashMap<Node,Integer> ID = null;
         private HashMap<Node,Integer> ED = null;
@@ -34 +35 @@
         }
         
+        public Subgraph(UndirectedGraph g, Set<Node> nodes) {
+                this.g = g;
+                this.nodes = new HashSet<Node>();
+                this.ID = new HashMap<Node,Integer>();
+                this.ED = new HashMap<Node,Integer>();
+                this.bucketGain = new HashMap<Integer, List<Node>>();
+                this.gainSet = new TreeSet<Integer>();
+                Iterator<Node> nodesIterator = nodes.iterator();
+                while(nodesIterator.hasNext()) {
+                        addVertex(nodesIterator.next());
+                }
+        }
+        
         public UndirectedGraph getGraph() {
                 return g;
         }
         
+        /**
+         * Adds to the subgraph the node u iff u belongs to the graph.
+         * @param u
+         */
         public void addVertex(Node u) {
-                nodes.add(u);
-                ID.put(u, 0);
-                ED.put(u, 0);
-                recomputeGain = true;
+                if(g.containsVertex(u)) {
+                        nodes.add(u);
+                        ID.put(u, 0);
+                        ED.put(u, 0);
+                        recomputeGain = true;
+                }
         }
         
@@ -233 +253 @@
                 return clone;
         }
+        
+        public UndirectedGraph createInducedSubgraph() {
+                return FilterUtils.createInducedSubgraph(nodes,g);
+        }
 }