diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java index 1817b774b..f404f542a 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerInitialPlacementTest.java @@ -2,6 +2,8 @@ import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * This Example is following the format for {@link org.cloudbus.cloudsim.examples.power.planetlab.Dvfs} @@ -31,7 +33,7 @@ public static void main(String[] args) throws IOException { /** * Getting the path of the planet lab workload that is included in the cloudSim Package */ - String inputFolder = ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); /** * The output folder for the logs. The log files would be located in this folder. */ diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java index 80e310c80..da04b01c4 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerOverbooking.java @@ -2,6 +2,8 @@ import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * This Example is following the format for {@link org.cloudbus.cloudsim.examples.power.planetlab.Dvfs} @@ -31,7 +33,7 @@ public static void main(String[] args) throws IOException { /** * Getting the path of the planet lab workload that is included in the cloudSim Package */ - String inputFolder = ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); /** * The output folder for the logs. The log files would be located in this folder. */ diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java index ef4b1175a..2de46f196 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/container/ContainerSelectionTest.java @@ -2,6 +2,8 @@ import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * This Example is following the format for {@link org.cloudbus.cloudsim.examples.power.planetlab.Dvfs} * It specifically studies the placement of containers. @@ -31,7 +33,7 @@ public static void main(String[] args) throws IOException { /** * Getting the path of the planet lab workload that is included in the cloudSim Package */ - String inputFolder = ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(ContainerOverbooking.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); /** * The output folder for the logs. The log files would be located in this folder. */ diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample1.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample1.java index e6b8fe952..8e9d98038 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample1.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample1.java @@ -34,6 +34,8 @@ import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; import org.cloudbus.cloudsim.provisioners.PeProvisionerSimple; import org.cloudbus.cloudsim.provisioners.RamProvisionerSimple; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simple example showing how to create @@ -117,7 +119,7 @@ public static void main(String[] args) { //Sixth step: configure network //load the network topology file - NetworkTopology.buildNetworkTopology(NetworkExample1.class.getClassLoader().getResource("topology.brite").getPath()); + NetworkTopology.buildNetworkTopology(URLDecoder.decode(NetworkExample1.class.getClassLoader().getResource("topology.brite").getPath(), StandardCharsets.UTF_8)); //maps CloudSim entities to BRITE entities //PowerDatacenter will correspond to BRITE node 0 diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample2.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample2.java index 0a558f60c..f990aa68a 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample2.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample2.java @@ -35,6 +35,8 @@ import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; import org.cloudbus.cloudsim.provisioners.PeProvisionerSimple; import org.cloudbus.cloudsim.provisioners.RamProvisionerSimple; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simple example showing how to create @@ -136,7 +138,7 @@ public static void main(String[] args) { //Sixth step: configure network //load the network topology file - NetworkTopology.buildNetworkTopology(NetworkExample1.class.getClassLoader().getResource("topology.brite").getPath()); + NetworkTopology.buildNetworkTopology(URLDecoder.decode(NetworkExample1.class.getClassLoader().getResource("topology.brite").getPath(), StandardCharsets.UTF_8)); //maps CloudSim entities to BRITE entities //Datacenter0 will correspond to BRITE node 0 diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample3.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample3.java index d063bcc71..5e1a35719 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample3.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/network/NetworkExample3.java @@ -34,6 +34,8 @@ import org.cloudbus.cloudsim.provisioners.BwProvisionerSimple; import org.cloudbus.cloudsim.provisioners.PeProvisionerSimple; import org.cloudbus.cloudsim.provisioners.RamProvisionerSimple; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simple example showing how to create @@ -137,7 +139,7 @@ public static void main(String[] args) { //Sixth step: configure network //load the network topology file - NetworkTopology.buildNetworkTopology(NetworkExample1.class.getClassLoader().getResource("topology.brite").getPath()); + NetworkTopology.buildNetworkTopology(URLDecoder.decode(NetworkExample1.class.getClassLoader().getResource("topology.brite").getPath(), StandardCharsets.UTF_8)); //maps CloudSim entities to BRITE entities //Datacenter0 will correspond to BRITE node 0 diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/Dvfs.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/Dvfs.java index 8bf22f5e9..6b493f785 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/Dvfs.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/Dvfs.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that only applied DVFS, but no dynamic @@ -33,7 +35,9 @@ public class Dvfs { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = Dvfs.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode( + Dvfs.class.getClassLoader().getResource("workload/planetlab").getPath(), + StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "dvfs"; // DVFS policy without VM migrations diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMc.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMc.java index 793d282bd..6b50629d1 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMc.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMc.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Inter Quartile Range @@ -32,7 +34,9 @@ public class IqrMc { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = IqrMc.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode( + IqrMc.class.getClassLoader().getResource("workload/planetlab").getPath(), + StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "iqr"; // Inter Quartile Range (IQR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMmt.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMmt.java index cfad1e5ec..e88e264a4 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMmt.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMmt.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Inter Quartile Range @@ -32,7 +34,7 @@ public class IqrMmt { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = IqrMmt.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(IqrMmt.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "iqr"; // Inter Quartile Range (IQR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMu.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMu.java index 0c659a7a3..cd832aa08 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMu.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrMu.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Inter Quartile Range @@ -32,7 +34,7 @@ public class IqrMu { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = IqrMu.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(IqrMu.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "iqr"; // Inter Quartile Range (IQR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrRs.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrRs.java index 38309a57b..6e6f0d7dd 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrRs.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/IqrRs.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Inter Quartile Range @@ -32,7 +34,7 @@ public class IqrRs { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = IqrRs.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(IqrRs.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "iqr"; // Inter Quartile Range (IQR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMc.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMc.java index 602fb7d0c..1efadb13b 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMc.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMc.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression (LR) VM @@ -32,7 +34,7 @@ public class LrMc { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrMc.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrMc.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lr"; // Local Regression (LR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMmt.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMmt.java index ae7caa2f8..2b13e901b 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMmt.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMmt.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression (LR) VM @@ -32,7 +34,7 @@ public class LrMmt { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrMmt.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrMmt.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lr"; // Local Regression (LR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMu.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMu.java index 86af76510..eca9454f9 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMu.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrMu.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression (LR) VM @@ -32,7 +34,7 @@ public class LrMu { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrMu.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrMu.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lr"; // Local Regression (LR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrRs.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrRs.java index 9020165af..3bb7af818 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrRs.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrRs.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression (LR) VM @@ -32,7 +34,7 @@ public class LrRs { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrRs.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrRs.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lr"; // Local Regression (LR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMc.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMc.java index 505478b7a..caa396a04 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMc.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMc.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression Robust @@ -32,7 +34,7 @@ public class LrrMc { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrrMc.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrrMc.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lrr"; // Local Regression Robust (LRR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMmt.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMmt.java index 3390c5185..63e5dd464 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMmt.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMmt.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression Robust @@ -32,7 +34,7 @@ public class LrrMmt { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrrMmt.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrrMmt.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lrr"; // Local Regression Robust (LRR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMu.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMu.java index e1ff9feec..572757151 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMu.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrMu.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression Robust @@ -32,7 +34,7 @@ public class LrrMu { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrrMu.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrrMu.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lrr"; // Local Regression Robust (LRR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrRs.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrRs.java index 6a049b6ed..1d0bdcf7b 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrRs.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/LrrRs.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Local Regression Robust @@ -32,7 +34,7 @@ public class LrrRs { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = LrrRs.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(LrrRs.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "lrr"; // Local Regression Robust (LRR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMc.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMc.java index 0835d1cf2..ce3cf5a12 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMc.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMc.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Median Absolute @@ -32,7 +34,7 @@ public class MadMc { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = MadMc.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(MadMc.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "mad"; // Median Absolute Deviation (MAD) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMmt.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMmt.java index f9e4ebad8..54c454e01 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMmt.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMmt.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Median Absolute @@ -32,7 +34,7 @@ public class MadMmt { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = MadMmt.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(MadMmt.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "mad"; // Median Absolute Deviation (MAD) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMu.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMu.java index f0f00fb32..217d3ca43 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMu.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadMu.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Median Absolute @@ -32,7 +34,7 @@ public class MadMu { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = MadMu.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(MadMu.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "mad"; // Median Absolute Deviation (MAD) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadRs.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadRs.java index 1315590ab..5b2c392fc 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadRs.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/MadRs.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Median Absolute @@ -32,7 +34,7 @@ public class MadRs { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = MadRs.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(MadRs.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "mad"; // Median Absolute Deviation (MAD) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/NonPowerAware.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/NonPowerAware.java index 601938007..7548c7aa1 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/NonPowerAware.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/NonPowerAware.java @@ -10,6 +10,8 @@ import org.cloudbus.cloudsim.examples.power.Helper; import org.cloudbus.cloudsim.power.PowerDatacenterNonPowerAware; import org.cloudbus.cloudsim.power.PowerHost; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous non-power aware data center: all hosts consume maximum power all @@ -42,8 +44,7 @@ public class NonPowerAware { public static void main(String[] args) throws IOException { String experimentName = "planetlab_npa"; String outputFolder = "output"; - String inputFolder = NonPowerAware.class.getClassLoader().getResource("workload/planetlab/20110303") - .getPath(); + String inputFolder = URLDecoder.decode(URLDecoder.decode(NonPowerAware.class.getClassLoader().getResource("workload/planetlab/20110303").getPath(), StandardCharsets.UTF_8), StandardCharsets.UTF_8); Log.setDisabled(!Constants.ENABLE_OUTPUT); Log.println("Starting " + experimentName); diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMc.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMc.java index ccf5c8bbd..ba552fa6e 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMc.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMc.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Static Threshold (THR) @@ -32,7 +34,7 @@ public class ThrMc { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "thr"; // Static Threshold (THR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMmt.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMmt.java index 8c516e958..5646dda90 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMmt.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMmt.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Static Threshold (THR) @@ -32,7 +34,7 @@ public class ThrMmt { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "thr"; // Static Threshold (THR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMu.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMu.java index 9325fb397..f273d6976 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMu.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrMu.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Static Threshold (THR) @@ -32,7 +34,7 @@ public class ThrMu { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "thr"; // Static Threshold (THR) VM allocation policy diff --git a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrRs.java b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrRs.java index 907bd1b9d..3bd5ff7b1 100644 --- a/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrRs.java +++ b/modules/cloudsim-examples/src/main/java/org/cloudbus/cloudsim/examples/power/planetlab/ThrRs.java @@ -1,6 +1,8 @@ package org.cloudbus.cloudsim.examples.power.planetlab; import java.io.IOException; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; /** * A simulation of a heterogeneous power aware data center that applies the Static Threshold (THR) @@ -32,7 +34,7 @@ public class ThrRs { public static void main(String[] args) throws IOException { boolean enableOutput = true; boolean outputToFile = false; - String inputFolder = NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(); + String inputFolder = URLDecoder.decode(NonPowerAware.class.getClassLoader().getResource("workload/planetlab").getPath(), StandardCharsets.UTF_8); String outputFolder = "output"; String workload = "20110303"; // PlanetLab workload String vmAllocationPolicy = "thr"; // Static Threshold (THR) VM allocation policy diff --git a/modules/cloudsim/src/test/java/org/cloudbus/cloudsim/UtilizationModelPlanetLabInMemoryTest.java b/modules/cloudsim/src/test/java/org/cloudbus/cloudsim/UtilizationModelPlanetLabInMemoryTest.java index 57d163746..a03e7958d 100644 --- a/modules/cloudsim/src/test/java/org/cloudbus/cloudsim/UtilizationModelPlanetLabInMemoryTest.java +++ b/modules/cloudsim/src/test/java/org/cloudbus/cloudsim/UtilizationModelPlanetLabInMemoryTest.java @@ -3,6 +3,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.nio.file.Paths; + import static org.junit.jupiter.api.Assertions.assertEquals; public class UtilizationModelPlanetLabInMemoryTest { @@ -15,8 +17,8 @@ public class UtilizationModelPlanetLabInMemoryTest { @BeforeEach public void setUp() throws Exception { - utilizationModel = new UtilizationModelPlanetLabInMemory(getClass().getClassLoader() - .getResource(FILE).getPath(), SCHEDULING_INTERVAL); + String filePath = Paths.get(getClass().getClassLoader().getResource(FILE).toURI()).toString(); + utilizationModel = new UtilizationModelPlanetLabInMemory(filePath, SCHEDULING_INTERVAL); } @Test