- Changed visibility of some fields in CloudSim.java

- updates in comments
- Location of topology file fixed for network examples

modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/CloudSimExample8.java

@@ -303,8 +303,7 @@ public class CloudSimExample8 {
 		public void processEvent(SimEvent ev) {
 			switch (ev.getTag()) {
 			case CREATE_BROKER:
-
-				setBroker(createBroker("Broker_1"));
+				setBroker(createBroker(super.getName()+"_"));
 
 				//Create VMs and Cloudlets and send them to broker
 				setVmList(createVM(getBroker().getId(), 5, 100)); //creating 5 vms
@@ -325,7 +324,7 @@ public class CloudSimExample8 {
 
 		@Override
 		public void startEntity() {
-			Log.printLine("GlobalBroker is starting...");
+			Log.printLine(super.getName()+" is starting...");
 			schedule(getId(), 200, CREATE_BROKER);
 		}
 

modules/cloudsim-examples/topology.brite

+Topology: ( 5 Nodes, 8 Edges )
+Model (1 - RTWaxman):  5 5 5 1  2  0.15000000596046448 0.20000000298023224 1 1 10.0 1024.0 
+
+Nodes: ( 5 )
+0	1	3	3	3	-1	RT_NODE
+1	0	3	3	3	-1	RT_NODE
+2	4	3	3	3	-1	RT_NODE
+3	3	1	3	3	-1	RT_NODE
+4	3	3	4	4	-1	RT_NODE
+
+
+Edges: ( 8 )
+0	2	0	3.0			1.1	10.0	-1	-1	E_RT	U
+1	2	1	4.0			2.1	10.0	-1	-1	E_RT	U
+2	3	0	2.8284271247461903	3.9	10.0	-1	-1	E_RT	U
+3	3	1	3.605551275463989	4.1	10.0	-1	-1	E_RT	U
+4	4	3	2.0			5.0	10.0	-1	-1	E_RT	U
+5	4	2	1.0			4.0	10.0	-1	-1	E_RT	U
+6	0	4	2.0			3.0	10.0	-1	-1	E_RT	U
+7	1	4	3.0			4.1	10.0	-1	-1	E_RT	U

modules/cloudsim/src/main/java/org/cloudbus/cloudsim/core/CloudSim.java

@@ -241,15 +241,14 @@ public class CloudSim {
 
 	// ======== SIMULATION METHODS ===============//
 
-	// Private data members
 	/** The entities. */
 	private static List<SimEntity> entities;
 
 	/** The future event queue. */
-	private static FutureQueue future;
+	protected static FutureQueue future;
 
 	/** The deferred event queue. */
-	private static DeferredQueue deferred;
+	protected static DeferredQueue deferred;
 
 	/** The simulation clock. */
 	private static double clock;
@@ -257,9 +256,6 @@ public class CloudSim {
 	/** Flag for checking if the simulation is running. */
 	private static boolean running;
 
-	/*
-	 * (non-javadoc)
-	 */
 	/** The entities by name. */
 	private static Map<String, SimEntity> entitiesByName;
 

modules/cloudsim/src/main/java/org/cloudbus/cloudsim/network/DelayMatrix_Float.java

@@ -121,7 +121,7 @@ public class DelayMatrix_Float {
 	public String toString(){
 		StringBuffer buffer = new StringBuffer();
 
-		buffer.append("just an simple printout of the distance-aware-topology-class\n");
+		buffer.append("just a simple printout of the distance-aware-topology-class\n");
 		buffer.append("delay-matrix is:\n");
 
 		for(int column = 0; column < mTotalNodeNum; ++column){