Menu
▾
▴
[Gridsim-commits] SF.net SVN: gridsim:[267] trunk
|
From: <mar...@us...> - 2009-05-22 05:16:50
|
Revision: 267
http://gridsim.svn.sourceforge.net/gridsim/?rev=267&view=rev
Author: marcos_dias
Date: 2009-05-22 05:16:40 +0000 (Fri, 22 May 2009)
Log Message:
-----------
Changes in the documentation of some classes and examples.
Modified Paths:
--------------
trunk/examples/ResFailure/example01/ResFailureEx01.java
trunk/examples/ResFailure/example01/readme.txt
trunk/examples/ResFailure/example02/ResFailureEx02.java
trunk/examples/ResFailure/example02/readme.txt
trunk/examples/ResFailure/example03/ResFailureEx03.java
trunk/examples/ResFailure/example03/readme.txt
trunk/examples/WorkloadTrace/example01/TraceEx01.java
trunk/examples/WorkloadTrace/example01/readme.txt
trunk/examples/WorkloadTrace/example02/TraceEx02.java
trunk/examples/WorkloadTrace/example02/readme.txt
trunk/examples/WorkloadTrace/example03/TraceEx03.java
trunk/examples/WorkloadTrace/example03/readme.txt
trunk/examples/auction/example01/ExampleAuction.java
trunk/examples/auction/example02/ExampleAuction.java
trunk/examples/auction/example03/ExampleAuction.java
trunk/examples/datagrid/example01/DataExample1.java
trunk/examples/datagrid/example02/DataExample2.java
trunk/examples/datagrid/example03/DataGridletExample.java
trunk/examples/datagrid/example04/readme.txt
trunk/examples/gridsim/example01/Example1.java
trunk/examples/gridsim/example03/readme.txt
trunk/examples/gridsim/example04/Example4.java
trunk/examples/gridsim/example04/readme.txt
trunk/examples/gridsim/example05/Example5.java
trunk/examples/gridsim/example05/readme.txt
trunk/examples/gridsim/example06/Example6.java
trunk/examples/gridsim/example06/readme.txt
trunk/examples/gridsim/example07/Test.java
trunk/examples/gridsim/example07/readme.txt
trunk/examples/gridsim/example08/Example8.java
trunk/examples/gridsim/example09/Example9.java
trunk/examples/gridsim/example10/Example10.java
trunk/examples/gridsim/example10/readme.txt
trunk/examples/gridsim/regionalGIS/ExampleGIS.java
trunk/examples/gridsim/regionalGIS/readme.txt
trunk/examples/network/FiniteBuffer/mainExample.java
trunk/examples/network/FiniteBuffer/readme.txt
trunk/examples/network/example02/NetEx02.java
trunk/examples/network/example03/NetEx03.java
trunk/examples/network/flow/example02/FlowNetEx02.java
trunk/examples/network/rate/RateExample.java
trunk/examples/network/scfq/SCFQExample.java
trunk/examples/network/scfq/readme.txt
trunk/examples/readme.txt
trunk/faq.txt
trunk/jars/simjava2.jar
trunk/javadoc.sh
trunk/source/gridsim/ARSimpleSpaceShared.java
trunk/source/gridsim/AdvanceReservation.java
trunk/source/gridsim/Gridlet.java
trunk/source/gridsim/GridletList.java
trunk/source/gridsim/ResGridlet.java
trunk/source/gridsim/SpaceShared.java
trunk/source/gridsim/Stat.java
trunk/source/gridsim/TimeShared.java
trunk/source/gridsim/datagrid/FileAttribute.java
trunk/source/gridsim/net/Input.java
trunk/source/gridsim/net/NetIO.java
trunk/source/gridsim/net/Output.java
trunk/source/gridsim/net/flow/FlowInput.java
trunk/source/gridsim/net/flow/FlowOutput.java
trunk/source/gridsim/net/fnb/FnbNetworkReader.java
trunk/source/gridsim/net/fnb/firstLastPacketsGridlet.java
trunk/source/gridsim/resFailure/AllocPolicyWithFailure.java
trunk/source/gridsim/resFailure/SpaceSharedWithFailure.java
trunk/source/gridsim/resFailure/TimeSharedWithFailure.java
trunk/source/gridsim/util/HyperExponential.java
trunk/source/gridsim/util/LCGRandom.java
trunk/source/gridsim/util/NetworkReader.java
trunk/source/gridsim/util/Poisson.java
trunk/source/gridsim/util/SimReport.java
trunk/source/gridsim/util/TrafficGenerator.java
trunk/source/gridsim/util/Variate.java
trunk/source/gridsim/util/Weibull.java
Added Paths:
-----------
trunk/source/gridsim/net/fnb/GridletPackets.java
Removed Paths:
-------------
trunk/examples/datagrid/example01/readme.txt
trunk/examples/datagrid/example02/readme.txt
trunk/examples/datagrid/example03/readme.txt
trunk/examples/gridsim/example01/readme.txt
trunk/examples/gridsim/example08/readme.txt
trunk/examples/gridsim/example09/readme.txt
trunk/examples/network/example01/readme.txt
trunk/examples/network/example02/readme.txt
trunk/examples/network/example03/readme.txt
trunk/examples/network/flow/example01/readme.txt
trunk/examples/network/flow/example02/readme.txt
trunk/examples/network/rate/readme.txt
Modified: trunk/examples/ResFailure/example01/ResFailureEx01.java
===================================================================
--- trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/ResFailure/example01/ResFailureEx01.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -257,24 +257,11 @@
MachineList mList = new MachineList();
for (int i = 0; i < totalMachine; i++)
{
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList = new PEList();
-
- // 3. Create PEs and add these into an object of PEList.
- for (int k = 0; k < totalPE; k++)
- {
- // need to store PE id and MIPS Rating
- peList.add( new PE(k, rating) );
- }
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(i, peList) );
+ // 2. Create one Machine with its id, number of PEs and rating
+ mList.add( new Machine(i, totalPE, rating));
}
-
- // 5. Create a ResourceCharacteristics object that stores the
+ // 3. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -296,7 +283,7 @@
arch, os, mList, scheduling_alg, time_zone, cost);
- // 6. Finally, we need to create a GridResource object.
+ // 4. Finally, we need to create a GridResource object.
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Modified: trunk/examples/ResFailure/example01/readme.txt
===================================================================
--- trunk/examples/ResFailure/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/ResFailure/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -30,16 +30,6 @@
When running the example file, it will produce the following files:
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
Ex01_Regional_GIS -> contains one line describing each
registering/removing an event that takes place at the GIS. Resources
register in the begining of simulations, and after recovering from a
Modified: trunk/examples/ResFailure/example02/ResFailureEx02.java
===================================================================
--- trunk/examples/ResFailure/example02/ResFailureEx02.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/ResFailure/example02/ResFailureEx02.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -265,24 +265,11 @@
MachineList mList = new MachineList();
for (int i = 0; i < totalMachine; i++)
{
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList = new PEList();
-
- // 3. Create PEs and add these into an object of PEList.
- for (int k = 0; k < totalPE; k++)
- {
- // need to store PE id and MIPS Rating
- peList.add( new PE(k, rating) );
- }
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(i, peList) );
+ // 2. Create one Machine with its id, number of PEs and rating
+ mList.add( new Machine(i, totalPE, rating));
}
-
- // 5. Create a ResourceCharacteristics object that stores the
+ // 3. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -304,7 +291,7 @@
arch, os, mList, scheduling_alg, time_zone, cost);
- // 6. Finally, we need to create a GridResource object.
+ // 4. Finally, we need to create a GridResource object.
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Modified: trunk/examples/ResFailure/example02/readme.txt
===================================================================
--- trunk/examples/ResFailure/example02/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/ResFailure/example02/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -29,16 +29,6 @@
When running the example file, it will produce the following files:
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
Ex02_Regional_GIS -> contains one line describing each
registering/removing an event that takes place at the GIS. Resources
register in the begining of simulations, and after recovering from a
Modified: trunk/examples/ResFailure/example03/ResFailureEx03.java
===================================================================
--- trunk/examples/ResFailure/example03/ResFailureEx03.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/ResFailure/example03/ResFailureEx03.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -311,24 +311,11 @@
MachineList mList = new MachineList();
for (int i = 0; i < totalMachine; i++)
{
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList = new PEList();
-
- // 3. Create PEs and add these into an object of PEList.
- for (int k = 0; k < totalPE; k++)
- {
- // need to store PE id and MIPS Rating
- peList.add( new PE(k, rating) );
- }
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(i, peList) );
+ // 2. Create one Machine with its id, number of PEs and rating
+ mList.add( new Machine(i, totalPE, rating));
}
-
- // 5. Create a ResourceCharacteristics object that stores the
+ // 3. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -350,7 +337,7 @@
arch, os, mList, scheduling_alg, time_zone, cost);
- // 6. Finally, we need to create a GridResource object.
+ // 4. Finally, we need to create a GridResource object.
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Modified: trunk/examples/ResFailure/example03/readme.txt
===================================================================
--- trunk/examples/ResFailure/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/ResFailure/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -29,16 +29,6 @@
When running the example file, it will produce the following files:
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
Ex03_Regional_GIS_0, ..., Ex03_Regional_GIS_2 -> contains one line describing each
registering/removing an event that takes place at the GIS. Resources
register in the begining of simulations, and after recovering from a
Modified: trunk/examples/WorkloadTrace/example01/TraceEx01.java
===================================================================
--- trunk/examples/WorkloadTrace/example01/TraceEx01.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/WorkloadTrace/example01/TraceEx01.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -168,27 +168,12 @@
int rating = peRating;
for (int i = 0; i < totalMachine; i++)
{
- //////////////////////////////////////////
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList = new PEList();
-
- //////////////////////////////////////////
- // 3. Create PEs and add these into an object of PEList.
- for (int k = 0; k < totalPE; k++)
- {
- // need to store PE id and MIPS Rating
- peList.add( new PE(k, rating) );
- }
-
- //////////////////////////////////////////
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(i, peList) );
+ // 2. Create one Machine with its id, number of PEs and rating
+ mList.add( new Machine(i, totalPE, rating));
}
//////////////////////////////////////////
- // 5. Create a ResourceCharacteristics object that stores the
+ // 3. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -202,7 +187,7 @@
time_zone, cost);
//////////////////////////////////////////
- // 6. Finally, we need to create a GridResource object.
+ // 4. Finally, we need to create a GridResource object.
double baud_rate = 10000.0; // communication speed
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
Modified: trunk/examples/WorkloadTrace/example01/readme.txt
===================================================================
--- trunk/examples/WorkloadTrace/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/WorkloadTrace/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -27,20 +27,5 @@
TimeShared and SpaceShared, only process 1 PE for each Gridlet.
You are welcome to write your own scheduler that incorporates this
QoS (Quality of Service) requirement.
-
-When running the example file, it will produce the following files:
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report will be overwritten if running
- a new experiment.
-
Modified: trunk/examples/WorkloadTrace/example02/TraceEx02.java
===================================================================
--- trunk/examples/WorkloadTrace/example02/TraceEx02.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/WorkloadTrace/example02/TraceEx02.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -195,27 +195,12 @@
int rating = peRating;
for (int i = 0; i < totalMachine; i++)
{
- //////////////////////////////////////////
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList = new PEList();
-
- //////////////////////////////////////////
- // 3. Create PEs and add these into an object of PEList.
- for (int k = 0; k < totalPE; k++)
- {
- // need to store PE id and MIPS Rating
- peList.add( new PE(k, rating) );
- }
-
- //////////////////////////////////////////
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(i, peList) );
+ // 2. Create one Machine with its id, number of PEs and rating
+ mList.add( new Machine(i, totalPE, rating));
}
//////////////////////////////////////////
- // 5. Create a ResourceCharacteristics object that stores the
+ // 3. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -229,7 +214,7 @@
time_zone, cost);
//////////////////////////////////////////
- // 6. Finally, we need to create a GridResource object.
+ // 4. Finally, we need to create a GridResource object.
double baud_rate = 10000.0; // communication speed
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
Modified: trunk/examples/WorkloadTrace/example02/readme.txt
===================================================================
--- trunk/examples/WorkloadTrace/example02/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/WorkloadTrace/example02/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -29,19 +29,3 @@
You are welcome to write your own scheduler that incorporates this
QoS (Quality of Service) requirement.
-
-When running the example file, it will produce the following files:
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report will be overwritten if running
- a new experiment.
-
Modified: trunk/examples/WorkloadTrace/example03/TraceEx03.java
===================================================================
--- trunk/examples/WorkloadTrace/example03/TraceEx03.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/WorkloadTrace/example03/TraceEx03.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -285,63 +285,25 @@
// 1. We need to create an object of MachineList to store one or more
// Machines
MachineList mList = new MachineList();
- //System.out.println("Creates a Machine list");
+ // 2. Create one Machine with its id, number of PEs and MIPS rating per PE
+ // In this example, we are using a resource from
+ // hpc420.hpcc.jp, AIST, Tokyo, Japan
+ // Note: these data are taken the from GridSim paper, page 25.
+ // In this example, all PEs has the same MIPS (Millions
+ // Instruction Per Second) Rating for a Machine.
+ int mipsRating = 377;
+ mList.add( new Machine(0, 4, mipsRating)); // First Machine
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
- //System.out.println("Creates a PE list for the 1st Machine");
-
-
- // 3. Create PEs and add these into an object of PEList.
- peList1.add( new PE(0,rating) ); // need to store PE id and MIPS Rating
- peList1.add( new PE(1,rating) );
- peList1.add( new PE(2,rating) );
- peList1.add( new PE(3,rating) );
- //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(0, peList1) ); // First Machine
- //System.out.println("Creates the 1st Machine that has 4 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- // 5. Repeat the process from 2 if we want to create more Machines
+ // 3. Repeat the process from 2 if we want to create more Machines
+ // In this example, the AIST in Japan has 3 Machines with same
+ // MIPS Rating but different PEs.
// NOTE: if you only want to create one Machine for one Grid resource,
// then you could skip this step.
- PEList peList2 = new PEList();
- //System.out.println("Creates a PE list for the 2nd Machine");
+ mList.add( new Machine(1, 4, mipsRating)); // Second Machine
+ mList.add( new Machine(2, 2, mipsRating)); // Third Machine
- peList2.add( new PE(0, rating) );
- peList2.add( new PE(1, rating) );
- peList2.add( new PE(2, rating) );
- peList2.add( new PE(3, rating) );
- //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
- mList.add( new Machine(1, peList2) ); // Second Machine
- //System.out.println("Creates the 2nd Machine that has 4 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- PEList peList3 = new PEList();
- //System.out.println("Creates a PE list for the 3rd Machine");
-
- peList3.add( new PE(0, rating) );
- peList3.add( new PE(1, rating) );
- //System.out.println("Creates 2 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
- mList.add( new Machine(2, peList3) ); // Third Machine
- //System.out.println("Creates the 3rd Machine that has 2 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -357,7 +319,7 @@
//System.out.println("Creates the properties of a Grid resource and " +
// "stores the Machine list");
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Modified: trunk/examples/WorkloadTrace/example03/readme.txt
===================================================================
--- trunk/examples/WorkloadTrace/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/WorkloadTrace/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -28,20 +28,5 @@
TimeShared and SpaceShared, only process 1 PE for each Gridlet.
You are welcome to write your own scheduler that incorporates this
QoS (Quality of Service) requirement.
-
+
-When running the example file, it will produce the following files:
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report will be overwritten if running
- a new experiment.
-
Modified: trunk/examples/auction/example01/ExampleAuction.java
===================================================================
--- trunk/examples/auction/example01/ExampleAuction.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/auction/example01/ExampleAuction.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -143,15 +143,9 @@
// Object of MachineList to store one or more Machines
MachineList mList = new MachineList();
- // A Machine contains one or more PEs or CPUs.
- PEList peList = new PEList();
+ // Create one Machine with its id, number of PEs and MIPS rating
+ mList.add( new Machine(0, 1, 500) );
- // Create PEs and add these into an object of PEList.
- peList.add( new PE(0, 500) ); // need to store PE id and MIPS Rating
-
- // Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(0, peList) );
-
// Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone and
@@ -171,10 +165,10 @@
double offPeakLoad = 0.0;
double holidayLoad = 0.0;
- LinkedList weekends = new LinkedList();
+ LinkedList<Integer> weekends = new LinkedList<Integer>();
weekends.add(new Integer(Calendar.SATURDAY));
weekends.add(new Integer(Calendar.SUNDAY));
- LinkedList holidays = new LinkedList();
+ LinkedList<Integer> holidays = new LinkedList<Integer>();
ResourceCalendar calendar = new ResourceCalendar(time_zone, peakLoad,
offPeakLoad, holidayLoad, weekends, holidays, seed);
Modified: trunk/examples/auction/example02/ExampleAuction.java
===================================================================
--- trunk/examples/auction/example02/ExampleAuction.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/auction/example02/ExampleAuction.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -67,68 +67,14 @@
MachineList mList = new MachineList();
//System.out.println("Creates a Machine list");
+ // 2. Create a Machine with id, number of PEs and MIPS rating per PE
+ mList.add( new Machine(0, 4, mips)); // First Machine
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
- //System.out.println("Creates a PE list for the 1st Machine");
+ // 3. Repeat the process from 2 if we want to create more Machines
+ mList.add( new Machine(1, 4, mips)); // Second Machine
+ mList.add( new Machine(2, 2, mips)); // Third Machine
-
- // 3. Create PEs and add these into an object of PEList.
- // In this example, we are using a resource from
- // hpc420.hpcc.jp, AIST, Tokyo, Japan
- // Note: these data are taken the from GridSim paper, page 25.
- // In this example, all PEs has the same MIPS (Millions
- // Instruction Per Second) Rating for a Machine.
- peList1.add( new PE(0, mips) ); // need to store PE id and MIPS Rating
- peList1.add( new PE(1, mips) );
- peList1.add( new PE(2, mips) );
- peList1.add( new PE(3, mips) );
- //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(0, peList1) ); // First Machine
- //System.out.println("Creates the 1st Machine that has 4 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- // 5. Repeat the process from 2 if we want to create more Machines
- // In this example, the AIST in Japan has 3 Machines with same
- // MIPS Rating but different PEs.
- // NOTE: if you only want to create one Machine for one Grid resource,
- // then you could skip this step.
- PEList peList2 = new PEList();
- //System.out.println("Creates a PE list for the 2nd Machine");
-
- peList2.add( new PE(0, mips) );
- peList2.add( new PE(1, mips) );
- peList2.add( new PE(2, mips) );
- peList2.add( new PE(3, mips) );
- //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
- mList.add( new Machine(1, peList2) ); // Second Machine
- //System.out.println("Creates the 2nd Machine that has 4 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- PEList peList3 = new PEList();
- //System.out.println("Creates a PE list for the 3rd Machine");
-
- peList3.add( new PE(0, mips) );
- peList3.add( new PE(1, mips) );
- //System.out.println("Creates 2 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
- mList.add( new Machine(2, peList3) ); // Third Machine
- //System.out.println("Creates the 3rd Machine that has 2 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -140,10 +86,7 @@
arch, os, mList, ResourceCharacteristics.TIME_SHARED,
time_zone, cost);
- //System.out.println("Creates the properties of a Grid resource and " +
- // "stores the Machine list");
-
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
@@ -230,11 +173,6 @@
Broker broker = new Broker("Broker_" + i, baud_rate,
propDelay, mtu);
- // if trace_flag is set to "true", then this experiment will
- // create User_i.csv where i = 0 ... (num_user-1)
-// NetUser user = new NetUser(name, num_gridlet,
-// broker.getLink(), broker);
-
NetUser user = new NetUser("User_" + i, num_gridlet,
baud_rate, propDelay, mtu, broker);
Modified: trunk/examples/auction/example03/ExampleAuction.java
===================================================================
--- trunk/examples/auction/example03/ExampleAuction.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/auction/example03/ExampleAuction.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -67,68 +67,14 @@
MachineList mList = new MachineList();
//System.out.println("Creates a Machine list");
+ // 2. Create a Machine with id, number of PEs and MIPS rating per PE
+ mList.add( new Machine(0, 4, mips)); // First Machine
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
- //System.out.println("Creates a PE list for the 1st Machine");
+ // 3. Repeat the process from 2 if we want to create more Machines
+ mList.add( new Machine(1, 4, mips)); // Second Machine
+ mList.add( new Machine(2, 2, mips)); // Third Machine
-
- // 3. Create PEs and add these into an object of PEList.
- // In this example, we are using a resource from
- // hpc420.hpcc.jp, AIST, Tokyo, Japan
- // Note: these data are taken the from GridSim paper, page 25.
- // In this example, all PEs has the same MIPS (Millions
- // Instruction Per Second) Rating for a Machine.
- peList1.add( new PE(0, mips) ); // need to store PE id and MIPS Rating
- peList1.add( new PE(1, mips) );
- peList1.add( new PE(2, mips) );
- peList1.add( new PE(3, mips) );
- //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(0, peList1) ); // First Machine
- //System.out.println("Creates the 1st Machine that has 4 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- // 5. Repeat the process from 2 if we want to create more Machines
- // In this example, the AIST in Japan has 3 Machines with same
- // MIPS Rating but different PEs.
- // NOTE: if you only want to create one Machine for one Grid resource,
- // then you could skip this step.
- PEList peList2 = new PEList();
- //System.out.println("Creates a PE list for the 2nd Machine");
-
- peList2.add( new PE(0, mips) );
- peList2.add( new PE(1, mips) );
- peList2.add( new PE(2, mips) );
- peList2.add( new PE(3, mips) );
- //System.out.println("Creates 4 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
- mList.add( new Machine(1, peList2) ); // Second Machine
- //System.out.println("Creates the 2nd Machine that has 4 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- PEList peList3 = new PEList();
- //System.out.println("Creates a PE list for the 3rd Machine");
-
- peList3.add( new PE(0, mips) );
- peList3.add( new PE(1, mips) );
- //System.out.println("Creates 2 PEs with same MIPS Rating and put them"+
- // " into the PE list");
-
- mList.add( new Machine(2, peList3) ); // Third Machine
- //System.out.println("Creates the 3rd Machine that has 2 PEs and " +
- // "stores it into the Machine list");
- //System.out.println();
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -143,7 +89,7 @@
//System.out.println("Creates the properties of a Grid resource and " +
// "stores the Machine list");
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
long seed = 11L*13*17*19*23+1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Modified: trunk/examples/datagrid/example01/DataExample1.java
===================================================================
--- trunk/examples/datagrid/example01/DataExample1.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example01/DataExample1.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -146,50 +146,18 @@
MachineList mList = new MachineList();
//System.out.println("Creates a Machine list");
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
- //System.out.println("Creates a PE list for the 1st Machine");
+ // 2. Create a Machine with id, number of PEs and MIPS rating per PE
+ mList.add(new Machine(0, 4, 377)); // First Machine
- // 3. Create PEs and add these into an object of PEList.
- // In this example, we are using a resource from
- // hpc420.hpcc.jp, AIST, Tokyo, Japan
- // Note: these data are taken the from GridSim paper, page 25.
- // In this example, all PEs has the same MIPS (Millions
- // Instruction Per Second) Rating for a Machine.
- peList1.add(new PE(0, 377)); // need to store PE id and MIPS Rating
- peList1.add(new PE(1, 377));
- peList1.add(new PE(2, 377));
- peList1.add(new PE(3, 377));
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add(new Machine(0, peList1)); // First Machine
-
- // 5. Repeat the process from 2 if we want to create more Machines
+ // 3. Repeat the process from 2 if we want to create more Machines
// In this example, the AIST in Japan has 3 Machines with same
// MIPS Rating but different PEs.
// NOTE: if you only want to create one Machine for one Grid resource,
// then you could skip this step.
- PEList peList2 = new PEList();
+ mList.add(new Machine(1, 4, 377)); // Second Machine
+ mList.add(new Machine(2, 2, 377)); // Third Machine
- peList2.add(new PE(0, 377));
- peList2.add(new PE(1, 377));
- peList2.add(new PE(2, 377));
- peList2.add(new PE(3, 377));
-
- mList.add(new Machine(1, peList2)); // Second Machine
-
- PEList peList3 = new PEList();
-
- peList3.add(new PE(0, 377));
- peList3.add(new PE(1, 377));
-
-
- mList.add(new Machine(2, peList3)); // Third Machine
-
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -202,7 +170,7 @@
os, mList, ResourceCharacteristics.TIME_SHARED, time_zone, cost);
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
long seed = 11L * 13 * 17 * 19 * 23 + 1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Deleted: trunk/examples/datagrid/example01/readme.txt
===================================================================
--- trunk/examples/datagrid/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -1,22 +0,0 @@
-/**
- * Author: Anthony Sulistio
- * Date: March 2006
- */
-
-NOTE: When you open "output.txt" file, it tells you that grid user entities
- sending Gridlets to a selected grid resource.
-
-When running the example file, it will produce the following files:
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report file will be overwritten if running
- a new experiment.
Modified: trunk/examples/datagrid/example02/DataExample2.java
===================================================================
--- trunk/examples/datagrid/example02/DataExample2.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example02/DataExample2.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -136,51 +136,22 @@
// Here are the steps needed to create a Grid resource:
// 1. We need to create an object of MachineList to store one or more
- // Machines
+ // Machines
MachineList mList = new MachineList();
+ //System.out.println("Creates a Machine list");
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
+ // 2. Create a Machine with id, number of PEs and MIPS rating per PE
+ mList.add(new Machine(0, 4, 377)); // First Machine
- // 3. Create PEs and add these into an object of PEList.
- // In this example, we are using a resource from
- // hpc420.hpcc.jp, AIST, Tokyo, Japan
- // Note: these data are taken the from GridSim paper, page 25.
- // In this example, all PEs has the same MIPS (Millions
- // Instruction Per Second) Rating for a Machine.
- peList1.add(new PE(0, 377)); // need to store PE id and MIPS Rating
- peList1.add(new PE(1, 377));
- peList1.add(new PE(2, 377));
- peList1.add(new PE(3, 377));
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add(new Machine(0, peList1)); // First Machine
-
- // 5. Repeat the process from 2 if we want to create more Machines
- // In this example, the AIST in Japan has 3 Machines with same
- // MIPS Rating but different PEs.
+ // 3. Repeat the process from 2 if we want to create more Machines
+ // In this example, the AIST in Japan has 3 Machines with same
+ // MIPS Rating but different PEs.
// NOTE: if you only want to create one Machine for one Grid resource,
- // then you could skip this step.
- PEList peList2 = new PEList();
+ // then you could skip this step.
+ mList.add(new Machine(1, 4, 377)); // Second Machine
+ mList.add(new Machine(2, 2, 377)); // Third Machine
- peList2.add(new PE(0, 377));
- peList2.add(new PE(1, 377));
- peList2.add(new PE(2, 377));
- peList2.add(new PE(3, 377));
-
- mList.add(new Machine(1, peList2)); // Second Machine
-
- PEList peList3 = new PEList();
- // System.out.println("Creates a PE list for the 3rd Machine");
-
- peList3.add(new PE(0, 377));
- peList3.add(new PE(1, 377));
-
- mList.add(new Machine(2, peList3)); // Third Machine
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -195,7 +166,7 @@
// System.out.println("Creates the properties of a Grid resource and " +
// "stores the Machine list");
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
long seed = 11L * 13 * 17 * 19 * 23 + 1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Deleted: trunk/examples/datagrid/example02/readme.txt
===================================================================
--- trunk/examples/datagrid/example02/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example02/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -1,22 +0,0 @@
-/**
- * Author: Anthony Sulistio
- * Date: March 2006
- */
-
-NOTE: When you open "output.txt" file, it tells you that grid user entities
- sending Gridlets to a selected grid resource.
-
-When running the example file, it will produce the following files:
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report file will be overwritten if running
- a new experiment.
Modified: trunk/examples/datagrid/example03/DataGridletExample.java
===================================================================
--- trunk/examples/datagrid/example03/DataGridletExample.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example03/DataGridletExample.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -140,51 +140,22 @@
// Here are the steps needed to create a Grid resource:
// 1. We need to create an object of MachineList to store one or more
- // Machines
+ // Machines
MachineList mList = new MachineList();
+ //System.out.println("Creates a Machine list");
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
+ // 2. Create a Machine with id, number of PEs and MIPS rating per PE
+ mList.add(new Machine(0, 4, 377)); // First Machine
- // 3. Create PEs and add these into an object of PEList.
- // In this example, we are using a resource from
- // hpc420.hpcc.jp, AIST, Tokyo, Japan
- // Note: these data are taken the from GridSim paper, page 25.
- // In this example, all PEs has the same MIPS (Millions
- // Instruction Per Second) Rating for a Machine.
- peList1.add(new PE(0, 377)); // need to store PE id and MIPS Rating
- peList1.add(new PE(1, 377));
- peList1.add(new PE(2, 377));
- peList1.add(new PE(3, 377));
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add(new Machine(0, peList1)); // First Machine
-
- // 5. Repeat the process from 2 if we want to create more Machines
- // In this example, the AIST in Japan has 3 Machines with same
- // MIPS Rating but different PEs.
+ // 3. Repeat the process from 2 if we want to create more Machines
+ // In this example, the AIST in Japan has 3 Machines with same
+ // MIPS Rating but different PEs.
// NOTE: if you only want to create one Machine for one Grid resource,
- // then you could skip this step.
- PEList peList2 = new PEList();
+ // then you could skip this step.
+ mList.add(new Machine(1, 4, 377)); // Second Machine
+ mList.add(new Machine(2, 2, 377)); // Third Machine
- peList2.add(new PE(0, 377));
- peList2.add(new PE(1, 377));
- peList2.add(new PE(2, 377));
- peList2.add(new PE(3, 377));
-
- mList.add(new Machine(1, peList2)); // Second Machine
-
- PEList peList3 = new PEList();
- // System.out.println("Creates a PE list for the 3rd Machine");
-
- peList3.add(new PE(0, 377));
- peList3.add(new PE(1, 377));
-
- mList.add(new Machine(2, peList3)); // Third Machine
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -199,7 +170,7 @@
// System.out.println("Creates the properties of a Grid resource and " +
// "stores the Machine list");
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
long seed = 11L * 13 * 17 * 19 * 23 + 1;
double peakLoad = 0.0; // the resource load during peak hour
double offPeakLoad = 0.0; // the resource load during off-peak hr
Deleted: trunk/examples/datagrid/example03/readme.txt
===================================================================
--- trunk/examples/datagrid/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -1,23 +0,0 @@
-/**
- * Author: Anthony Sulistio
- * Date: March 2006
- */
-
-NOTE: When you open "output.txt" file, it tells you that grid user entities
- sending Gridlets to a selected grid resource.
-
-
-When running the example file, it will produce the following files:
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report file will be overwritten if running
- a new experiment.
Modified: trunk/examples/datagrid/example04/readme.txt
===================================================================
--- trunk/examples/datagrid/example04/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/datagrid/example04/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -14,22 +14,3 @@
Each of these two users must execute a small set of tasks.
A more detailed description of this package can be found in the tutorial.
-
-NOTE: When you open "output.txt" file, it tells you that grid user entities
- sending Gridlets to a selected grid resource.
-
-
-When running the example file, it will produce the following files:
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example.
-
- sim_report -> created by the SimJava2 package (lower-level) of GridSim.
- This is a simulation report that contains general information about
- running this experiment. We don't need to worry about this file.
- Not to important for our example.
-
-NOTE: sim_trace and sim_report file will be overwritten if running
- a new experiment.
Modified: trunk/examples/gridsim/example01/Example1.java
===================================================================
--- trunk/examples/gridsim/example01/Example1.java 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/gridsim/example01/Example1.java 2009-05-22 05:16:40 UTC (rev 267)
@@ -12,7 +12,9 @@
* $Id: Example1.java,v 1.6 2004/05/29 05:24:00 anthony Exp $
*/
-import java.util.*;
+import java.util.Calendar;
+import java.util.LinkedList;
+
import gridsim.*;
/**
@@ -99,70 +101,31 @@
MachineList mList = new MachineList();
System.out.println("Creates a Machine list");
-
- // 2. A Machine contains one or more PEs or CPUs. Therefore, should
- // create an object of PEList to store these PEs before creating
- // a Machine.
- PEList peList1 = new PEList();
- System.out.println("Creates a PE list for the 1st Machine");
-
-
- // 3. Create PEs and add these into an object of PEList.
+ // 2. Create one Machine with its id, number of PEs and MIPS rating per PE
// In this example, we are using a resource from
// hpc420.hpcc.jp, AIST, Tokyo, Japan
// Note: these data are taken the from GridSim paper, page 25.
// In this example, all PEs has the same MIPS (Millions
// Instruction Per Second) Rating for a Machine.
- int MIPSRating = 377;
- peList1.add( new PE(0, MIPSRating) ); // store PE id and MIPS Rating
- peList1.add( new PE(1, MIPSRating) );
- peList1.add( new PE(2, MIPSRating) );
- peList1.add( new PE(3, MIPSRating) );
- System.out.println("Creates 4 PEs with same MIPS Rating and put " +
- "them into the PE list");
-
-
- // 4. Create one Machine with its id and list of PEs or CPUs
- mList.add( new Machine(0, peList1) ); // First Machine
+ int mipsRating = 377;
+ mList.add( new Machine(0, 4, mipsRating)); // First Machine
System.out.println("Creates the 1st Machine that has 4 PEs and " +
"stores it into the Machine list");
-
- // 5. Repeat the process from 2 if we want to create more Machines
+ // 3. Repeat the process from 2 if we want to create more Machines
// In this example, the AIST in Japan has 3 Machines with same
// MIPS Rating but different PEs.
// NOTE: if you only want to create one Machine for one Grid resource,
// then you could skip this step.
- PEList peList2 = new PEList();
- System.out.println();
- System.out.println("Creates a PE list for the 2nd Machine");
-
- peList2.add( new PE(0, MIPSRating) );
- peList2.add( new PE(1, MIPSRating) );
- peList2.add( new PE(2, MIPSRating) );
- peList2.add( new PE(3, MIPSRating) );
- System.out.println("Creates 4 PEs with same MIPS Rating and put " +
- "them into the PE list");
-
- mList.add( new Machine(1, peList2) ); // Second Machine
+ mList.add( new Machine(1, 4, mipsRating)); // Second Machine
System.out.println("Creates the 2nd Machine that has 4 PEs and " +
"stores it into the Machine list");
- PEList peList3 = new PEList();
- System.out.println();
- System.out.println("Creates a PE list for the 3rd Machine");
-
- peList3.add( new PE(0, MIPSRating) );
- peList3.add( new PE(1, MIPSRating) );
- System.out.println("Creates 2 PEs with same MIPS Rating and put " +
- "them into the PE list");
-
- mList.add( new Machine(2, peList3) ); // Third Machine
+ mList.add( new Machine(2, 2, mipsRating)); // Third Machine
System.out.println("Creates the 3rd Machine that has 2 PEs and " +
"stores it into the Machine list");
-
- // 6. Create a ResourceCharacteristics object that stores the
+ // 4. Create a ResourceCharacteristics object that stores the
// properties of a Grid resource: architecture, OS, list of
// Machines, allocation policy: time- or space-shared, time zone
// and its price (G$/PE time unit).
@@ -179,8 +142,7 @@
System.out.println("Creates the properties of a Grid resource and " +
"stores the Machine list");
-
- // 7. Finally, we need to create a GridResource object.
+ // 5. Finally, we need to create a GridResource object.
String name = "Resource_0"; // resource name
double baud_rate = 100.0; // communication speed
long seed = 11L*13*17*19*23+1;
@@ -189,12 +151,12 @@
double holidayLoad = 0.0; // the resource load during holiday
// incorporates weekends so the grid resource is on 7 days a week
- LinkedList Weekends = new LinkedList();
+ LinkedList<Integer> Weekends = new LinkedList<Integer>();
Weekends.add(new Integer(Calendar.SATURDAY));
Weekends.add(new Integer(Calendar.SUNDAY));
// incorporates holidays. However, no holidays are set in this example
- LinkedList Holidays = new LinkedList();
+ LinkedList<Integer> Holidays = new LinkedList<Integer>();
GridResource gridRes = null;
try
@@ -212,6 +174,5 @@
return gridRes;
}
+}
-} // end class
-
Deleted: trunk/examples/gridsim/example01/readme.txt
===================================================================
--- trunk/examples/gridsim/example01/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/gridsim/example01/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -1,20 +0,0 @@
-
-/**
- * Author: Anthony Sulistio
- * Date: April 2003
- */
-
-When running the example file, it will produce the following files:
-
- GridSim_stat.txt -> created by the GridSim version 2.2 onwards
- during GridSim.init() to create
- GridStatistics object for statistical purposes. Since this example only
- shows how to create one Grid resource, therefore, this file is empty.
- We don't simulate anything yet.
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to worry about this file. Not to important for our
- example. Inside this file is empty since we don't simulate anything yet.
-
-
Modified: trunk/examples/gridsim/example03/readme.txt
===================================================================
--- trunk/examples/gridsim/example03/readme.txt 2009-05-21 01:59:34 UTC (rev 266)
+++ trunk/examples/gridsim/example03/readme.txt 2009-05-22 05:16:40 UTC (rev 267)
@@ -9,20 +9,3 @@
"Gridlet.SUCCESS". Therefore, the output is correct as expected with all
the Gridlets have the same status.
-When running the example file, it will produce the following files:
-
- GridSim_stat.txt -> created by the GridSim version 2.2 onwards
- during GridSim.init() to create
- GridStatistics object for statistical purposes. Since this example only
- shows how to create one Grid resource, therefore, this file is empty.
- We don't simulate anything yet.
-
- sim_trace -> created by the SimJava2 package (lower-level) to trace every
- events (performed by SimJava and GridSim) during the simulation.
- We don't need to w...
[truncated message content] |
