From 222d7cd741cbec9d79512ffe4bef4278d9deece8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Mon, 30 Oct 2023 12:34:26 +0100
Subject: [PATCH] refac: renonce->renounce to correct orthograph, #24.
'dm_user_renonce' now depracated
---
src/users/broker.cpp | 17 +++-
src/users/response_behaviors.cpp | 6 +-
src/users/response_behaviors.hpp | 2 +-
src/users/user_description_file_template.json | 6 +-
src/users/user_replay.cpp | 10 +-
src/users/user_replay.hpp | 6 +-
src/users/user_windows.cpp | 10 +-
src/users/user_windows.hpp | 6 +-
...ehavior-2machines_user_stats_behaviors.csv | 94 +++++++++----------
...kload_1-2machines_user_stats_behaviors.csv | 6 +-
...kload_2-2machines_user_stats_behaviors.csv | 22 ++---
...kload_3-2machines_user_stats_behaviors.csv | 6 +-
...kload_4-2machines_user_stats_behaviors.csv | 2 +-
...kload_5-2machines_user_stats_behaviors.csv | 24 ++---
..._yellow-2machines_user_stats_behaviors.csv | 80 ++++++++--------
...sv => dm_user_renounce-2machines_jobs.csv} | 0
test/schedconf/dm_user_multi_behavior.json | 16 ++--
.../dm_user_multi_behavior_many_windows.json | 16 ++--
...ser_multi_behavior_many_windows_wrong.json | 16 ++--
...lti_behavior_many_windows_wrong_order.json | 16 ++--
..._user_multi_behavior_small_workload_1.json | 8 +-
..._user_multi_behavior_small_workload_2.json | 8 +-
..._user_multi_behavior_small_workload_3.json | 8 +-
..._user_multi_behavior_small_workload_4.json | 12 +--
..._user_multi_behavior_small_workload_5.json | 12 +--
.../dm_user_multi_behavior_yellow.json | 16 ++--
...ser_renonce.json => dm_user_renounce.json} | 8 +-
test/test_assertion_error.py | 6 +-
test/test_dm_users.py | 8 +-
test/test_multi_behavior.py | 2 +-
30 files changed, 228 insertions(+), 221 deletions(-)
rename test/expected_log/{dm_user_renonce-2machines_jobs.csv => dm_user_renounce-2machines_jobs.csv} (100%)
rename test/schedconf/{dm_user_renonce.json => dm_user_renounce.json} (78%)
diff --git a/src/users/broker.cpp b/src/users/broker.cpp
index a557f75..7de8fac 100644
--- a/src/users/broker.cpp
+++ b/src/users/broker.cpp
@@ -141,7 +141,7 @@ Broker::Broker(rapidjson::Document *user_description_file)
else if (category == "dm_user_reconfig"
|| category == "dm_user_degrad_temp"
|| category == "dm_user_degrad_space"
- || category == "dm_user_renonce"
+ || category == "dm_user_renounce"
|| category == "dm_user_delay")
{
PPK_ASSERT_ERROR(dm_window != nullptr,
@@ -158,8 +158,8 @@ Broker::Broker(rapidjson::Document *user_description_file)
else if (category == "dm_user_degrad_temp")
user = new DMUserDegradTemp(name, param, dm_window);
- else if (category == "dm_user_renonce")
- user = new DMUserRenonce(name, param, dm_window);
+ else if (category == "dm_user_renounce")
+ user = new DMUserRenounce(name, param, dm_window);
else // if (category == "dm_user_delay")
user = new DMUserDelay(name, param, dm_window);
@@ -186,6 +186,13 @@ Broker::Broker(rapidjson::Document *user_description_file)
"dm_user_degrad_time or dm_user_degrad_space.");
user = nullptr;
}
+ else if (category == "dm_user_renonce")
+ {
+ PPK_ASSERT_ERROR(false,
+ "Invalid user_description file: 'dm_user_renonce' has been "
+ "ranamed 'dm_user_renounce' since October 2023.");
+ user = nullptr;
+ }
/* Feedback user */
else if (category == "fb_user_think_time_only")
@@ -433,8 +440,8 @@ void Broker::log_user_stats(string log_folder)
file << ",nb_jobs,core_seconds\n";
file << boost::format("rigid,%1%,%2%\n") % stat[2 * RIGID]
% stat[2 * RIGID + 1];
- file << boost::format("renonced,%1%,%2%\n") % stat[2 * RENONCED]
- % stat[2 * RENONCED + 1];
+ file << boost::format("renounced,%1%,%2%\n") % stat[2 * RENOUNCED]
+ % stat[2 * RENOUNCED + 1];
file << boost::format("delayed,%1%,%2%\n") % stat[2 * DELAYED]
% stat[2 * DELAYED + 1];
file << boost::format("degraded,%1%,%2%\n") % stat[2 * DEGRADED]
diff --git a/src/users/response_behaviors.cpp b/src/users/response_behaviors.cpp
index e3544e7..61db987 100644
--- a/src/users/response_behaviors.cpp
+++ b/src/users/response_behaviors.cpp
@@ -22,9 +22,9 @@ bool rigid_job(shared_ptr<Job> job, Profile *profile, ReplayUser *user,
bool renounce_job(shared_ptr<Job> job, ReplayUser *user, double random_number)
{
/* Log... */
- user->log_behavior(job, "renonce", 0, random_number);
- user->dm_stat[2 * RENONCED]++;
- user->dm_stat[2 * RENONCED + 1]
+ user->log_behavior(job, "renounce", 0, random_number);
+ user->dm_stat[2 * RENOUNCED]++;
+ user->dm_stat[2 * RENOUNCED + 1]
+= job->nb_requested_resources * std::stol(job->profile);
/* Signals that the job must not be executed */
diff --git a/src/users/response_behaviors.hpp b/src/users/response_behaviors.hpp
index 733a6bf..cd64370 100644
--- a/src/users/response_behaviors.hpp
+++ b/src/users/response_behaviors.hpp
@@ -7,7 +7,7 @@ using namespace std;
enum Behavior
{
RIGID,
- RENONCED,
+ RENOUNCED,
DELAYED,
DEGRADED,
RECONF,
diff --git a/src/users/user_description_file_template.json b/src/users/user_description_file_template.json
index 925df9d..11c025e 100644
--- a/src/users/user_description_file_template.json
+++ b/src/users/user_description_file_template.json
@@ -60,7 +60,7 @@
},
{
"name": "geo",
- "category": "dm_user_renonce",
+ "category": "dm_user_renounce",
"param": {
"input_json": "geo.json"
}
@@ -89,12 +89,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.0,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/src/users/user_replay.cpp b/src/users/user_replay.cpp
index e85fb3d..581ddbc 100644
--- a/src/users/user_replay.cpp
+++ b/src/users/user_replay.cpp
@@ -225,15 +225,15 @@ void DMUserDegradTemp::jobs_to_submit(double date, std::list<shared_ptr<Job>> &j
ReplayUser::jobs_to_submit(date, jobs, profiles);
}
-/* DMUserRenonce */
-DMUserRenonce::DMUserRenonce(
+/* DMUserRenounce */
+DMUserRenounce::DMUserRenounce(
std::string name, const rapidjson::Value ¶m, DMWindow *window)
{
dm_window = window;
init_ReplayUser(name, param);
}
-DMUserRenonce::~DMUserRenonce()
+DMUserRenounce::~DMUserRenounce()
{
if (original_trace)
{
@@ -242,7 +242,7 @@ DMUserRenonce::~DMUserRenonce()
}
}
-void DMUserRenonce::jobs_to_submit(double date,
+void DMUserRenounce::jobs_to_submit(double date,
std::list<shared_ptr<Job>> &jobs, std::list<const Profile *> &profiles)
{
ReplayUser::jobs_to_submit(date, jobs, profiles);
@@ -315,7 +315,7 @@ bool DMUserDegradTemp::handle_job(
return degrad_temp_job(job, profile, this, -1);
}
-bool DMUserRenonce::handle_job(
+bool DMUserRenounce::handle_job(
double date, shared_ptr<Job> job, Profile *profile)
{
if (dm_window->date_in_dm_window(date))
diff --git a/src/users/user_replay.hpp b/src/users/user_replay.hpp
index 6b8c18b..2553b62 100644
--- a/src/users/user_replay.hpp
+++ b/src/users/user_replay.hpp
@@ -152,12 +152,12 @@ protected:
* @details Renouncing consists in simply not submitting the job (and never
* submit it in the future).
*/
-class DMUserRenonce : virtual public ReplayUser
+class DMUserRenounce : virtual public ReplayUser
{
public:
- DMUserRenonce(
+ DMUserRenounce(
std::string name, const rapidjson::Value ¶m, DMWindow *dm_window);
- ~DMUserRenonce();
+ ~DMUserRenounce();
long next_submission();
void jobs_to_submit(double date, std::list<shared_ptr<Job>> &jobs,
std::list<const Profile *> &profiles);
diff --git a/src/users/user_windows.cpp b/src/users/user_windows.cpp
index 34c46ac..87fba4b 100644
--- a/src/users/user_windows.cpp
+++ b/src/users/user_windows.cpp
@@ -116,7 +116,7 @@ void DMUserMultiBehavior::init_prob_mono_core(const rapidjson::Value ¶m,
std::vector<string> red_config(R_TOTAL_MONO, "");
red_config[R_DEGRAD_MONO] = "red_prob_degrad_mono_core";
red_config[R_C_YOU_LATER_MONO] = "red_prob_see_you_later_mono_core";
- red_config[R_RENONCE_MONO] = "red_prob_renonce_mono_core";
+ red_config[R_RENOUNCE_MONO] = "red_prob_renounce_mono_core";
red_config[R_RIGID_MONO] = "red_prob_rigid_mono_core";
red_prob_total_mono_core = parse_proba_param(param, red_config,
red_prob_array, "red_windows", "red_windows_prob_mono_core");
@@ -144,7 +144,7 @@ void DMUserMultiBehavior::init_prob_multi_core(const rapidjson::Value ¶m,
red_config[R_DEGRAD_MULTI] = "red_prob_degrad_multi_core";
red_config[R_C_YOU_LATER_MULTI] = "red_prob_see_you_later_multi_core";
red_config[R_RECONFIG_MULTI] = "red_prob_reconfig_multi_core";
- red_config[R_RENONCE_MULTI] = "red_prob_renonce_multi_core";
+ red_config[R_RENOUNCE_MULTI] = "red_prob_renounce_multi_core";
red_config[R_RIGID_MULTI] = "red_prob_rigid_multi_core";
red_prob_total_multi_core = parse_proba_param(param, red_config,
red_prob_array, "red_windows", "red_windows_prob_multi_core");
@@ -167,7 +167,7 @@ void DMUserMultiBehavior::check_deprecated_param(const rapidjson::Value ¶m)
std::vector<string> deprecated_option;
deprecated_option.emplace_back("red_prob_degrad");
deprecated_option.emplace_back("red_prob_see_you_later");
- deprecated_option.emplace_back("red_prob_renonce");
+ deprecated_option.emplace_back("red_prob_renounce");
deprecated_option.emplace_back("red_prob_reconfig");
deprecated_option.emplace_back("red_prob_rigid");
deprecated_option.emplace_back("yellow_prob_degrad");
@@ -199,7 +199,7 @@ bool DMUserMultiBehavior::exec_red_behavior_mono(
std::vector<double>::size_type behavior_number, double date,
shared_ptr<Job> job, Profile *profile, double random_number)
{
- if (behavior_number == R_RENONCE_MONO)
+ if (behavior_number == R_RENOUNCE_MONO)
{
return renounce_job(job, this, random_number);
}
@@ -246,7 +246,7 @@ bool DMUserMultiBehavior::exec_red_behavior_multi(
std::vector<double>::size_type behavior_number, double date,
shared_ptr<Job> job, Profile *profile, double random_number)
{
- if (behavior_number == R_RENONCE_MULTI)
+ if (behavior_number == R_RENOUNCE_MULTI)
{
return renounce_job(job, this, random_number);
}
diff --git a/src/users/user_windows.hpp b/src/users/user_windows.hpp
index 2a0240d..cc27a2b 100644
--- a/src/users/user_windows.hpp
+++ b/src/users/user_windows.hpp
@@ -71,9 +71,9 @@ public:
protected:
- enum red_behavior_multi {R_RENONCE_MULTI,R_C_YOU_LATER_MULTI,R_DEGRAD_MULTI,
+ enum red_behavior_multi {R_RENOUNCE_MULTI,R_C_YOU_LATER_MULTI,R_DEGRAD_MULTI,
R_RECONFIG_MULTI,R_RIGID_MULTI,R_TOTAL_MULTI};
- enum red_behavior_mono {R_RENONCE_MONO,R_C_YOU_LATER_MONO,R_DEGRAD_MONO,
+ enum red_behavior_mono {R_RENOUNCE_MONO,R_C_YOU_LATER_MONO,R_DEGRAD_MONO,
R_RIGID_MONO,R_TOTAL_MONO};
enum yellow_behavior_multi {Y_DEGRAD_MULTI,Y_RECONFIG_MULTI,Y_RIGID_MULTI,Y_TOTAL_MULTI};
enum yellow_behavior_mono {Y_DEGRAD_MONO,Y_RIGID_MONO,Y_TOTAL_MONO};
@@ -105,7 +105,7 @@ protected:
/**
* @brief function called when the user submit a job in red state
* @details This function do the 5 behavior for red windows of the class
- * (degrad,reconfig,renonce,rigid,see_you_later)
+ * (degrad,reconfig,renounce,rigid,see_you_later)
* following the provided probabilities given at the creation of the class
*/
bool red_window_behavior(double date,shared_ptr<Job> & job, Profile *profile);
diff --git a/test/expected_behavior_log/dm_user_multi_behavior-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior-2machines_user_stats_behaviors.csv
index b6700e0..fca705d 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior-2machines_user_stats_behaviors.csv
@@ -21,43 +21,43 @@ user18,1384,119976,rigid,0,1
user18,1386,120259,rigid,0,1
user18,1387,120441,rigid,0,1
user18,1956,210993,rigid,0,0.934658
-user18,1962,211560,renonce,0,0.0245083
-user15,2427,243133,renonce,0,0.0894425
+user18,1962,211560,renounce,0,0.0245083
+user15,2427,243133,renounce,0,0.0894425
user15,2428,243374,rigid,0,0.84728
-user15,2442,244342,renonce,0,0.108429
+user15,2442,244342,renounce,0,0.108429
user15,2443,244436,C_you_later,3600,0.317551
-user15,2443,248036,renonce,0,0.123269
+user15,2443,248036,renounce,0,0.123269
user14,2527,253799,consider_degrad,0,0.511997
user14,2527,253799,degrad_time,0,0.511997
user14,2528,253947,rigid,0,0.759578
-user14,2529,254111,renonce,0,0.0617387
+user14,2529,254111,renounce,0,0.0617387
user14,2530,254200,C_you_later,3600,0.25666
-user14,2531,254280,renonce,0,0.0288913
+user14,2531,254280,renounce,0,0.0288913
user14,2532,254392,C_you_later,3600,0.41498
-user14,2530,257800,renonce,0,0.0138883
-user14,2532,257992,renonce,0,0.245617
+user14,2530,257800,renounce,0,0.0138883
+user14,2532,257992,renounce,0,0.245617
user16,2715,275408,consider_reconfig,0,0.623223
user16,2715,275408,reconfig,0,0.623223
user16,2716,275409,consider_reconfig,0,0.754136
user16,2716,275409,reconfig,0,0.754136
-user16,2717,275409,renonce,0,0.126823
-user16,2718,275410,renonce,0,0.133692
+user16,2717,275409,renounce,0,0.126823
+user16,2718,275410,renounce,0,0.133692
user16,2719,275410,rigid,0,0.863131
user16,2720,275411,consider_reconfig,0,0.670333
user16,2720,275411,reconfig,0,0.670333
user16,2721,275411,rigid,0,0.835295
user16,2722,275412,C_you_later,3600,0.376401
-user16,2723,275412,renonce,0,0.0468422
-user16,2724,275413,renonce,0,0.147924
+user16,2723,275412,renounce,0,0.0468422
+user16,2724,275413,renounce,0,0.147924
user16,2725,275413,rigid,0,0.849185
user16,2726,275414,rigid,0,0.956566
user16,2727,275414,C_you_later,3600,0.28359
user16,2728,275426,C_you_later,3600,0.260293
-user16,2729,275427,renonce,0,0.144999
+user16,2729,275427,renounce,0,0.144999
user16,2730,275427,consider_degrad,0,0.501635
user16,2730,275427,degrad_space,0,0.501635
-user16,2731,275428,renonce,0,0.115519
-user16,2732,275428,renonce,0,0.135688
+user16,2731,275428,renounce,0,0.115519
+user16,2732,275428,renounce,0,0.135688
user16,2733,275432,consider_degrad,0,0.577117
user16,2733,275432,degrad_space,0,0.577117
user16,2734,275432,consider_degrad,0,0.496199
@@ -65,7 +65,7 @@ user16,2734,275432,degrad_space,0,0.496199
user16,2735,275433,C_you_later,3600,0.267201
user16,2736,275433,consider_degrad,0,0.463088
user16,2736,275433,degrad_space,0,0.463088
-user16,2737,275433,renonce,0,0.106139
+user16,2737,275433,renounce,0,0.106139
user16,2738,275434,rigid,0,0.98452
user16,2739,275434,consider_degrad,0,0.583237
user16,2739,275434,degrad_space,0,0.583237
@@ -75,9 +75,9 @@ user16,2742,275436,consider_degrad,0,0.442059
user16,2742,275436,degrad_space,0,0.442059
user16,2743,275436,consider_reconfig,0,0.785635
user16,2743,275436,reconfig,0,0.785635
-user16,2744,275437,renonce,0,0.141352
+user16,2744,275437,renounce,0,0.141352
user16,2745,275437,C_you_later,3600,0.241071
-user16,2746,275437,renonce,0,0.0675767
+user16,2746,275437,renounce,0,0.0675767
user16,2747,275438,rigid,0,0.866066
user16,2748,275438,consider_degrad,0,0.443503
user16,2748,275438,degrad_space,0,0.443503
@@ -86,7 +86,7 @@ user16,2750,275439,C_you_later,3600,0.343643
user16,2751,275440,consider_degrad,0,0.466655
user16,2751,275440,degrad_space,0,0.466655
user16,2752,275440,rigid,0,0.990436
-user16,2753,275441,renonce,0,0.0804869
+user16,2753,275441,renounce,0,0.0804869
user16,2754,275441,consider_degrad,0,0.413796
user16,2754,275441,degrad_space,0,0.413796
user16,2755,275441,consider_reconfig,0,0.639744
@@ -95,9 +95,9 @@ user16,2756,275442,rigid,0,0.928467
user16,2757,275442,consider_reconfig,0,0.64474
user16,2757,275442,reconfig,0,0.64474
user16,2758,275443,C_you_later,3600,0.302387
-user16,2759,275443,renonce,0,0.177088
+user16,2759,275443,renounce,0,0.177088
user16,2760,275444,rigid,0,0.818494
-user16,2761,275444,renonce,0,0.11977
+user16,2761,275444,renounce,0,0.11977
user16,2762,275444,consider_reconfig,0,0.649121
user16,2762,275444,reconfig,0,0.649121
user16,2763,275445,C_you_later,3600,0.393593
@@ -125,7 +125,7 @@ user16,2778,275452,rigid,0,0.999955
user16,2779,275452,consider_reconfig,0,0.746004
user16,2779,275452,reconfig,0,0.746004
user16,2780,275452,C_you_later,3600,0.237923
-user16,2781,275453,renonce,0,0.159146
+user16,2781,275453,renounce,0,0.159146
user16,2782,275453,consider_degrad,0,0.541127
user16,2782,275453,degrad_space,0,0.541127
user16,2783,275454,consider_degrad,0,0.595112
@@ -157,7 +157,7 @@ user16,2797,275461,consider_reconfig,0,0.777486
user16,2797,275461,reconfig,0,0.777486
user16,2798,275461,consider_degrad,0,0.462789
user16,2798,275461,degrad_space,0,0.462789
-user16,2799,275462,renonce,0,0.0171438
+user16,2799,275462,renounce,0,0.0171438
user16,2800,275462,C_you_later,3600,0.338058
user16,2801,275463,rigid,0,0.988558
user16,2802,275463,rigid,0,0.809319
@@ -169,12 +169,12 @@ user16,2805,275464,C_you_later,3600,0.359146
user16,2806,275465,consider_reconfig,0,0.749274
user16,2806,275465,reconfig,0,0.749274
user16,2807,275465,C_you_later,3600,0.236698
-user16,2808,275466,renonce,0,0.0477589
+user16,2808,275466,renounce,0,0.0477589
user16,2809,275466,consider_degrad,0,0.588858
user16,2809,275466,degrad_space,0,0.588858
user16,2810,275467,consider_degrad,0,0.578408
user16,2810,275467,degrad_space,0,0.578408
-user16,2811,275467,renonce,0,0.0590839
+user16,2811,275467,renounce,0,0.0590839
user16,2812,275468,C_you_later,3600,0.207849
user16,2813,275468,C_you_later,3600,0.223403
user16,2814,275469,C_you_later,3600,0.225527
@@ -184,18 +184,18 @@ user16,2816,275470,C_you_later,3600,0.271591
user16,2817,275470,rigid,0,0.958074
user16,2818,275471,consider_degrad,0,0.417523
user16,2818,275471,degrad_space,0,0.417523
-user16,2819,275471,renonce,0,0.00981818
+user16,2819,275471,renounce,0,0.00981818
user16,2820,275472,rigid,0,0.878632
user16,2821,275472,consider_reconfig,0,0.730157
user16,2821,275472,reconfig,0,0.730157
user16,2822,275473,rigid,0,0.870748
user16,2823,275473,consider_degrad,0,0.55405
user16,2823,275473,degrad_space,0,0.55405
-user16,2824,275474,renonce,0,0.158729
+user16,2824,275474,renounce,0,0.158729
user16,2825,275474,consider_degrad,0,0.533805
user16,2825,275474,degrad_space,0,0.533805
-user16,2826,275475,renonce,0,0.0399664
-user16,2827,275475,renonce,0,0.061579
+user16,2826,275475,renounce,0,0.0399664
+user16,2827,275475,renounce,0,0.061579
user16,2828,275476,consider_degrad,0,0.5415
user16,2828,275476,degrad_space,0,0.5415
user16,2829,275476,consider_reconfig,0,0.631933
@@ -204,9 +204,9 @@ user16,2830,275477,consider_reconfig,0,0.726877
user16,2830,275477,reconfig,0,0.726877
user16,2831,275477,C_you_later,3600,0.351595
user16,2832,275478,rigid,0,0.952475
-user16,2833,275478,renonce,0,0.0118878
+user16,2833,275478,renounce,0,0.0118878
user16,2834,275479,rigid,0,0.822491
-user16,2835,275479,renonce,0,0.0978722
+user16,2835,275479,renounce,0,0.0978722
user16,2836,275480,consider_reconfig,0,0.788982
user16,2836,275480,reconfig,0,0.788982
user16,2837,275480,consider_degrad,0,0.416088
@@ -227,8 +227,8 @@ user16,2846,275484,C_you_later,3600,0.258837
user16,2847,275485,C_you_later,3600,0.366811
user16,2848,275485,consider_reconfig,0,0.64488
user16,2848,275485,reconfig,0,0.64488
-user16,2849,275486,renonce,0,0.158516
-user16,2850,275486,renonce,0,0.00597621
+user16,2849,275486,renounce,0,0.158516
+user16,2850,275486,renounce,0,0.00597621
user16,2851,275487,rigid,0,0.953036
user16,2852,275487,C_you_later,3600,0.219541
user16,2853,275488,consider_reconfig,0,0.77239
@@ -237,7 +237,7 @@ user16,2854,275488,consider_reconfig,0,0.726462
user16,2854,275488,reconfig,0,0.726462
user16,2855,275489,consider_reconfig,0,0.758446
user16,2855,275489,reconfig,0,0.758446
-user16,2856,275489,renonce,0,0.107712
+user16,2856,275489,renounce,0,0.107712
user16,2857,275489,consider_degrad,0,0.464768
user16,2857,275489,degrad_space,0,0.464768
user16,2858,275490,rigid,0,0.826189
@@ -259,12 +259,12 @@ user16,2868,275495,rigid,0,0.940981
user16,2869,275495,C_you_later,3600,0.337776
user16,2870,275496,consider_reconfig,0,0.704553
user16,2870,275496,reconfig,0,0.704553
-user16,2871,275496,renonce,0,0.080674
+user16,2871,275496,renounce,0,0.080674
user16,2872,275497,rigid,0,0.909056
-user16,2873,275497,renonce,0,0.191393
+user16,2873,275497,renounce,0,0.191393
user16,2874,275498,consider_reconfig,0,0.631069
user16,2874,275498,reconfig,0,0.631069
-user16,2875,275498,renonce,0,0.173349
+user16,2875,275498,renounce,0,0.173349
user16,2876,275499,consider_reconfig,0,0.691371
user16,2876,275499,reconfig,0,0.691371
user16,2877,275499,C_you_later,3600,0.39438
@@ -277,20 +277,20 @@ user16,2881,275501,degrad_space,0,0.502999
user16,2882,275502,C_you_later,3600,0.396799
user16,2883,275502,consider_reconfig,0,0.721995
user16,2883,275502,reconfig,0,0.721995
-user16,2884,275502,renonce,0,0.0986313
+user16,2884,275502,renounce,0,0.0986313
user16,2885,275503,consider_degrad,0,0.569129
user16,2885,275503,degrad_space,0,0.569129
-user16,2886,275503,renonce,0,0.161967
-user16,2887,275504,renonce,0,0.199255
+user16,2886,275503,renounce,0,0.161967
+user16,2887,275504,renounce,0,0.199255
user16,2888,275504,consider_reconfig,0,0.702178
user16,2888,275504,reconfig,0,0.702178
-user16,2889,275505,renonce,0,0.1828
-user16,2722,279012,renonce,0,0.0977483
+user16,2889,275505,renounce,0,0.1828
+user16,2722,279012,renounce,0,0.0977483
user16,2727,279014,consider_degrad,0,0.511478
user16,2727,279014,degrad_space,0,0.511478
user16,2728,279026,C_you_later,3600,0.238406
user16,2735,279033,C_you_later,3600,0.358279
-user16,2741,279035,renonce,0,0.162271
+user16,2741,279035,renounce,0,0.162271
user16,2745,279037,consider_reconfig,0,0.701717
user16,2745,279037,reconfig,0,0.701717
user16,2750,279039,rigid,0,0.810015
@@ -305,7 +305,7 @@ user16,2780,279052,consider_degrad,0,0.412763
user16,2780,279052,degrad_space,0,0.412763
user16,2785,279055,rigid,0,0.955189
user16,2787,279056,rigid,0,0.85806
-user16,2788,279056,renonce,0,0.139102
+user16,2788,279056,renounce,0,0.139102
user16,2800,279062,consider_degrad,0,0.530472
user16,2800,279062,degrad_space,0,0.530472
user16,2805,279064,C_you_later,3600,0.280967
@@ -320,7 +320,7 @@ user16,2831,279077,C_you_later,3600,0.249676
user16,2838,279081,consider_degrad,0,0.562334
user16,2838,279081,degrad_space,0,0.562334
user16,2842,279082,rigid,0,0.846102
-user16,2846,279084,renonce,0,0.0923938
+user16,2846,279084,renounce,0,0.0923938
user16,2847,279085,rigid,0,0.837137
user16,2852,279087,C_you_later,3600,0.29247
user16,2859,279090,C_you_later,3600,0.36497
@@ -336,11 +336,11 @@ user16,2882,279102,rigid,0,0.93982
user16,2728,282626,consider_degrad,0,0.488809
user16,2728,282626,degrad_space,0,0.488809
user16,2735,282633,rigid,0,0.896553
-user16,2763,282645,renonce,0,0.104075
+user16,2763,282645,renounce,0,0.104075
user16,2805,282664,C_you_later,3600,0.279385
user16,2812,282668,consider_degrad,0,0.498643
user16,2812,282668,degrad_space,0,0.498643
-user16,2813,282668,renonce,0,0.120019
+user16,2813,282668,renounce,0,0.120019
user16,2831,282677,consider_degrad,0,0.529784
user16,2831,282677,degrad_space,0,0.529784
user16,2852,282687,consider_degrad,0,0.466519
diff --git a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_1-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_1-2machines_user_stats_behaviors.csv
index 7d263ed..bdb72f5 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_1-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_1-2machines_user_stats_behaviors.csv
@@ -6,11 +6,11 @@ user18,1956,210993,consider_degrad,0,0.511997
user18,1956,210993,degrad_space,0,0.511997
user18,1962,211560,consider_reconfig,0,0.759578
user18,1962,211560,reconfig,0,0.759578
-user15,2427,243133,renonce,0,0.0894425
+user15,2427,243133,renounce,0,0.0894425
user15,2428,243374,rigid,0,0.84728
-user15,2442,244342,renonce,0,0.108429
+user15,2442,244342,renounce,0,0.108429
user15,2443,244436,C_you_later,3600,0.317551
-user15,2443,248036,renonce,0,0.123269
+user15,2443,248036,renounce,0,0.123269
user15,8596,730546,rigid,0,1
user15,8597,730546,rigid,0,1
user15,8598,730564,rigid,0,1
diff --git a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_2-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_2-2machines_user_stats_behaviors.csv
index 7f8849f..ae8557e 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_2-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_2-2machines_user_stats_behaviors.csv
@@ -8,37 +8,37 @@ user14,757,66895,degrad_time,0,0.25666
user14,758,66959,consider_degrad,0,0.0288913
user14,758,66959,degrad_time,0,0.0288913
user14,768,67537,C_you_later,3600,0.41498
-user14,781,67841,renonce,0,0.0138883
-user14,791,68068,renonce,0,0.245617
-user14,794,68149,renonce,0,0.0780841
+user14,781,67841,renounce,0,0.0138883
+user14,791,68068,renounce,0,0.245617
+user14,794,68149,renounce,0,0.0780841
user14,795,68533,C_you_later,3600,0.486066
user14,796,68771,rigid,0,0.842896
user14,797,68917,consider_degrad,0,0.550123
user14,797,68917,degrad_time,0,0.550123
-user14,798,69021,renonce,0,0.130532
+user14,798,69021,renounce,0,0.130532
user14,799,69132,consider_degrad,0,0.706138
user14,799,69132,degrad_time,0,0.706138
user14,800,69271,C_you_later,3600,0.392056
-user14,804,69496,renonce,0,0.103097
+user14,804,69496,renounce,0,0.103097
user14,808,69608,C_you_later,3600,0.496931
-user14,809,69841,renonce,0,0.0616779
+user14,809,69841,renounce,0,0.0616779
user14,768,71137,C_you_later,3600,0.385933
user14,795,72133,rigid,0,0.930913
-user14,800,72871,renonce,0,0.0570942
+user14,800,72871,renounce,0,0.0570942
user14,808,73208,C_you_later,3600,0.437103
user14,768,74737,rigid,0,0.835317
user14,808,76808,C_you_later,3600,0.431309
user14,808,80408,rigid,0,1
-user15,2427,243133,renonce,0,0.0894425
+user15,2427,243133,renounce,0,0.0894425
user15,2428,243374,rigid,0,0.84728
-user15,2442,244342,renonce,0,0.108429
+user15,2442,244342,renounce,0,0.108429
user15,2443,244436,C_you_later,3600,0.317551
-user15,2443,248036,renonce,0,0.123269
+user15,2443,248036,renounce,0,0.123269
user14,2527,253799,C_you_later,3600,0.289445
user14,2528,253947,C_you_later,3600,0.279545
user14,2529,254111,rigid,0,0.99172
user14,2530,254200,rigid,0,0.761117
-user14,2531,254280,renonce,0,0.175296
+user14,2531,254280,renounce,0,0.175296
user14,2532,254392,C_you_later,3600,0.305098
user14,2527,257399,C_you_later,3600,0.314136
user14,2528,257547,rigid,0,0.942189
diff --git a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_3-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_3-2machines_user_stats_behaviors.csv
index 7893bbe..f555bf5 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_3-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_3-2machines_user_stats_behaviors.csv
@@ -11,16 +11,16 @@ user14,781,67841,rigid,0,0.799089
user14,791,68068,rigid,0,0.683179
user14,794,68149,rigid,0,0.739145
user14,795,68533,C_you_later,3600,0.230062
-user14,796,68771,renonce,0,0.112769
+user14,796,68771,renounce,0,0.112769
user14,797,68917,rigid,0,0.736167
user14,798,69021,rigid,0,0.987897
user14,799,69132,rigid,0,0.58356
-user14,800,69271,renonce,0,0.0989069
+user14,800,69271,renounce,0,0.0989069
user14,804,69496,rigid,0,0.743174
user14,808,69608,consider_degrad,0,0.300052
user14,808,69608,degrad_time,0,0.300052
user14,809,69841,rigid,0,0.759523
-user14,795,72133,renonce,0,0.0835616
+user14,795,72133,renounce,0,0.0835616
user15,2427,243133,rigid,0,0.904953
user15,2428,243374,rigid,0,0.895299
user15,2442,244342,consider_reconfig,0,0.622052
diff --git a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_4-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_4-2machines_user_stats_behaviors.csv
index f51eb8b..b853ec9 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_4-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_4-2machines_user_stats_behaviors.csv
@@ -37,7 +37,7 @@ user9,6440,237077,reconfig,0,0.534493
user9,6450,237272,consider_reconfig,0,0.674231
user9,6450,237272,reconfig,0,0.674231
user9,6452,237292,rigid,0,0.811959
-user9,6455,237317,renonce,0,0.045389
+user9,6455,237317,renounce,0,0.045389
user10,6459,238285,rigid,0,0.840091
user5,6982,260575,consider_degrad,0,0.260721
user5,6982,260575,degrad_space,0,0.260721
diff --git a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_5-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_5-2machines_user_stats_behaviors.csv
index 556fede..eff3f36 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior_small_workload_5-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior_small_workload_5-2machines_user_stats_behaviors.csv
@@ -31,23 +31,23 @@ user9,3814,143342,rigid,0,1
user5,3913,147644,rigid,0,1
user5,5285,203790,C_you_later,3600,0.267694
user5,5287,204427,C_you_later,3600,0.385333
-user5,5285,207390,renonce,0,0.129945
-user5,5287,208027,renonce,0,0.15698
+user5,5285,207390,renounce,0,0.129945
+user5,5287,208027,renounce,0,0.15698
user5,5508,214322,rigid,0,0.992205
user9,6440,237077,C_you_later,3600,0.227669
-user9,6450,237272,renonce,0,0.177029
+user9,6450,237272,renounce,0,0.177029
user9,6452,237292,C_you_later,3600,0.319304
-user9,6455,237317,renonce,0,0.159675
+user9,6455,237317,renounce,0,0.159675
user10,6459,238285,rigid,0,0.906702
user9,6440,240677,C_you_later,3600,0.389584
user9,6452,240892,C_you_later,3600,0.37294
user9,6440,244277,consider_reconfig,0,0.621012
user9,6440,244277,reconfig,0,0.621012
-user9,6452,244492,renonce,0,0.151723
+user9,6452,244492,renounce,0,0.151723
user5,6982,260575,consider_degrad,0,0.408862
user5,6982,260575,degrad_space,0,0.408862
-user5,7126,270322,renonce,0,0.162816
-user9,7815,297615,renonce,0,0.156559
+user5,7126,270322,renounce,0,0.162816
+user9,7815,297615,renounce,0,0.156559
user9,8052,300159,rigid,0,1
user9,8061,300545,rigid,0,1
user9,8064,300653,rigid,0,1
@@ -103,7 +103,7 @@ user5,17059,564684,consider_reconfig,0,0.107948
user5,17059,564684,reconfig,0,0.107948
user10,18144,610219,rigid,0,0.854485
user10,18145,610225,rigid,0,0.913147
-user10,18146,610230,renonce,0,0.0705673
+user10,18146,610230,renounce,0,0.0705673
user10,18147,610233,C_you_later,3600,0.438264
user10,18147,613833,consider_degrad,0,0.518397
user10,18147,613833,degrad_time,0,0.518397
@@ -112,14 +112,14 @@ user9,19079,651303,C_you_later,3600,0.257369
user9,19080,651341,consider_degrad,0,0.552463
user9,19080,651341,degrad_space,0,0.552463
user9,19079,654903,C_you_later,3600,0.333218
-user9,19219,656683,renonce,0,0.136207
+user9,19219,656683,renounce,0,0.136207
user9,19079,658503,consider_degrad,0,0.469941
user9,19079,658503,degrad_space,0,0.469941
user5,19658,659716,consider_reconfig,0,0.685728
user5,19658,659716,reconfig,0,0.685728
-user5,19667,660880,renonce,0,0.0975397
+user5,19667,660880,renounce,0,0.0975397
user5,19705,662513,rigid,0,0.941595
-user10,20392,680437,renonce,0,0.146906
+user10,20392,680437,renounce,0,0.146906
user10,20393,680441,rigid,0,0.942716
user10,20394,680447,consider_degrad,0,0.592458
user10,20394,680447,degrad_time,0,0.592458
@@ -131,7 +131,7 @@ user5,20721,709353,consider_reconfig,0,0.638131
user5,20721,709353,reconfig,0,0.638131
user5,20896,713177,C_you_later,3600,0.350006
user5,20896,716777,C_you_later,3600,0.252271
-user5,20896,720377,renonce,0,0.101223
+user5,20896,720377,renounce,0,0.101223
user5,21451,739445,consider_degrad,0,0.569521
user5,21451,739445,degrad_space,0,0.569521
user5,21862,753768,rigid,0,0.923828
diff --git a/test/expected_behavior_log/dm_user_multi_behavior_yellow-2machines_user_stats_behaviors.csv b/test/expected_behavior_log/dm_user_multi_behavior_yellow-2machines_user_stats_behaviors.csv
index 798215e..e0b8bdc 100644
--- a/test/expected_behavior_log/dm_user_multi_behavior_yellow-2machines_user_stats_behaviors.csv
+++ b/test/expected_behavior_log/dm_user_multi_behavior_yellow-2machines_user_stats_behaviors.csv
@@ -28,7 +28,7 @@ user18,1962,211560,consider_degrad,0,0.559827
user18,1962,211560,degrad_space,0,0.559827
user15,2427,243133,C_you_later,3600,0.285366
user15,2428,243374,C_you_later,3600,0.395292
-user15,2442,244342,renonce,0,0.074995
+user15,2442,244342,renounce,0,0.074995
user15,2443,244436,consider_reconfig,0,0.799674
user15,2443,244436,reconfig,0,0.799674
user15,2427,246733,consider_degrad,0,0.534493
@@ -39,19 +39,19 @@ user14,2527,253799,rigid,0,0.882298
user14,2528,253947,rigid,0,0.93109
user14,2529,254111,rigid,0,0.853334
user14,2530,254200,C_you_later,3600,0.494202
-user14,2531,254280,renonce,0,0.021467
+user14,2531,254280,renounce,0,0.021467
user14,2532,254392,consider_degrad,0,0.718087
user14,2532,254392,degrad_time,0,0.718087
user14,2530,257800,C_you_later,3600,0.260721
user14,2530,261400,C_you_later,3600,0.380538
-user14,2530,265000,renonce,0,0.195591
+user14,2530,265000,renounce,0,0.195591
user16,2715,275408,consider_reconfig,0,0.742941
user16,2715,275408,reconfig,0,0.742941
user16,2716,275409,rigid,0,0.840091
user16,2717,275409,rigid,0,0.824655
user16,2718,275410,consider_degrad,0,0.482835
user16,2718,275410,degrad_space,0,0.482835
-user16,2719,275410,renonce,0,0.133428
+user16,2719,275410,renounce,0,0.133428
user16,2720,275411,C_you_later,3600,0.23451
user16,2721,275411,C_you_later,3600,0.20123
user16,2722,275412,rigid,0,0.837889
@@ -82,8 +82,8 @@ user16,2741,275435,C_you_later,3600,0.388753
user16,2742,275436,rigid,0,0.954869
user16,2743,275436,consider_degrad,0,0.519251
user16,2743,275436,degrad_space,0,0.519251
-user16,2744,275437,renonce,0,0.0292595
-user16,2745,275437,renonce,0,0.155539
+user16,2744,275437,renounce,0,0.0292595
+user16,2745,275437,renounce,0,0.155539
user16,2746,275437,consider_degrad,0,0.534723
user16,2746,275437,degrad_space,0,0.534723
user16,2747,275438,consider_reconfig,0,0.74792
@@ -94,15 +94,15 @@ user16,2749,275439,consider_reconfig,0,0.741951
user16,2749,275439,reconfig,0,0.741951
user16,2750,275439,consider_reconfig,0,0.659328
user16,2750,275439,reconfig,0,0.659328
-user16,2751,275440,renonce,0,0.110871
+user16,2751,275440,renounce,0,0.110871
user16,2752,275440,consider_reconfig,0,0.68834
user16,2752,275440,reconfig,0,0.68834
-user16,2753,275441,renonce,0,0.169838
+user16,2753,275441,renounce,0,0.169838
user16,2754,275441,rigid,0,0.912021
user16,2755,275441,consider_reconfig,0,0.728829
user16,2755,275441,reconfig,0,0.728829
user16,2756,275442,rigid,0,0.959548
-user16,2757,275442,renonce,0,0.140562
+user16,2757,275442,renounce,0,0.140562
user16,2758,275443,consider_degrad,0,0.599913
user16,2758,275443,degrad_space,0,0.599913
user16,2759,275443,consider_reconfig,0,0.638889
@@ -110,24 +110,24 @@ user16,2759,275443,reconfig,0,0.638889
user16,2760,275444,consider_reconfig,0,0.600063
user16,2760,275444,reconfig,0,0.600063
user16,2761,275444,C_you_later,3600,0.384002
-user16,2762,275444,renonce,0,0.0828849
+user16,2762,275444,renounce,0,0.0828849
user16,2763,275445,consider_reconfig,0,0.617145
user16,2763,275445,reconfig,0,0.617145
user16,2764,275445,C_you_later,3600,0.337533
user16,2765,275446,consider_degrad,0,0.599689
user16,2765,275446,degrad_space,0,0.599689
-user16,2766,275446,renonce,0,0.149572
-user16,2767,275447,renonce,0,0.163218
-user16,2768,275447,renonce,0,0.0129244
+user16,2766,275446,renounce,0,0.149572
+user16,2767,275447,renounce,0,0.163218
+user16,2768,275447,renounce,0,0.0129244
user16,2769,275448,consider_degrad,0,0.47462
user16,2769,275448,degrad_space,0,0.47462
user16,2770,275448,consider_reconfig,0,0.694081
user16,2770,275448,reconfig,0,0.694081
-user16,2771,275448,renonce,0,0.0391181
+user16,2771,275448,renounce,0,0.0391181
user16,2772,275449,C_you_later,3600,0.288102
user16,2773,275449,consider_reconfig,0,0.76168
user16,2773,275449,reconfig,0,0.76168
-user16,2774,275450,renonce,0,0.108574
+user16,2774,275450,renounce,0,0.108574
user16,2775,275450,consider_reconfig,0,0.64935
user16,2775,275450,reconfig,0,0.64935
user16,2776,275451,C_you_later,3600,0.38313
@@ -144,7 +144,7 @@ user16,2782,275453,consider_degrad,0,0.416936
user16,2782,275453,degrad_space,0,0.416936
user16,2783,275454,consider_reconfig,0,0.68102
user16,2783,275454,reconfig,0,0.68102
-user16,2784,275454,renonce,0,0.091663
+user16,2784,275454,renounce,0,0.091663
user16,2785,275455,C_you_later,3600,0.394004
user16,2786,275455,C_you_later,3600,0.375983
user16,2787,275456,consider_reconfig,0,0.605077
@@ -154,14 +154,14 @@ user16,2788,275456,degrad_space,0,0.540243
user16,2789,275457,rigid,0,0.92988
user16,2790,275457,C_you_later,3600,0.357546
user16,2791,275458,C_you_later,3600,0.34851
-user16,2792,275458,renonce,0,0.0640625
+user16,2792,275458,renounce,0,0.0640625
user16,2793,275459,consider_degrad,0,0.559243
user16,2793,275459,degrad_space,0,0.559243
user16,2794,275459,C_you_later,3600,0.26331
user16,2795,275460,C_you_later,3600,0.392715
user16,2796,275460,rigid,0,0.839346
user16,2797,275461,C_you_later,3600,0.32064
-user16,2798,275461,renonce,0,0.0979942
+user16,2798,275461,renounce,0,0.0979942
user16,2799,275462,consider_degrad,0,0.455829
user16,2799,275462,degrad_space,0,0.455829
user16,2800,275462,rigid,0,0.921951
@@ -186,32 +186,32 @@ user16,2811,275467,consider_degrad,0,0.554074
user16,2811,275467,degrad_space,0,0.554074
user16,2812,275468,consider_degrad,0,0.522933
user16,2812,275468,degrad_space,0,0.522933
-user16,2813,275468,renonce,0,0.0905024
+user16,2813,275468,renounce,0,0.0905024
user16,2814,275469,consider_degrad,0,0.454311
user16,2814,275469,degrad_space,0,0.454311
user16,2815,275469,rigid,0,0.975938
user16,2816,275470,consider_reconfig,0,0.633342
user16,2816,275470,reconfig,0,0.633342
-user16,2817,275470,renonce,0,0.140513
+user16,2817,275470,renounce,0,0.140513
user16,2818,275471,C_you_later,3600,0.354161
user16,2819,275471,consider_degrad,0,0.531982
user16,2819,275471,degrad_space,0,0.531982
user16,2820,275472,rigid,0,0.915214
-user16,2821,275472,renonce,0,0.0442256
-user16,2822,275473,renonce,0,0.00286643
+user16,2821,275472,renounce,0,0.0442256
+user16,2822,275473,renounce,0,0.00286643
user16,2823,275473,rigid,0,0.951767
user16,2824,275474,consider_degrad,0,0.509208
user16,2824,275474,degrad_space,0,0.509208
user16,2825,275474,consider_reconfig,0,0.680193
user16,2825,275474,reconfig,0,0.680193
user16,2826,275475,C_you_later,3600,0.316073
-user16,2827,275475,renonce,0,0.0833477
+user16,2827,275475,renounce,0,0.0833477
user16,2828,275476,consider_degrad,0,0.553931
user16,2828,275476,degrad_space,0,0.553931
user16,2829,275476,C_you_later,3600,0.303228
-user16,2830,275477,renonce,0,0.0881491
-user16,2831,275477,renonce,0,0.198472
-user16,2832,275478,renonce,0,0.127031
+user16,2830,275477,renounce,0,0.0881491
+user16,2831,275477,renounce,0,0.198472
+user16,2832,275478,renounce,0,0.127031
user16,2833,275478,rigid,0,0.81944
user16,2834,275479,C_you_later,3600,0.249066
user16,2835,275479,consider_reconfig,0,0.795011
@@ -239,8 +239,8 @@ user16,2849,275486,consider_reconfig,0,0.69254
user16,2849,275486,reconfig,0,0.69254
user16,2850,275486,consider_degrad,0,0.573108
user16,2850,275486,degrad_space,0,0.573108
-user16,2851,275487,renonce,0,0.0222647
-user16,2852,275487,renonce,0,0.19307
+user16,2851,275487,renounce,0,0.0222647
+user16,2852,275487,renounce,0,0.19307
user16,2853,275488,rigid,0,0.904314
user16,2854,275488,C_you_later,3600,0.333303
user16,2855,275489,consider_reconfig,0,0.725414
@@ -249,7 +249,7 @@ user16,2856,275489,consider_reconfig,0,0.628338
user16,2856,275489,reconfig,0,0.628338
user16,2857,275489,consider_degrad,0,0.469097
user16,2857,275489,degrad_space,0,0.469097
-user16,2858,275490,renonce,0,0.120403
+user16,2858,275490,renounce,0,0.120403
user16,2859,275490,consider_reconfig,0,0.723323
user16,2859,275490,reconfig,0,0.723323
user16,2860,275491,rigid,0,0.960732
@@ -269,23 +269,23 @@ user16,2870,275496,consider_degrad,0,0.407904
user16,2870,275496,degrad_space,0,0.407904
user16,2871,275496,consider_degrad,0,0.525475
user16,2871,275496,degrad_space,0,0.525475
-user16,2872,275497,renonce,0,0.199425
-user16,2873,275497,renonce,0,0.186333
+user16,2872,275497,renounce,0,0.199425
+user16,2873,275497,renounce,0,0.186333
user16,2874,275498,consider_degrad,0,0.443944
user16,2874,275498,degrad_space,0,0.443944
-user16,2875,275498,renonce,0,0.142623
+user16,2875,275498,renounce,0,0.142623
user16,2876,275499,rigid,0,0.877451
-user16,2877,275499,renonce,0,0.178449
+user16,2877,275499,renounce,0,0.178449
user16,2878,275500,rigid,0,0.874408
user16,2879,275500,consider_degrad,0,0.493441
user16,2879,275500,degrad_space,0,0.493441
-user16,2880,275501,renonce,0,0.0672286
+user16,2880,275501,renounce,0,0.0672286
user16,2881,275501,consider_reconfig,0,0.744897
user16,2881,275501,reconfig,0,0.744897
user16,2882,275502,rigid,0,0.849281
user16,2883,275502,rigid,0,0.800097
user16,2884,275502,C_you_later,3600,0.37093
-user16,2885,275503,renonce,0,0.0351865
+user16,2885,275503,renounce,0,0.0351865
user16,2886,275503,consider_reconfig,0,0.767878
user16,2886,275503,reconfig,0,0.767878
user16,2887,275504,consider_reconfig,0,0.612561
@@ -296,13 +296,13 @@ user16,2889,275505,consider_degrad,0,0.480259
user16,2889,275505,degrad_space,0,0.480259
user16,2720,279011,rigid,0,0.84135
user16,2721,279011,C_you_later,3600,0.249404
-user16,2733,279032,renonce,0,0.143776
+user16,2733,279032,renounce,0,0.143776
user16,2734,279032,consider_degrad,0,0.53988
user16,2734,279032,degrad_space,0,0.53988
user16,2735,279033,C_you_later,3600,0.386181
user16,2741,279035,consider_degrad,0,0.533453
user16,2741,279035,degrad_space,0,0.533453
-user16,2761,279044,renonce,0,0.11226
+user16,2761,279044,renounce,0,0.11226
user16,2764,279045,rigid,0,0.815523
user16,2772,279049,consider_reconfig,0,0.761718
user16,2772,279049,reconfig,0,0.761718
@@ -313,7 +313,7 @@ user16,2786,279055,consider_reconfig,0,0.774363
user16,2786,279055,reconfig,0,0.774363
user16,2790,279057,consider_reconfig,0,0.651404
user16,2790,279057,reconfig,0,0.651404
-user16,2791,279058,renonce,0,0.00543784
+user16,2791,279058,renounce,0,0.00543784
user16,2794,279059,consider_degrad,0,0.482447
user16,2794,279059,degrad_space,0,0.482447
user16,2795,279060,C_you_later,3600,0.394128
@@ -321,11 +321,11 @@ user16,2797,279061,rigid,0,0.86059
user16,2804,279064,consider_reconfig,0,0.695051
user16,2804,279064,reconfig,0,0.695051
user16,2818,279071,rigid,0,0.808457
-user16,2826,279075,renonce,0,0.0276671
+user16,2826,279075,renounce,0,0.0276671
user16,2829,279076,C_you_later,3600,0.316985
user16,2834,279079,consider_reconfig,0,0.661585
user16,2834,279079,reconfig,0,0.661585
-user16,2841,279082,renonce,0,0.0172624
+user16,2841,279082,renounce,0,0.0172624
user16,2854,279088,consider_degrad,0,0.405974
user16,2854,279088,degrad_space,0,0.405974
user16,2861,279091,consider_reconfig,0,0.655929
diff --git a/test/expected_log/dm_user_renonce-2machines_jobs.csv b/test/expected_log/dm_user_renounce-2machines_jobs.csv
similarity index 100%
rename from test/expected_log/dm_user_renonce-2machines_jobs.csv
rename to test/expected_log/dm_user_renounce-2machines_jobs.csv
diff --git a/test/schedconf/dm_user_multi_behavior.json b/test/schedconf/dm_user_multi_behavior.json
index b763895..c1c9b84 100644
--- a/test/schedconf/dm_user_multi_behavior.json
+++ b/test/schedconf/dm_user_multi_behavior.json
@@ -12,12 +12,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -36,12 +36,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -60,12 +60,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -84,12 +84,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_many_windows.json b/test/schedconf/dm_user_multi_behavior_many_windows.json
index bcacb0e..71c1c21 100644
--- a/test/schedconf/dm_user_multi_behavior_many_windows.json
+++ b/test/schedconf/dm_user_multi_behavior_many_windows.json
@@ -30,12 +30,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -54,12 +54,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -78,12 +78,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -102,12 +102,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_many_windows_wrong.json b/test/schedconf/dm_user_multi_behavior_many_windows_wrong.json
index 1507cd8..8e69f56 100644
--- a/test/schedconf/dm_user_multi_behavior_many_windows_wrong.json
+++ b/test/schedconf/dm_user_multi_behavior_many_windows_wrong.json
@@ -20,12 +20,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -44,12 +44,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -68,12 +68,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -92,12 +92,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_many_windows_wrong_order.json b/test/schedconf/dm_user_multi_behavior_many_windows_wrong_order.json
index 2f201b9..fab2c2a 100644
--- a/test/schedconf/dm_user_multi_behavior_many_windows_wrong_order.json
+++ b/test/schedconf/dm_user_multi_behavior_many_windows_wrong_order.json
@@ -26,12 +26,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -50,12 +50,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -74,12 +74,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -98,12 +98,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_small_workload_1.json b/test/schedconf/dm_user_multi_behavior_small_workload_1.json
index 480c478..f48c8ab 100644
--- a/test/schedconf/dm_user_multi_behavior_small_workload_1.json
+++ b/test/schedconf/dm_user_multi_behavior_small_workload_1.json
@@ -12,12 +12,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -36,12 +36,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_small_workload_2.json b/test/schedconf/dm_user_multi_behavior_small_workload_2.json
index 44a2c22..f5caa0e 100644
--- a/test/schedconf/dm_user_multi_behavior_small_workload_2.json
+++ b/test/schedconf/dm_user_multi_behavior_small_workload_2.json
@@ -13,12 +13,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -37,12 +37,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_small_workload_3.json b/test/schedconf/dm_user_multi_behavior_small_workload_3.json
index c01a836..9555a36 100644
--- a/test/schedconf/dm_user_multi_behavior_small_workload_3.json
+++ b/test/schedconf/dm_user_multi_behavior_small_workload_3.json
@@ -14,13 +14,13 @@
"red_prob_rigid_multi_core" : 4.0,
"red_prob_degrad_multi_core" : 1.0,
"red_prob_reconfig_multi_core" : 1.0,
- "red_prob_renonce_multi_core" : 1.0,
+ "red_prob_renounce_multi_core" : 1.0,
"red_prob_see_you_later_multi_core": 1.0,
"red_prob_rigid_mono_core" : 4.0,
"red_prob_degrad_mono_core" : 1.0,
"red_prob_reconfig_mono_core" : 1.0,
- "red_prob_renonce_mono_core" : 1.0,
+ "red_prob_renounce_mono_core" : 1.0,
"red_prob_see_you_later_mono_core": 1.0,
"yellow_prob_degrad_multi_core" : 0.25,
@@ -39,12 +39,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_small_workload_4.json b/test/schedconf/dm_user_multi_behavior_small_workload_4.json
index f75dd46..c505f2a 100644
--- a/test/schedconf/dm_user_multi_behavior_small_workload_4.json
+++ b/test/schedconf/dm_user_multi_behavior_small_workload_4.json
@@ -13,12 +13,12 @@
"red_prob_rigid_multi_core" : 0.25,
"red_prob_degrad_multi_core" : 0.25,
"red_prob_reconfig_multi_core" : 0.25,
- "red_prob_renonce_multi_core" : 0.0,
+ "red_prob_renounce_multi_core" : 0.0,
"red_prob_see_you_later_multi_core": 0.25,
"red_prob_rigid_mono_core" : 0.3,
"red_prob_degrad_mono_core" : 0.3,
- "red_prob_renonce_mono_core" : 0.0,
+ "red_prob_renounce_mono_core" : 0.0,
"red_prob_see_you_later_mono_core": 0.3,
"yellow_prob_degrad_multi_core" : 0.0,
@@ -37,12 +37,12 @@
"red_prob_rigid_multi_core" : 0.25,
"red_prob_degrad_multi_core" : 0.25,
"red_prob_reconfig_multi_core" : 0.25,
- "red_prob_renonce_multi_core" : 0.25,
+ "red_prob_renounce_multi_core" : 0.25,
"red_prob_see_you_later_multi_core": 0.0,
"red_prob_rigid_mono_core" : 0.3,
"red_prob_degrad_mono_core" : 0.3,
- "red_prob_renonce_mono_core" : 0.3,
+ "red_prob_renounce_mono_core" : 0.3,
"red_prob_see_you_later_mono_core": 0.0,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -61,12 +61,12 @@
"red_prob_rigid_multi_core" : 1.0,
"red_prob_degrad_multi_core" : 0.0,
"red_prob_reconfig_multi_core" : 0.5,
- "red_prob_renonce_multi_core" : 0.0,
+ "red_prob_renounce_multi_core" : 0.0,
"red_prob_see_you_later_multi_core": 0.5,
"red_prob_rigid_mono_core" : 0.6,
"red_prob_degrad_mono_core" : 0.0,
- "red_prob_renonce_mono_core" : 0.0,
+ "red_prob_renounce_mono_core" : 0.0,
"red_prob_see_you_later_mono_core": 0.3,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_small_workload_5.json b/test/schedconf/dm_user_multi_behavior_small_workload_5.json
index ed776ed..81751b9 100644
--- a/test/schedconf/dm_user_multi_behavior_small_workload_5.json
+++ b/test/schedconf/dm_user_multi_behavior_small_workload_5.json
@@ -13,12 +13,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -37,12 +37,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -61,12 +61,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_multi_behavior_yellow.json b/test/schedconf/dm_user_multi_behavior_yellow.json
index e2c4f90..cc53ccf 100644
--- a/test/schedconf/dm_user_multi_behavior_yellow.json
+++ b/test/schedconf/dm_user_multi_behavior_yellow.json
@@ -13,12 +13,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -37,12 +37,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -61,12 +61,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
@@ -85,12 +85,12 @@
"red_prob_rigid_multi_core" : 0.2,
"red_prob_degrad_multi_core" : 0.2,
"red_prob_reconfig_multi_core" : 0.2,
- "red_prob_renonce_multi_core" : 0.2,
+ "red_prob_renounce_multi_core" : 0.2,
"red_prob_see_you_later_multi_core": 0.2,
"red_prob_rigid_mono_core" : 0.25,
"red_prob_degrad_mono_core" : 0.25,
- "red_prob_renonce_mono_core" : 0.25,
+ "red_prob_renounce_mono_core" : 0.25,
"red_prob_see_you_later_mono_core": 0.25,
"yellow_prob_degrad_multi_core" : 0.3,
diff --git a/test/schedconf/dm_user_renonce.json b/test/schedconf/dm_user_renounce.json
similarity index 78%
rename from test/schedconf/dm_user_renonce.json
rename to test/schedconf/dm_user_renounce.json
index c5ba80e..4c1db0c 100644
--- a/test/schedconf/dm_user_renonce.json
+++ b/test/schedconf/dm_user_renounce.json
@@ -3,28 +3,28 @@
"users": [
{
"name": "user14",
- "category": "dm_user_renonce",
+ "category": "dm_user_renounce",
"param": {
"input_json": "test/workloads/dyn/user14.json"
}
},
{
"name": "user15",
- "category": "dm_user_renonce",
+ "category": "dm_user_renounce",
"param": {
"input_json": "test/workloads/dyn/user15.json"
}
},
{
"name": "user16",
- "category": "dm_user_renonce",
+ "category": "dm_user_renounce",
"param": {
"input_json": "test/workloads/dyn/user16.json"
}
},
{
"name": "user18",
- "category": "dm_user_renonce",
+ "category": "dm_user_renounce",
"param": {
"input_json": "test/workloads/dyn/user18.json"
}
diff --git a/test/test_assertion_error.py b/test/test_assertion_error.py
index 8005c48..cd3bcac 100644
--- a/test/test_assertion_error.py
+++ b/test/test_assertion_error.py
@@ -92,9 +92,9 @@ def test_empty_yellow_window(platform_multiC):
def test_invalid_red_prob(platform_multiC):
invalid_probas = [[], [("red_prob_reconfig", 0.0)], [("red_prob_degrad", 0.0)], [("red_prob_rigid", 0.0)],
- [("red_prob_see_you_later", 0.0)], [("red_prob_renonce", 0.0)],
+ [("red_prob_see_you_later", 0.0)], [("red_prob_renounce", 0.0)],
[("red_prob_reconfig", 0.0), ("red_prob_degrad", 0.0), ("red_prob_rigid", 0.0),
- ("red_prob_renonce", 0.0), ("red_prob_see_you_later", 0.0)]]
+ ("red_prob_renounce", 0.0), ("red_prob_see_you_later", 0.0)]]
i = 0
for probas in invalid_probas:
make_error_file(3, red_windows=[[0, 1]], probas=probas)
@@ -150,7 +150,7 @@ def test_error_intersection_red_yellow(platform_multiC):
def test_deprecated_option(platform_multiC):
invalid_probas = [ [("yellow_prob_reconfig", 1.0)], [("yellow_prob_degrad", 1.0)], [("yellow_prob_rigid", 1.0)],
[("red_prob_reconfig", 1.0)], [("red_prob_degrad", 1.0)], [("red_prob_rigid", 1.0)],[("red_prob_see_you_later",1.0)],
- [("red_prob_renonce",1.0)]]
+ [("red_prob_renounce",1.0)]]
i = 0
for probas in invalid_probas:
make_error_file(3, yellow_windows=[[0, 1]], probas=probas)
diff --git a/test/test_dm_users.py b/test/test_dm_users.py
index 4a6c89e..6b6297c 100644
--- a/test/test_dm_users.py
+++ b/test/test_dm_users.py
@@ -10,7 +10,7 @@ users = [
"dm_user_reconfig",
"dm_user_degrad_space",
"dm_user_degrad_temp",
- "dm_user_renonce",
+ "dm_user_renounce",
"dm_user_delay",
"dm_user_multi_behavior",
"dm_user_multi_behavior_yellow",
@@ -24,9 +24,9 @@ def test_dm_user_delay(platform_multiC):
out_dir = run_user("dm_user_delay", platform_multiC)
assert_exec_time_equals_profile(out_dir)
-def test_dm_user_renonce(platform_multiC):
- """ Test user_class dm_user_renonce as described in the file schedconf/dm_user_renonce"""
- out_dir = run_user("dm_user_renonce", platform_multiC)
+def test_dm_user_renounce(platform_multiC):
+ """ Test user_class dm_user_renounce as described in the file schedconf/dm_user_renounce"""
+ out_dir = run_user("dm_user_renounce", platform_multiC)
assert_exec_time_equals_profile(out_dir)
def test_dm_user_reconfig(platform_multiC):
diff --git a/test/test_multi_behavior.py b/test/test_multi_behavior.py
index b2cfa3a..7661eff 100644
--- a/test/test_multi_behavior.py
+++ b/test/test_multi_behavior.py
@@ -85,7 +85,7 @@ def test_dm_user_multi_behavior_C_you_later_only(platform_multiC):
def test_dm_user_multi_behavior_mono_behavior_red(platform_multiC):
""" Test users that only do one behavior in red_window"""
- proba_names = ["red_prob_degrad", "red_prob_rigid", "red_prob_reconfig", "red_prob_renonce"]
+ proba_names = ["red_prob_degrad", "red_prob_rigid", "red_prob_reconfig", "red_prob_renounce"]
names = ["user" + str(i + 14) for i in range(3)] + ["user18"]
input_json = ["test/workloads/dyn/user" + str(i + 14) + ".json" for i in range(3)] + [
"test/workloads/dyn/user18.json"]
--
GitLab