From 091a8bf3d88b4a020c902c04738008452e103be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torma=20Krist=C3=B3f?= Date: Wed, 14 Apr 2021 15:50:57 +0200 Subject: [PATCH] matlab change --- scripts/birbnetes/config/applications.xml | 10 +++++----- scripts/birbnetes/config/default_config.properties | 4 ++-- scripts/birbnetes/matlab/getConfiguration.m | 2 +- .../edgecloudsim/applications/birbnetes/MainApp.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/birbnetes/config/applications.xml b/scripts/birbnetes/config/applications.xml index f7ac597..aea3045 100644 --- a/scripts/birbnetes/config/applications.xml +++ b/scripts/birbnetes/config/applications.xml @@ -2,16 +2,16 @@ 100 - 1 + 0 7 0 - 2 + 1 20 88 - 2 + 5 750 - 1 - 4 + 1 + 2 20 5 diff --git a/scripts/birbnetes/config/default_config.properties b/scripts/birbnetes/config/default_config.properties index 43d7ed5..6662f63 100644 --- a/scripts/birbnetes/config/default_config.properties +++ b/scripts/birbnetes/config/default_config.properties @@ -31,10 +31,10 @@ ram_for_mobile_vm=4000 storage_for_mobile_vm=16000 #use ',' for multiple values -orchestrator_policies=NEXT_FIT +orchestrator_policies=BEST_FIT #use ',' for multiple values -simulation_scenarios=SINGLE_TIER,TWO_TIER,TWO_TIER_WITH_EO +simulation_scenarios=TWO_TIER,TWO_TIER_WITH_EO #mean waiting time in seconds attractiveness_L1_mean_waiting_time=500 diff --git a/scripts/birbnetes/matlab/getConfiguration.m b/scripts/birbnetes/matlab/getConfiguration.m index 834d5c1..11a65b9 100644 --- a/scripts/birbnetes/matlab/getConfiguration.m +++ b/scripts/birbnetes/matlab/getConfiguration.m @@ -4,7 +4,7 @@ %-------------------------------------------------------------- function [ret_val] = getConfiguration(argType) if(argType == 1) - ret_val = 'D:\sim_results'; + ret_val = 'C:\Users\tormakris\Documents\bme\edgesimresults'; elseif(argType == 2) ret_val = 1; %Number of iterations elseif(argType == 3) diff --git a/src/edu/boun/edgecloudsim/applications/birbnetes/MainApp.java b/src/edu/boun/edgecloudsim/applications/birbnetes/MainApp.java index ec48948..9eae35b 100644 --- a/src/edu/boun/edgecloudsim/applications/birbnetes/MainApp.java +++ b/src/edu/boun/edgecloudsim/applications/birbnetes/MainApp.java @@ -47,7 +47,7 @@ public class MainApp { //load settings from configuration file SimSettings SS = SimSettings.getInstance(); - if(SS.initialize(configFile, edgeDevicesFile, applicationsFile) == false){ + if(!SS.initialize(configFile, edgeDevicesFile, applicationsFile)){ SimLogger.printLine("cannot initialize simulation settings!"); System.exit(0); }