fazendo o pull

src/readgraph/GraphReader.java

@@ -83,13 +83,13 @@ public class GraphReader {
 	*/
 	public double trivalencyModel() {
 
-		 int p = (int) (Math.random() * 3);
-		 double[] choice = { 0.2, 0.04, 0.008 };
-		 return choice[p];
+//		 int p = (int) (Math.random() * 3);
+//		 double[] choice = { 0.2, 0.04, 0.008 };
+//		 return choice[p];
 
 		// uniform IC model
-		// return (double)1/100;
-//		return Math.random();
+//		 return (double)10/100;
+		return Math.random();
 	}
 
 	public DirectedSocialNetwork readEpinions() {

src/simulacao/Simulacao.java

@@ -71,16 +71,9 @@ public class Simulacao {
 				outDir);
 	}
 
-	public static void main(String[] args) {
-//		simularArtificial();
-		 simularHep();
-//		 simularPhy();
-		// simularEpinions();
-	}
-
 	private static void simularArtificial() {
 		DirectedSocialNetwork g;
-		g = new SocialNetworkGenerate().gerarGrafo(1000, 2.5);
+		g = new SocialNetworkGenerate().gerarGrafo(100, 2.5);
 		System.out.println("|V(G)| = " + g.vertexSet().size());
 		System.out.println("|E(G)| = " + g.edgeSet().size());
 
@@ -124,4 +117,11 @@ public class Simulacao {
 		new Simulacao().simularIC(g, outDir);
 	}
 	
+	public static void main(String[] args) {
+//		simularArtificial();
+		 simularHep();
+//		 simularPhy();
+		// simularEpinions();
+	}
+
 }