Changeset 15 for src/main/java/weka/clusterers/forMetisMQI/graph

Timestamp:

Sep 17, 2010, 6:04:18 PM (14 years ago)

Author:

gnappo

Message:

Individuazione del miglioramento del taglio: tentativi.

Location:

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

Files:

• Bisection.java (modified) (1 diff)
• Edge.java (modified) (1 diff)
• Subgraph.java (modified) (1 diff)

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

@@ -139 +139 @@
         
         /**
-         * Returns the smaller subgraph of this bisection.
+         * Returns the smaller not empty subgraph of this bisection, null otherwise.
          * @return
          */
-        public Subgraph getSmallerSubgraph() {
+        public Subgraph getSmallerNotEmptySubgraph() {
+                if(a.getVertexCount() > 0 && b.getVertexCount() == 0)
+                        return a;
+                if(b.getVertexCount() > 0 && a.getVertexCount() == 0)
+                        return b;
                 if(a.getVertexCount() < b.getVertexCount())
                         return a;

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

@@ -28 +28 @@
                         Edge e = (Edge) o;
                         result = result && (e.getId().equals(id));
-                        result = result && (e.getWeight() == weight);
-                        result = result && (e.getCapacity() == capacity);
                 }
                 return result;

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

@@ -204 +204 @@
         @Override
         public String toString() {
-                String out = "[";
+                if(getVertexCount() == 0)
+                        return "[]";
+                StringBuffer out =new StringBuffer("[");
                 Iterator<Node> it = nodes.iterator();
                 while(it.hasNext()) {
                         Node u = it.next();
-                        out = out + u + ",";
-                }
-                out = out + "]";
-                return out;
+                        out.append(u.toString() + ",");
+                }
+                out.setLength(out.length() - 1);
+                out.append("]");
+                return out.toString();
         }