Changeset 25

Timestamp:

Oct 8, 2010, 10:28:38 AM (14 years ago)

Author:

gnappo

Message:

Piccola modifica al generatore pseudo casuale da cui è possibile farsi restituire il seme. Aggiunta di alcuni script per analizzare l'output e creazione struttura directory provvisioria per l'output.

Files:

• .project (modified) (1 diff)
• output (added)
• output/metis (added)
• output/metis/filtered (added)
• output/random (added)
• output/random/filtered (added)
• script (added)
• script/analizzaRisultati.py (added)
• script/filtraRisultati.sh (added)
• script/ripetiprova.sh (added)
• src/main/java/weka/clusterers/forMetisMQI/GraphAlgorithms.java (modified) (3 diffs)
• src/main/java/weka/clusterers/forMetisMQI/MQI.java (modified) (1 diff)
• src/main/java/weka/clusterers/forMetisMQI/Random.java (modified) (1 diff)

.project

@@ -6 +6 @@
         </projects>
         <buildSpec>
+                <buildCommand>
+                        <name>org.python.pydev.PyDevBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.python.pydev.pythonNature</nature>
         </natures>
 </projectDescription>

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

@@ -92 +92 @@
                 int verboseLevel = Configuration.instance().getVerboseLevel();
                 GraphsFrame gf = GraphsFrame.instance();
+                System.out.println("Seed: " + Random.instance().getSeed());
                 System.out.println("Vertex count: " + g.getVertexCount());
                 System.out.println("Edges count: " + g.getEdgeCount());
@@ -122 +123 @@
                         System.out.println("Partizione raffinata (MQI)");
                         double newConductance = ((double)mqiBisection.edgeCut() / 2) / Math.min(mqiBisection.getSubgraph().totalDegree(),mqiBisection.getComplement().totalDegree());
-                        System.out.println("Conductance: " + newConductance);
+                        System.out.println("Cluster "+ i + ":  V=" + clusterGraph.getVertexCount() + ", E=" + clusterGraph.getEdgeCount()+".");
+                        System.out.println("Cluster conductance: " + newConductance);
                         
-                        System.out.println("CLUSTER "+ i + ":  V=" + clusterGraph.getVertexCount() + ", E=" + clusterGraph.getEdgeCount()+".");
                         clusters.add(cluster);
                         
@@ -133 +134 @@
                         }
                 }
-                if(verboseLevel > 0)
+                if(verboseLevel > 0) {
                         gf.addPanel(Util.panelClusters(gclone, clusters));
-                gf.setVisible(true);
+                        gf.setVisible(true);
+                }
                 return clusters;
         }

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

@@ -200 +200 @@
                                                 * (bisection.edgeCut() / 2);
                         }
+                        System.out.print(".");
                         alg.evaluate();
+                        System.out.print(".");
                         if(Configuration.instance().getVerboseLevel() > 1)
                                 GraphsFrame.instance().addPanel(Util.panelFlowGraph(directedGraph, edgeFlowMap));

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

@@ -7 +7 @@
         private static Random instance = null;
         
+        private long seed = 1234567890;
+        
         /**
-         * Return an instance of a random generator with a default seed.
+         * Return an instance of a random generator with a random seed.
          * @return
          */
         public static Random instance() {
-                if(instance == null)
-                        instance = new Random();
+                if(instance == null) {
+                        instance = new Random(/*new java.util.Random().nextLong()*/1234567890);
+                }
                 return instance;
         }
         
-        private Random() {
-                super(1234567890);
+        public long getSeed() {
+                return seed;
+        }
+        
+        private Random(long seed) {
+                super(seed);
+                this.seed = seed;
         }