modification on reading settings from config file

1- simulation scenarios are defined in config file instead of static
enumarations
2- defining multiple edge orchestrator policy in config file support is
added
This commit is contained in:
Cagatay Sonmez
2017-02-25 15:10:13 +03:00
parent 19c4b9de40
commit 81fed10dd0
9 changed files with 72 additions and 58 deletions

View File

@@ -26,7 +26,7 @@ import edu.boun.edgecloudsim.utils.SimUtils;
public class IdleActiveLoadGenerator extends LoadGeneratorModel{
public IdleActiveLoadGenerator(int _numberOfMobileDevices, double _simulationTime, SimSettings.SCENARIO_TYPES _simScenario) {
public IdleActiveLoadGenerator(int _numberOfMobileDevices, double _simulationTime, String _simScenario) {
super(_numberOfMobileDevices, _simulationTime, _simScenario);
}
@@ -88,7 +88,7 @@ public class IdleActiveLoadGenerator extends LoadGeneratorModel{
}
boolean requireCloud = false;
if(simScenario != SimSettings.SCENARIO_TYPES.SINGLE_TIER){
if(!simScenario.equals("SINGLE_TIER")){
//decide to use cloud or cloudlet VM
int CloudVmPicker = SimUtils.getRandomNumber(0, 100);

View File

@@ -15,16 +15,15 @@ package edu.boun.edgecloudsim.task_generator;
import java.util.List;
import edu.boun.edgecloudsim.core.SimSettings;
import edu.boun.edgecloudsim.utils.EdgeTask;
public abstract class LoadGeneratorModel {
protected List<EdgeTask> taskList;
protected int numberOfMobileDevices;
protected double simulationTime;
protected SimSettings.SCENARIO_TYPES simScenario;
protected String simScenario;
public LoadGeneratorModel(int _numberOfMobileDevices, double _simulationTime, SimSettings.SCENARIO_TYPES _simScenario){
public LoadGeneratorModel(int _numberOfMobileDevices, double _simulationTime, String _simScenario){
numberOfMobileDevices=_numberOfMobileDevices;
simulationTime=_simulationTime;
simScenario=_simScenario;