From 15ebe773ab4f64ec0ecbaea7b5dffea80251d9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Mon, 30 Oct 2023 11:36:01 +0100
Subject: [PATCH] refac: rename degrad -> degrad_space, #18

---
 src/users/broker.cpp                          |  12 +-
 src/users/response_behaviors.cpp              |   4 +-
 src/users/user_windows.cpp                    |   2 +-
 ...ehavior-2machines_user_stats_behaviors.csv | 106 ++++----
 ...kload_1-2machines_user_stats_behaviors.csv |   2 +-
 ...kload_4-2machines_user_stats_behaviors.csv |   8 +-
 ...kload_5-2machines_user_stats_behaviors.csv |  20 +-
 ..._yellow-2machines_user_stats_behaviors.csv | 232 +++++++++---------
 8 files changed, 198 insertions(+), 188 deletions(-)

diff --git a/src/users/broker.cpp b/src/users/broker.cpp
index bf9b3d3..a557f75 100644
--- a/src/users/broker.cpp
+++ b/src/users/broker.cpp
@@ -141,7 +141,8 @@ 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_delay")
+                || category == "dm_user_renonce"
+                || category == "dm_user_delay")
             {
                 PPK_ASSERT_ERROR(dm_window != nullptr,
                     "User %s is a demand response user. The field 'dm_window' "
@@ -177,6 +178,15 @@ Broker::Broker(rapidjson::Document *user_description_file)
                 user = new DMUserMultiBehavior(name, param, seed_generator(),
                     state_automata, logger_user_stat);
             }
+            else if (category == "dm_user_degrad")
+            {
+                PPK_ASSERT_ERROR(false,
+                    "Invalid user_description file: dm_user_degrad has been "
+                    "removed since October 2023. Consider using "
+                    "dm_user_degrad_time or dm_user_degrad_space.");
+                user = nullptr;
+            }
+
             /* Feedback user */
             else if (category == "fb_user_think_time_only")
                 user = new FBUserThinkTimeOnly(name, param);
diff --git a/src/users/response_behaviors.cpp b/src/users/response_behaviors.cpp
index 25df3cc..e3544e7 100644
--- a/src/users/response_behaviors.cpp
+++ b/src/users/response_behaviors.cpp
@@ -85,9 +85,9 @@ bool degrad_space_job(shared_ptr<Job> &job, Profile *profile, ReplayUser *user,
     /* Log... */
     user->dm_stat[2 * DEGRADED]++;
     user->dm_stat[2 * DEGRADED + 1] += orig_nb_core * std::stol(job->profile);
-    user->log_behavior(job, "degrad", 0, random_number);
+    user->log_behavior(job, "degrad_space", 0, random_number);
 
-    /* Spatial degradiation: divide by two rounded up the nb or
+    /* Spatial degradation: divide by two rounded up the nb or
      * cores requested, and keep the original duration */
     job->nb_requested_resources = (orig_nb_core + 1) / 2;
     Parser::profile_from_duration(profile, job->profile, user->user_name);
diff --git a/src/users/user_windows.cpp b/src/users/user_windows.cpp
index 9f26d8b..34c46ac 100644
--- a/src/users/user_windows.cpp
+++ b/src/users/user_windows.cpp
@@ -383,7 +383,7 @@ bool DMUserMultiBehavior::handle_job(
     if (state_automata->is_in_yellow_state(date))
     {
         /*
-         * We decide at random the behavior (rigid,degrad, reconfig)
+         * We decide at random the behavior (rigid, degrad, reconfig)
          * that will be done on this job
          */
         return yellow_window_behavior(job, 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 bd1b1e8..b6700e0 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
@@ -55,24 +55,24 @@ 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,2730,275427,consider_degrad,0,0.501635
-user16,2730,275427,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,2733,275432,consider_degrad,0,0.577117
-user16,2733,275432,degrad,0,0.577117
+user16,2733,275432,degrad_space,0,0.577117
 user16,2734,275432,consider_degrad,0,0.496199
-user16,2734,275432,degrad,0,0.496199
+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,0,0.463088
+user16,2736,275433,degrad_space,0,0.463088
 user16,2737,275433,renonce,0,0.106139
 user16,2738,275434,rigid,0,0.98452
 user16,2739,275434,consider_degrad,0,0.583237
-user16,2739,275434,degrad,0,0.583237
+user16,2739,275434,degrad_space,0,0.583237
 user16,2740,275435,rigid,0,0.91471
 user16,2741,275435,C_you_later,3600,0.339153
 user16,2742,275436,consider_degrad,0,0.442059
-user16,2742,275436,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
@@ -80,15 +80,15 @@ user16,2745,275437,C_you_later,3600,0.241071
 user16,2746,275437,renonce,0,0.0675767
 user16,2747,275438,rigid,0,0.866066
 user16,2748,275438,consider_degrad,0,0.443503
-user16,2748,275438,degrad,0,0.443503
+user16,2748,275438,degrad_space,0,0.443503
 user16,2749,275439,rigid,0,0.921351
 user16,2750,275439,C_you_later,3600,0.343643
 user16,2751,275440,consider_degrad,0,0.466655
-user16,2751,275440,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,2754,275441,consider_degrad,0,0.413796
-user16,2754,275441,degrad,0,0.413796
+user16,2754,275441,degrad_space,0,0.413796
 user16,2755,275441,consider_reconfig,0,0.639744
 user16,2755,275441,reconfig,0,0.639744
 user16,2756,275442,rigid,0,0.928467
@@ -102,7 +102,7 @@ user16,2762,275444,consider_reconfig,0,0.649121
 user16,2762,275444,reconfig,0,0.649121
 user16,2763,275445,C_you_later,3600,0.393593
 user16,2764,275445,consider_degrad,0,0.558934
-user16,2764,275445,degrad,0,0.558934
+user16,2764,275445,degrad_space,0,0.558934
 user16,2765,275446,consider_reconfig,0,0.798084
 user16,2765,275446,reconfig,0,0.798084
 user16,2766,275446,consider_reconfig,0,0.786247
@@ -110,11 +110,11 @@ user16,2766,275446,reconfig,0,0.786247
 user16,2767,275447,C_you_later,3600,0.348094
 user16,2768,275447,rigid,0,0.983717
 user16,2769,275448,consider_degrad,0,0.51687
-user16,2769,275448,degrad,0,0.51687
+user16,2769,275448,degrad_space,0,0.51687
 user16,2770,275448,C_you_later,3600,0.365187
 user16,2771,275448,C_you_later,3600,0.267037
 user16,2772,275449,consider_degrad,0,0.577011
-user16,2772,275449,degrad,0,0.577011
+user16,2772,275449,degrad_space,0,0.577011
 user16,2773,275449,rigid,0,0.903956
 user16,2774,275450,consider_reconfig,0,0.685295
 user16,2774,275450,reconfig,0,0.685295
@@ -127,42 +127,42 @@ user16,2779,275452,reconfig,0,0.746004
 user16,2780,275452,C_you_later,3600,0.237923
 user16,2781,275453,renonce,0,0.159146
 user16,2782,275453,consider_degrad,0,0.541127
-user16,2782,275453,degrad,0,0.541127
+user16,2782,275453,degrad_space,0,0.541127
 user16,2783,275454,consider_degrad,0,0.595112
-user16,2783,275454,degrad,0,0.595112
+user16,2783,275454,degrad_space,0,0.595112
 user16,2784,275454,consider_reconfig,0,0.668577
 user16,2784,275454,reconfig,0,0.668577
 user16,2785,275455,C_you_later,3600,0.315573
 user16,2786,275455,consider_degrad,0,0.422362
-user16,2786,275455,degrad,0,0.422362
+user16,2786,275455,degrad_space,0,0.422362
 user16,2787,275456,C_you_later,3600,0.233387
 user16,2788,275456,C_you_later,3600,0.201146
 user16,2789,275457,consider_degrad,0,0.439931
-user16,2789,275457,degrad,0,0.439931
+user16,2789,275457,degrad_space,0,0.439931
 user16,2790,275457,consider_reconfig,0,0.709291
 user16,2790,275457,reconfig,0,0.709291
 user16,2791,275458,consider_degrad,0,0.43008
-user16,2791,275458,degrad,0,0.43008
+user16,2791,275458,degrad_space,0,0.43008
 user16,2792,275458,consider_degrad,0,0.531534
-user16,2792,275458,degrad,0,0.531534
+user16,2792,275458,degrad_space,0,0.531534
 user16,2793,275459,consider_degrad,0,0.409772
-user16,2793,275459,degrad,0,0.409772
+user16,2793,275459,degrad_space,0,0.409772
 user16,2794,275459,consider_degrad,0,0.419066
-user16,2794,275459,degrad,0,0.419066
+user16,2794,275459,degrad_space,0,0.419066
 user16,2795,275460,consider_degrad,0,0.506794
-user16,2795,275460,degrad,0,0.506794
+user16,2795,275460,degrad_space,0,0.506794
 user16,2796,275460,consider_degrad,0,0.53475
-user16,2796,275460,degrad,0,0.53475
+user16,2796,275460,degrad_space,0,0.53475
 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,0,0.462789
+user16,2798,275461,degrad_space,0,0.462789
 user16,2799,275462,renonce,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
 user16,2803,275464,consider_degrad,0,0.520246
-user16,2803,275464,degrad,0,0.520246
+user16,2803,275464,degrad_space,0,0.520246
 user16,2804,275464,consider_reconfig,0,0.773915
 user16,2804,275464,reconfig,0,0.773915
 user16,2805,275464,C_you_later,3600,0.359146
@@ -171,33 +171,33 @@ user16,2806,275465,reconfig,0,0.749274
 user16,2807,275465,C_you_later,3600,0.236698
 user16,2808,275466,renonce,0,0.0477589
 user16,2809,275466,consider_degrad,0,0.588858
-user16,2809,275466,degrad,0,0.588858
+user16,2809,275466,degrad_space,0,0.588858
 user16,2810,275467,consider_degrad,0,0.578408
-user16,2810,275467,degrad,0,0.578408
+user16,2810,275467,degrad_space,0,0.578408
 user16,2811,275467,renonce,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
 user16,2815,275469,consider_degrad,0,0.583449
-user16,2815,275469,degrad,0,0.583449
+user16,2815,275469,degrad_space,0,0.583449
 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,0,0.417523
+user16,2818,275471,degrad_space,0,0.417523
 user16,2819,275471,renonce,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,0,0.55405
+user16,2823,275473,degrad_space,0,0.55405
 user16,2824,275474,renonce,0,0.158729
 user16,2825,275474,consider_degrad,0,0.533805
-user16,2825,275474,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,2828,275476,consider_degrad,0,0.5415
-user16,2828,275476,degrad,0,0.5415
+user16,2828,275476,degrad_space,0,0.5415
 user16,2829,275476,consider_reconfig,0,0.631933
 user16,2829,275476,reconfig,0,0.631933
 user16,2830,275477,consider_reconfig,0,0.726877
@@ -210,17 +210,17 @@ user16,2835,275479,renonce,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
-user16,2837,275480,degrad,0,0.416088
+user16,2837,275480,degrad_space,0,0.416088
 user16,2838,275481,C_you_later,3600,0.317445
 user16,2839,275481,rigid,0,0.9574
 user16,2840,275481,consider_degrad,0,0.428003
-user16,2840,275481,degrad,0,0.428003
+user16,2840,275481,degrad_space,0,0.428003
 user16,2841,275482,rigid,0,0.840556
 user16,2842,275482,C_you_later,3600,0.344644
 user16,2843,275483,consider_degrad,0,0.501283
-user16,2843,275483,degrad,0,0.501283
+user16,2843,275483,degrad_space,0,0.501283
 user16,2844,275483,consider_degrad,0,0.434227
-user16,2844,275483,degrad,0,0.434227
+user16,2844,275483,degrad_space,0,0.434227
 user16,2845,275484,consider_reconfig,0,0.645184
 user16,2845,275484,reconfig,0,0.645184
 user16,2846,275484,C_you_later,3600,0.258837
@@ -239,20 +239,20 @@ user16,2855,275489,consider_reconfig,0,0.758446
 user16,2855,275489,reconfig,0,0.758446
 user16,2856,275489,renonce,0,0.107712
 user16,2857,275489,consider_degrad,0,0.464768
-user16,2857,275489,degrad,0,0.464768
+user16,2857,275489,degrad_space,0,0.464768
 user16,2858,275490,rigid,0,0.826189
 user16,2859,275490,C_you_later,3600,0.256948
 user16,2860,275491,C_you_later,3600,0.291725
 user16,2861,275491,consider_degrad,0,0.577036
-user16,2861,275491,degrad,0,0.577036
+user16,2861,275491,degrad_space,0,0.577036
 user16,2862,275492,consider_degrad,0,0.573087
-user16,2862,275492,degrad,0,0.573087
+user16,2862,275492,degrad_space,0,0.573087
 user16,2863,275492,C_you_later,3600,0.22283
 user16,2864,275493,C_you_later,3600,0.276583
 user16,2865,275493,consider_degrad,0,0.533381
-user16,2865,275493,degrad,0,0.533381
+user16,2865,275493,degrad_space,0,0.533381
 user16,2866,275494,consider_degrad,0,0.419528
-user16,2866,275494,degrad,0,0.419528
+user16,2866,275494,degrad_space,0,0.419528
 user16,2867,275494,consider_reconfig,0,0.679533
 user16,2867,275494,reconfig,0,0.679533
 user16,2868,275495,rigid,0,0.940981
@@ -273,13 +273,13 @@ user16,2879,275500,C_you_later,3600,0.353939
 user16,2880,275501,consider_reconfig,0,0.758278
 user16,2880,275501,reconfig,0,0.758278
 user16,2881,275501,consider_degrad,0,0.502999
-user16,2881,275501,degrad,0,0.502999
+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,2885,275503,consider_degrad,0,0.569129
-user16,2885,275503,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,2888,275504,consider_reconfig,0,0.702178
@@ -287,7 +287,7 @@ user16,2888,275504,reconfig,0,0.702178
 user16,2889,275505,renonce,0,0.1828
 user16,2722,279012,renonce,0,0.0977483
 user16,2727,279014,consider_degrad,0,0.511478
-user16,2727,279014,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
@@ -302,23 +302,23 @@ user16,2770,279048,rigid,0,0.986167
 user16,2771,279048,rigid,0,0.987721
 user16,2776,279051,rigid,0,0.913436
 user16,2780,279052,consider_degrad,0,0.412763
-user16,2780,279052,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,2800,279062,consider_degrad,0,0.530472
-user16,2800,279062,degrad,0,0.530472
+user16,2800,279062,degrad_space,0,0.530472
 user16,2805,279064,C_you_later,3600,0.280967
 user16,2807,279065,rigid,0,0.952897
 user16,2812,279068,C_you_later,3600,0.369824
 user16,2813,279068,C_you_later,3600,0.297605
 user16,2814,279069,consider_degrad,0,0.487395
-user16,2814,279069,degrad,0,0.487395
+user16,2814,279069,degrad_space,0,0.487395
 user16,2816,279070,consider_reconfig,0,0.722979
 user16,2816,279070,reconfig,0,0.722979
 user16,2831,279077,C_you_later,3600,0.249676
 user16,2838,279081,consider_degrad,0,0.562334
-user16,2838,279081,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,2847,279085,rigid,0,0.837137
@@ -327,27 +327,27 @@ user16,2859,279090,C_you_later,3600,0.36497
 user16,2860,279091,rigid,0,0.999949
 user16,2863,279092,C_you_later,3600,0.330488
 user16,2864,279093,consider_degrad,0,0.581718
-user16,2864,279093,degrad,0,0.581718
+user16,2864,279093,degrad_space,0,0.581718
 user16,2869,279095,consider_reconfig,0,0.64444
 user16,2869,279095,reconfig,0,0.64444
 user16,2877,279099,rigid,0,0.899877
 user16,2879,279100,rigid,0,0.899424
 user16,2882,279102,rigid,0,0.93982
 user16,2728,282626,consider_degrad,0,0.488809
-user16,2728,282626,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,2805,282664,C_you_later,3600,0.279385
 user16,2812,282668,consider_degrad,0,0.498643
-user16,2812,282668,degrad,0,0.498643
+user16,2812,282668,degrad_space,0,0.498643
 user16,2813,282668,renonce,0,0.120019
 user16,2831,282677,consider_degrad,0,0.529784
-user16,2831,282677,degrad,0,0.529784
+user16,2831,282677,degrad_space,0,0.529784
 user16,2852,282687,consider_degrad,0,0.466519
-user16,2852,282687,degrad,0,0.466519
+user16,2852,282687,degrad_space,0,0.466519
 user16,2859,282690,rigid,0,0.945094
 user16,2863,282692,consider_degrad,0,0.495752
-user16,2863,282692,degrad,0,0.495752
+user16,2863,282692,degrad_space,0,0.495752
 user16,2805,286264,rigid,0,0.861897
 user16,4185,343182,rigid,0,1
 user16,4186,343182,rigid,0,1
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 993cf96..7d263ed 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
@@ -3,7 +3,7 @@ user18,1384,119976,rigid,0,1
 user18,1386,120259,rigid,0,1
 user18,1387,120441,rigid,0,1
 user18,1956,210993,consider_degrad,0,0.511997
-user18,1956,210993,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
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 db6340a..f51eb8b 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
@@ -5,7 +5,7 @@ user9,1090,49852,consider_reconfig,0,0.285366
 user9,1090,49852,reconfig,0,0.285366
 user5,1092,50545,rigid,0,0.882298
 user9,1126,51157,consider_degrad,0,0.395292
-user9,1126,51157,degrad,0,0.395292
+user9,1126,51157,degrad_space,0,0.395292
 user9,1133,51312,consider_reconfig,0,0.074995
 user9,1133,51312,reconfig,0,0.074995
 user9,1138,51695,rigid,0,0.799674
@@ -28,7 +28,7 @@ user9,3814,143342,rigid,0,1
 user5,3913,147644,rigid,0,1
 user5,5285,203790,rigid,0,0.853334
 user5,5287,204427,consider_degrad,0,0.494202
-user5,5287,204427,degrad,0,0.494202
+user5,5287,204427,degrad_space,0,0.494202
 user5,5508,214322,C_you_later,3600,0.021467
 user5,5508,217922,consider_reconfig,0,0.718087
 user5,5508,217922,reconfig,0,0.718087
@@ -40,9 +40,9 @@ user9,6452,237292,rigid,0,0.811959
 user9,6455,237317,renonce,0,0.045389
 user10,6459,238285,rigid,0,0.840091
 user5,6982,260575,consider_degrad,0,0.260721
-user5,6982,260575,degrad,0,0.260721
+user5,6982,260575,degrad_space,0,0.260721
 user5,7126,270322,consider_degrad,0,0.380538
-user5,7126,270322,degrad,0,0.380538
+user5,7126,270322,degrad_space,0,0.380538
 user9,7815,297615,rigid,0,0.90085
 user9,8052,300159,rigid,0,1
 user9,8061,300545,rigid,0,1
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 586796e..556fede 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
@@ -2,13 +2,13 @@ user,job_id,submission_time,behavior_name,time_delayed,random_value_normalized
 user5,228,7800,rigid,0,1
 user5,247,9327,rigid,0,1
 user9,1090,49852,consider_degrad,0,0.3388
-user9,1090,49852,degrad,0,0.3388
+user9,1090,49852,degrad_space,0,0.3388
 user5,1092,50545,consider_reconfig,0,0.285058
 user5,1092,50545,reconfig,0,0.285058
 user9,1126,51157,consider_reconfig,0,0.138092
 user9,1126,51157,reconfig,0,0.138092
 user9,1133,51312,consider_degrad,0,0.338565
-user9,1133,51312,degrad,0,0.338565
+user9,1133,51312,degrad_space,0,0.338565
 user9,1138,51695,rigid,0,0.751618
 user10,1150,52859,consider_degrad,0,0.172229
 user10,1150,52859,degrad_time,0,0.172229
@@ -45,7 +45,7 @@ user9,6440,244277,consider_reconfig,0,0.621012
 user9,6440,244277,reconfig,0,0.621012
 user9,6452,244492,renonce,0,0.151723
 user5,6982,260575,consider_degrad,0,0.408862
-user5,6982,260575,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
 user9,8052,300159,rigid,0,1
@@ -110,11 +110,11 @@ user10,18147,613833,degrad_time,0,0.518397
 user5,18351,621143,rigid,0,0.97826
 user9,19079,651303,C_you_later,3600,0.257369
 user9,19080,651341,consider_degrad,0,0.552463
-user9,19080,651341,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,19079,658503,consider_degrad,0,0.469941
-user9,19079,658503,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
@@ -133,7 +133,7 @@ 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,21451,739445,consider_degrad,0,0.569521
-user5,21451,739445,degrad,0,0.569521
+user5,21451,739445,degrad_space,0,0.569521
 user5,21862,753768,rigid,0,0.923828
 user5,21871,754617,consider_reconfig,0,0.746373
 user5,21871,754617,reconfig,0,0.746373
@@ -145,23 +145,23 @@ user5,22267,771289,consider_reconfig,0,0.741185
 user5,22267,771289,reconfig,0,0.741185
 user5,22338,771371,C_you_later,3600,0.352692
 user5,22338,774971,consider_degrad,0,0.556261
-user5,22338,774971,degrad,0,0.556261
+user5,22338,774971,degrad_space,0,0.556261
 user5,22503,780352,C_you_later,3600,0.351035
 user5,22555,783217,C_you_later,3600,0.342585
 user5,22503,783952,consider_reconfig,0,0.663717
 user5,22503,783952,reconfig,0,0.663717
 user5,22618,785000,consider_degrad,0,0.583155
-user5,22618,785000,degrad,0,0.583155
+user5,22618,785000,degrad_space,0,0.583155
 user5,22555,786817,rigid,0,0.842118
 user5,22757,798474,rigid,0,0.955678
 user5,22764,799707,consider_degrad,0,0.535629
-user5,22764,799707,degrad,0,0.535629
+user5,22764,799707,degrad_space,0,0.535629
 user5,23001,811895,rigid,0,0.667161
 user5,23258,820265,rigid,0,0.91118
 user5,23271,821159,rigid,0,0.716964
 user5,23571,825870,rigid,0,0.762025
 user5,24262,838228,consider_degrad,0,0.561732
-user5,24262,838228,degrad,0,0.561732
+user5,24262,838228,degrad_space,0,0.561732
 user5,24415,842227,consider_reconfig,0,0.0936743
 user5,24415,842227,reconfig,0,0.0936743
 user5,24955,856275,consider_reconfig,0,0.0997552
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 278f6a4..798215e 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
@@ -19,20 +19,20 @@ user14,808,69608,rigid,0,1
 user14,809,69841,rigid,0,1
 user18,1384,119976,rigid,0,0.835456
 user18,1386,120259,consider_degrad,0,0.553991
-user18,1386,120259,degrad,0,0.553991
+user18,1386,120259,degrad_space,0,0.553991
 user18,1387,120441,consider_degrad,0,0.45761
-user18,1387,120441,degrad,0,0.45761
+user18,1387,120441,degrad_space,0,0.45761
 user18,1956,210993,consider_reconfig,0,0.622202
 user18,1956,210993,reconfig,0,0.622202
 user18,1962,211560,consider_degrad,0,0.559827
-user18,1962,211560,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,2443,244436,consider_reconfig,0,0.799674
 user15,2443,244436,reconfig,0,0.799674
 user15,2427,246733,consider_degrad,0,0.534493
-user15,2427,246733,degrad,0,0.534493
+user15,2427,246733,degrad_space,0,0.534493
 user15,2428,246974,consider_reconfig,0,0.674231
 user15,2428,246974,reconfig,0,0.674231
 user14,2527,253799,rigid,0,0.882298
@@ -50,20 +50,20 @@ 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,0,0.482835
+user16,2718,275410,degrad_space,0,0.482835
 user16,2719,275410,renonce,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
 user16,2723,275412,consider_degrad,0,0.45905
-user16,2723,275412,degrad,0,0.45905
+user16,2723,275412,degrad_space,0,0.45905
 user16,2724,275413,consider_degrad,0,0.491019
-user16,2724,275413,degrad,0,0.491019
+user16,2724,275413,degrad_space,0,0.491019
 user16,2725,275413,rigid,0,0.963183
 user16,2726,275414,rigid,0,0.941904
 user16,2727,275414,rigid,0,0.942705
 user16,2728,275426,consider_degrad,0,0.533508
-user16,2728,275426,degrad,0,0.533508
+user16,2728,275426,degrad_space,0,0.533508
 user16,2729,275427,rigid,0,0.959307
 user16,2730,275427,rigid,0,0.8611
 user16,2731,275428,rigid,0,0.932134
@@ -73,7 +73,7 @@ user16,2733,275432,C_you_later,3600,0.377568
 user16,2734,275432,C_you_later,3600,0.238283
 user16,2735,275433,C_you_later,3600,0.307257
 user16,2736,275433,consider_degrad,0,0.481936
-user16,2736,275433,degrad,0,0.481936
+user16,2736,275433,degrad_space,0,0.481936
 user16,2737,275433,rigid,0,0.979844
 user16,2738,275434,rigid,0,0.848025
 user16,2739,275434,rigid,0,0.98618
@@ -81,15 +81,15 @@ user16,2740,275435,rigid,0,0.876825
 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,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,2746,275437,consider_degrad,0,0.534723
-user16,2746,275437,degrad,0,0.534723
+user16,2746,275437,degrad_space,0,0.534723
 user16,2747,275438,consider_reconfig,0,0.74792
 user16,2747,275438,reconfig,0,0.74792
 user16,2748,275438,consider_degrad,0,0.557574
-user16,2748,275438,degrad,0,0.557574
+user16,2748,275438,degrad_space,0,0.557574
 user16,2749,275439,consider_reconfig,0,0.741951
 user16,2749,275439,reconfig,0,0.741951
 user16,2750,275439,consider_reconfig,0,0.659328
@@ -104,7 +104,7 @@ user16,2755,275441,reconfig,0,0.728829
 user16,2756,275442,rigid,0,0.959548
 user16,2757,275442,renonce,0,0.140562
 user16,2758,275443,consider_degrad,0,0.599913
-user16,2758,275443,degrad,0,0.599913
+user16,2758,275443,degrad_space,0,0.599913
 user16,2759,275443,consider_reconfig,0,0.638889
 user16,2759,275443,reconfig,0,0.638889
 user16,2760,275444,consider_reconfig,0,0.600063
@@ -115,12 +115,12 @@ 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,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,2769,275448,consider_degrad,0,0.47462
-user16,2769,275448,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
@@ -132,16 +132,16 @@ user16,2775,275450,consider_reconfig,0,0.64935
 user16,2775,275450,reconfig,0,0.64935
 user16,2776,275451,C_you_later,3600,0.38313
 user16,2777,275451,consider_degrad,0,0.505413
-user16,2777,275451,degrad,0,0.505413
+user16,2777,275451,degrad_space,0,0.505413
 user16,2778,275452,consider_degrad,0,0.571052
-user16,2778,275452,degrad,0,0.571052
+user16,2778,275452,degrad_space,0,0.571052
 user16,2779,275452,consider_reconfig,0,0.645091
 user16,2779,275452,reconfig,0,0.645091
 user16,2780,275452,consider_reconfig,0,0.699534
 user16,2780,275452,reconfig,0,0.699534
 user16,2781,275453,rigid,0,0.968372
 user16,2782,275453,consider_degrad,0,0.416936
-user16,2782,275453,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
@@ -150,64 +150,64 @@ user16,2786,275455,C_you_later,3600,0.375983
 user16,2787,275456,consider_reconfig,0,0.605077
 user16,2787,275456,reconfig,0,0.605077
 user16,2788,275456,consider_degrad,0,0.540243
-user16,2788,275456,degrad,0,0.540243
+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,2793,275459,consider_degrad,0,0.559243
-user16,2793,275459,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,2799,275462,consider_degrad,0,0.455829
-user16,2799,275462,degrad,0,0.455829
+user16,2799,275462,degrad_space,0,0.455829
 user16,2800,275462,rigid,0,0.921951
 user16,2801,275463,rigid,0,0.905925
 user16,2802,275463,consider_degrad,0,0.559969
-user16,2802,275463,degrad,0,0.559969
+user16,2802,275463,degrad_space,0,0.559969
 user16,2803,275464,consider_reconfig,0,0.700641
 user16,2803,275464,reconfig,0,0.700641
 user16,2804,275464,C_you_later,3600,0.265891
 user16,2805,275464,consider_degrad,0,0.429701
-user16,2805,275464,degrad,0,0.429701
+user16,2805,275464,degrad_space,0,0.429701
 user16,2806,275465,consider_reconfig,0,0.646037
 user16,2806,275465,reconfig,0,0.646037
 user16,2807,275465,consider_reconfig,0,0.783302
 user16,2807,275465,reconfig,0,0.783302
 user16,2808,275466,rigid,0,0.847572
 user16,2809,275466,consider_degrad,0,0.563815
-user16,2809,275466,degrad,0,0.563815
+user16,2809,275466,degrad_space,0,0.563815
 user16,2810,275467,consider_degrad,0,0.446009
-user16,2810,275467,degrad,0,0.446009
+user16,2810,275467,degrad_space,0,0.446009
 user16,2811,275467,consider_degrad,0,0.554074
-user16,2811,275467,degrad,0,0.554074
+user16,2811,275467,degrad_space,0,0.554074
 user16,2812,275468,consider_degrad,0,0.522933
-user16,2812,275468,degrad,0,0.522933
+user16,2812,275468,degrad_space,0,0.522933
 user16,2813,275468,renonce,0,0.0905024
 user16,2814,275469,consider_degrad,0,0.454311
-user16,2814,275469,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,2818,275471,C_you_later,3600,0.354161
 user16,2819,275471,consider_degrad,0,0.531982
-user16,2819,275471,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,2823,275473,rigid,0,0.951767
 user16,2824,275474,consider_degrad,0,0.509208
-user16,2824,275474,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,2828,275476,consider_degrad,0,0.553931
-user16,2828,275476,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
@@ -229,7 +229,7 @@ user16,2843,275483,rigid,0,0.948061
 user16,2844,275483,consider_reconfig,0,0.773267
 user16,2844,275483,reconfig,0,0.773267
 user16,2845,275484,consider_degrad,0,0.461325
-user16,2845,275484,degrad,0,0.461325
+user16,2845,275484,degrad_space,0,0.461325
 user16,2846,275484,consider_reconfig,0,0.715508
 user16,2846,275484,reconfig,0,0.715508
 user16,2847,275485,rigid,0,0.908881
@@ -238,7 +238,7 @@ user16,2848,275485,reconfig,0,0.613852
 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,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,2853,275488,rigid,0,0.904314
@@ -248,7 +248,7 @@ user16,2855,275489,reconfig,0,0.725414
 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,0,0.469097
+user16,2857,275489,degrad_space,0,0.469097
 user16,2858,275490,renonce,0,0.120403
 user16,2859,275490,consider_reconfig,0,0.723323
 user16,2859,275490,reconfig,0,0.723323
@@ -266,19 +266,19 @@ user16,2868,275495,consider_reconfig,0,0.670905
 user16,2868,275495,reconfig,0,0.670905
 user16,2869,275495,rigid,0,0.800276
 user16,2870,275496,consider_degrad,0,0.407904
-user16,2870,275496,degrad,0,0.407904
+user16,2870,275496,degrad_space,0,0.407904
 user16,2871,275496,consider_degrad,0,0.525475
-user16,2871,275496,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,2874,275498,consider_degrad,0,0.443944
-user16,2874,275498,degrad,0,0.443944
+user16,2874,275498,degrad_space,0,0.443944
 user16,2875,275498,renonce,0,0.142623
 user16,2876,275499,rigid,0,0.877451
 user16,2877,275499,renonce,0,0.178449
 user16,2878,275500,rigid,0,0.874408
 user16,2879,275500,consider_degrad,0,0.493441
-user16,2879,275500,degrad,0,0.493441
+user16,2879,275500,degrad_space,0,0.493441
 user16,2880,275501,renonce,0,0.0672286
 user16,2881,275501,consider_reconfig,0,0.744897
 user16,2881,275501,reconfig,0,0.744897
@@ -291,31 +291,31 @@ user16,2886,275503,reconfig,0,0.767878
 user16,2887,275504,consider_reconfig,0,0.612561
 user16,2887,275504,reconfig,0,0.612561
 user16,2888,275504,consider_degrad,0,0.540209
-user16,2888,275504,degrad,0,0.540209
+user16,2888,275504,degrad_space,0,0.540209
 user16,2889,275505,consider_degrad,0,0.480259
-user16,2889,275505,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,2734,279032,consider_degrad,0,0.53988
-user16,2734,279032,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,0,0.533453
+user16,2741,279035,degrad_space,0,0.533453
 user16,2761,279044,renonce,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
 user16,2776,279051,rigid,0,0.983575
 user16,2785,279055,consider_degrad,0,0.520705
-user16,2785,279055,degrad,0,0.520705
+user16,2785,279055,degrad_space,0,0.520705
 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,2794,279059,consider_degrad,0,0.482447
-user16,2794,279059,degrad,0,0.482447
+user16,2794,279059,degrad_space,0,0.482447
 user16,2795,279060,C_you_later,3600,0.394128
 user16,2797,279061,rigid,0,0.86059
 user16,2804,279064,consider_reconfig,0,0.695051
@@ -327,36 +327,36 @@ user16,2834,279079,consider_reconfig,0,0.661585
 user16,2834,279079,reconfig,0,0.661585
 user16,2841,279082,renonce,0,0.0172624
 user16,2854,279088,consider_degrad,0,0.405974
-user16,2854,279088,degrad,0,0.405974
+user16,2854,279088,degrad_space,0,0.405974
 user16,2861,279091,consider_reconfig,0,0.655929
 user16,2861,279091,reconfig,0,0.655929
 user16,2865,279093,consider_reconfig,0,0.70461
 user16,2865,279093,reconfig,0,0.70461
 user16,2884,279102,C_you_later,3600,0.367831
 user16,2721,282611,consider_degrad,0,0.469807
-user16,2721,282611,degrad,0,0.469807
+user16,2721,282611,degrad_space,0,0.469807
 user16,2735,282633,consider_degrad,0,0.535869
-user16,2735,282633,degrad,0,0.535869
+user16,2735,282633,degrad_space,0,0.535869
 user16,2795,282660,consider_degrad,0,0.544813
-user16,2795,282660,degrad,0,0.544813
+user16,2795,282660,degrad_space,0,0.544813
 user16,2829,282676,rigid,0,0.849653
 user16,2884,282702,rigid,0,0.852953
 user16,4185,343182,rigid,0,0.773171
 user16,4186,343182,rigid,0,0.876446
 user16,4187,343183,consider_degrad,0,0.527395
-user16,4187,343183,degrad,0,0.527395
+user16,4187,343183,degrad_space,0,0.527395
 user16,4188,343183,consider_reconfig,0,0.305206
 user16,4188,343183,reconfig,0,0.305206
 user16,4189,343184,consider_degrad,0,0.429824
-user16,4189,343184,degrad,0,0.429824
+user16,4189,343184,degrad_space,0,0.429824
 user16,4190,343184,consider_reconfig,0,0.165118
 user16,4190,343184,reconfig,0,0.165118
 user16,4191,343184,consider_degrad,0,0.373286
-user16,4191,343184,degrad,0,0.373286
+user16,4191,343184,degrad_space,0,0.373286
 user16,4192,343185,consider_degrad,0,0.435018
-user16,4192,343185,degrad,0,0.435018
+user16,4192,343185,degrad_space,0,0.435018
 user16,4193,343185,consider_degrad,0,0.380123
-user16,4193,343185,degrad,0,0.380123
+user16,4193,343185,degrad_space,0,0.380123
 user16,4194,343186,consider_reconfig,0,0.0148989
 user16,4194,343186,reconfig,0,0.0148989
 user16,4195,343186,rigid,0,0.964792
@@ -367,11 +367,11 @@ user16,4197,343187,reconfig,0,0.0189572
 user16,4198,343188,consider_reconfig,0,0.0428103
 user16,4198,343188,reconfig,0,0.0428103
 user16,4199,343188,consider_degrad,0,0.403744
-user16,4199,343188,degrad,0,0.403744
+user16,4199,343188,degrad_space,0,0.403744
 user16,4200,343188,consider_reconfig,0,0.326171
 user16,4200,343188,reconfig,0,0.326171
 user16,4201,343189,consider_degrad,0,0.595259
-user16,4201,343189,degrad,0,0.595259
+user16,4201,343189,degrad_space,0,0.595259
 user16,4202,343189,rigid,0,0.673692
 user16,4203,343190,consider_reconfig,0,0.187411
 user16,4203,343190,reconfig,0,0.187411
@@ -380,40 +380,40 @@ user16,4204,343190,reconfig,0,0.269676
 user16,4205,343191,consider_reconfig,0,0.139736
 user16,4205,343191,reconfig,0,0.139736
 user16,4206,343191,consider_degrad,0,0.367364
-user16,4206,343191,degrad,0,0.367364
+user16,4206,343191,degrad_space,0,0.367364
 user16,4207,343192,consider_reconfig,0,0.0212998
 user16,4207,343192,reconfig,0,0.0212998
 user16,4208,343192,consider_degrad,0,0.628731
-user16,4208,343192,degrad,0,0.628731
+user16,4208,343192,degrad_space,0,0.628731
 user16,4209,343193,consider_reconfig,0,0.116281
 user16,4209,343193,reconfig,0,0.116281
 user16,4210,343193,consider_degrad,0,0.649299
-user16,4210,343193,degrad,0,0.649299
+user16,4210,343193,degrad_space,0,0.649299
 user16,4211,343193,consider_degrad,0,0.448172
-user16,4211,343193,degrad,0,0.448172
+user16,4211,343193,degrad_space,0,0.448172
 user16,4212,343194,rigid,0,0.755388
 user16,4213,343194,rigid,0,0.969834
 user16,4214,343195,consider_degrad,0,0.469785
-user16,4214,343195,degrad,0,0.469785
+user16,4214,343195,degrad_space,0,0.469785
 user16,4215,343195,rigid,0,0.750717
 user16,4216,343204,rigid,0,0.925514
 user16,4217,343205,consider_degrad,0,0.501176
-user16,4217,343205,degrad,0,0.501176
+user16,4217,343205,degrad_space,0,0.501176
 user16,4218,343205,consider_degrad,0,0.483032
-user16,4218,343205,degrad,0,0.483032
+user16,4218,343205,degrad_space,0,0.483032
 user16,4219,343205,rigid,0,0.755912
 user16,4220,343206,consider_degrad,0,0.641693
-user16,4220,343206,degrad,0,0.641693
+user16,4220,343206,degrad_space,0,0.641693
 user16,4221,343206,consider_degrad,0,0.479095
-user16,4221,343206,degrad,0,0.479095
+user16,4221,343206,degrad_space,0,0.479095
 user16,4222,343207,consider_reconfig,0,0.0504252
 user16,4222,343207,reconfig,0,0.0504252
 user16,4223,343207,consider_reconfig,0,0.0585942
 user16,4223,343207,reconfig,0,0.0585942
 user16,4224,343208,consider_degrad,0,0.494637
-user16,4224,343208,degrad,0,0.494637
+user16,4224,343208,degrad_space,0,0.494637
 user16,4225,343208,consider_degrad,0,0.405086
-user16,4225,343208,degrad,0,0.405086
+user16,4225,343208,degrad_space,0,0.405086
 user16,4226,343209,consider_reconfig,0,0.194572
 user16,4226,343209,reconfig,0,0.194572
 user16,4227,343213,consider_reconfig,0,0.188766
@@ -427,19 +427,19 @@ user16,4231,343215,consider_reconfig,0,0.127524
 user16,4231,343215,reconfig,0,0.127524
 user16,4232,343215,rigid,0,0.854171
 user16,4233,343216,consider_degrad,0,0.506399
-user16,4233,343216,degrad,0,0.506399
+user16,4233,343216,degrad_space,0,0.506399
 user16,4234,343216,consider_degrad,0,0.608398
-user16,4234,343216,degrad,0,0.608398
+user16,4234,343216,degrad_space,0,0.608398
 user16,4235,343217,consider_reconfig,0,0.237158
 user16,4235,343217,reconfig,0,0.237158
 user16,4236,343217,rigid,0,0.907137
 user16,4237,343218,rigid,0,0.819569
 user16,4238,343218,consider_degrad,0,0.406457
-user16,4238,343218,degrad,0,0.406457
+user16,4238,343218,degrad_space,0,0.406457
 user16,4239,343218,consider_degrad,0,0.628793
-user16,4239,343218,degrad,0,0.628793
+user16,4239,343218,degrad_space,0,0.628793
 user16,4240,343219,consider_degrad,0,0.534935
-user16,4240,343219,degrad,0,0.534935
+user16,4240,343219,degrad_space,0,0.534935
 user16,4241,343219,rigid,0,0.905364
 user16,4242,343220,consider_reconfig,0,0.108537
 user16,4242,343220,reconfig,0,0.108537
@@ -451,11 +451,11 @@ user16,4245,343221,reconfig,0,0.185282
 user16,4246,343222,consider_reconfig,0,0.0408645
 user16,4246,343222,reconfig,0,0.0408645
 user16,4247,343222,consider_degrad,0,0.432778
-user16,4247,343222,degrad,0,0.432778
+user16,4247,343222,degrad_space,0,0.432778
 user16,4248,343222,consider_reconfig,0,0.0731212
 user16,4248,343222,reconfig,0,0.0731212
 user16,4249,343223,consider_degrad,0,0.596613
-user16,4249,343223,degrad,0,0.596613
+user16,4249,343223,degrad_space,0,0.596613
 user16,4250,343223,rigid,0,0.95294
 user16,4251,343224,rigid,0,0.725946
 user16,4252,343224,consider_reconfig,0,0.321034
@@ -464,7 +464,7 @@ user16,4253,343225,rigid,0,0.817126
 user16,4254,343225,consider_reconfig,0,0.0336371
 user16,4254,343225,reconfig,0,0.0336371
 user16,4255,343226,consider_degrad,0,0.438064
-user16,4255,343226,degrad,0,0.438064
+user16,4255,343226,degrad_space,0,0.438064
 user16,4256,343226,rigid,0,0.973639
 user16,4257,343226,consider_reconfig,0,0.0345287
 user16,4257,343226,reconfig,0,0.0345287
@@ -477,17 +477,17 @@ user16,4260,343228,reconfig,0,0.163754
 user16,4261,343228,consider_reconfig,0,0.219285
 user16,4261,343228,reconfig,0,0.219285
 user16,4262,343229,consider_degrad,0,0.364964
-user16,4262,343229,degrad,0,0.364964
+user16,4262,343229,degrad_space,0,0.364964
 user16,4263,343229,consider_reconfig,0,0.0221291
 user16,4263,343229,reconfig,0,0.0221291
 user16,4264,343230,consider_reconfig,0,0.126395
 user16,4264,343230,reconfig,0,0.126395
 user16,4265,343230,consider_degrad,0,0.43663
-user16,4265,343230,degrad,0,0.43663
+user16,4265,343230,degrad_space,0,0.43663
 user16,4266,343230,rigid,0,0.670032
 user16,4267,343231,rigid,0,0.70601
 user16,4268,343231,consider_degrad,0,0.37597
-user16,4268,343231,degrad,0,0.37597
+user16,4268,343231,degrad_space,0,0.37597
 user16,4269,343232,consider_reconfig,0,0.0519523
 user16,4269,343232,reconfig,0,0.0519523
 user16,4270,343232,consider_reconfig,0,0.0320212
@@ -495,7 +495,7 @@ user16,4270,343232,reconfig,0,0.0320212
 user16,4271,343233,consider_reconfig,0,0.254493
 user16,4271,343233,reconfig,0,0.254493
 user16,4272,343233,consider_degrad,0,0.502852
-user16,4272,343233,degrad,0,0.502852
+user16,4272,343233,degrad_space,0,0.502852
 user16,4273,343234,consider_reconfig,0,0.0507172
 user16,4273,343234,reconfig,0,0.0507172
 user16,4274,343234,consider_reconfig,0,0.0516544
@@ -507,7 +507,7 @@ user16,4277,343235,consider_reconfig,0,0.235644
 user16,4277,343235,reconfig,0,0.235644
 user16,4278,343236,rigid,0,0.802853
 user16,4279,343236,consider_degrad,0,0.401582
-user16,4279,343236,degrad,0,0.401582
+user16,4279,343236,degrad_space,0,0.401582
 user16,4280,343237,rigid,0,0.834388
 user16,4281,343237,consider_reconfig,0,0.189667
 user16,4281,343237,reconfig,0,0.189667
@@ -517,23 +517,23 @@ user16,4283,343238,rigid,0,0.936027
 user16,4284,343238,rigid,0,0.667685
 user16,4285,343239,rigid,0,0.752917
 user16,4286,343239,consider_degrad,0,0.505564
-user16,4286,343239,degrad,0,0.505564
+user16,4286,343239,degrad_space,0,0.505564
 user16,4287,343240,consider_degrad,0,0.3687
-user16,4287,343240,degrad,0,0.3687
+user16,4287,343240,degrad_space,0,0.3687
 user16,4288,343240,rigid,0,0.873361
 user16,4289,343241,consider_reconfig,0,0.322419
 user16,4289,343241,reconfig,0,0.322419
 user16,4290,343241,rigid,0,0.974273
 user16,4291,343242,consider_degrad,0,0.620675
-user16,4291,343242,degrad,0,0.620675
+user16,4291,343242,degrad_space,0,0.620675
 user16,4292,343242,consider_degrad,0,0.4678
-user16,4292,343242,degrad,0,0.4678
+user16,4292,343242,degrad_space,0,0.4678
 user16,4293,343242,consider_reconfig,0,0.317198
 user16,4293,343242,reconfig,0,0.317198
 user16,4294,343243,consider_reconfig,0,0.203382
 user16,4294,343243,reconfig,0,0.203382
 user16,4295,343243,consider_degrad,0,0.401601
-user16,4295,343243,degrad,0,0.401601
+user16,4295,343243,degrad_space,0,0.401601
 user16,4296,343244,consider_reconfig,0,0.186929
 user16,4296,343244,reconfig,0,0.186929
 user16,4297,343244,consider_reconfig,0,0.242679
@@ -541,9 +541,9 @@ user16,4297,343244,reconfig,0,0.242679
 user16,4298,343245,consider_reconfig,0,0.203652
 user16,4298,343245,reconfig,0,0.203652
 user16,4299,343245,consider_degrad,0,0.349986
-user16,4299,343245,degrad,0,0.349986
+user16,4299,343245,degrad_space,0,0.349986
 user16,4300,343246,consider_degrad,0,0.651698
-user16,4300,343246,degrad,0,0.651698
+user16,4300,343246,degrad_space,0,0.651698
 user16,4301,343246,rigid,0,0.846205
 user16,4302,343246,rigid,0,0.843381
 user16,4303,343247,consider_reconfig,0,0.211783
@@ -554,7 +554,7 @@ user16,4305,343248,rigid,0,0.687559
 user16,4306,343248,consider_reconfig,0,0.310843
 user16,4306,343248,reconfig,0,0.310843
 user16,4307,343249,consider_degrad,0,0.552509
-user16,4307,343249,degrad,0,0.552509
+user16,4307,343249,degrad_space,0,0.552509
 user16,4308,343249,rigid,0,0.773074
 user16,4309,343249,rigid,0,0.965129
 user16,4310,343250,consider_reconfig,0,0.201141
@@ -563,21 +563,21 @@ user16,4311,343250,rigid,0,0.870268
 user16,4312,343251,consider_reconfig,0,0.179854
 user16,4312,343251,reconfig,0,0.179854
 user16,4313,343251,consider_degrad,0,0.438714
-user16,4313,343251,degrad,0,0.438714
+user16,4313,343251,degrad_space,0,0.438714
 user16,4314,343252,consider_degrad,0,0.377169
-user16,4314,343252,degrad,0,0.377169
+user16,4314,343252,degrad_space,0,0.377169
 user16,4315,343252,rigid,0,0.864204
 user16,4316,343253,consider_degrad,0,0.412081
-user16,4316,343253,degrad,0,0.412081
+user16,4316,343253,degrad_space,0,0.412081
 user16,4317,343253,consider_degrad,0,0.537164
-user16,4317,343253,degrad,0,0.537164
+user16,4317,343253,degrad_space,0,0.537164
 user16,4318,343253,rigid,0,0.827567
 user16,4319,343254,consider_reconfig,0,0.267908
 user16,4319,343254,reconfig,0,0.267908
 user16,4320,343254,rigid,0,0.770844
 user16,4321,343255,rigid,0,0.668636
 user16,4322,343255,consider_degrad,0,0.3853
-user16,4322,343255,degrad,0,0.3853
+user16,4322,343255,degrad_space,0,0.3853
 user16,4323,343256,rigid,0,0.893061
 user16,4324,343256,rigid,0,0.821437
 user16,4325,343256,rigid,0,0.691793
@@ -588,7 +588,7 @@ user16,4328,343258,rigid,0,0.921764
 user16,4329,343258,rigid,0,0.867823
 user16,4330,343259,rigid,0,0.69804
 user16,4331,343259,consider_degrad,0,0.663514
-user16,4331,343259,degrad,0,0.663514
+user16,4331,343259,degrad_space,0,0.663514
 user16,4332,343260,rigid,0,0.915676
 user16,4333,343260,consider_reconfig,0,0.0048838
 user16,4333,343260,reconfig,0,0.0048838
@@ -597,33 +597,33 @@ user16,4334,343260,reconfig,0,0.246636
 user16,4335,343261,rigid,0,0.955312
 user16,4336,343261,rigid,0,0.726838
 user16,4337,343262,consider_degrad,0,0.462163
-user16,4337,343262,degrad,0,0.462163
+user16,4337,343262,degrad_space,0,0.462163
 user16,4338,343262,consider_reconfig,0,0.285363
 user16,4338,343262,reconfig,0,0.285363
 user16,4339,343263,consider_degrad,0,0.493625
-user16,4339,343263,degrad,0,0.493625
+user16,4339,343263,degrad_space,0,0.493625
 user16,4340,343263,consider_reconfig,0,0.125695
 user16,4340,343263,reconfig,0,0.125695
 user16,4341,343263,rigid,0,0.770515
 user16,4342,343264,rigid,0,0.826743
 user16,4343,343264,consider_degrad,0,0.611174
-user16,4343,343264,degrad,0,0.611174
+user16,4343,343264,degrad_space,0,0.611174
 user16,4344,343265,consider_reconfig,0,0.01047
 user16,4344,343265,reconfig,0,0.01047
 user16,4345,343265,consider_reconfig,0,0.237257
 user16,4345,343265,reconfig,0,0.237257
 user16,4346,343266,consider_degrad,0,0.338032
-user16,4346,343266,degrad,0,0.338032
+user16,4346,343266,degrad_space,0,0.338032
 user16,4347,343266,consider_degrad,0,0.460249
-user16,4347,343266,degrad,0,0.460249
+user16,4347,343266,degrad_space,0,0.460249
 user16,4348,343266,rigid,0,0.96922
 user16,4349,343267,rigid,0,0.717583
 user16,4350,343267,consider_reconfig,0,0.151499
 user16,4350,343267,reconfig,0,0.151499
 user16,4351,343268,consider_degrad,0,0.437291
-user16,4351,343268,degrad,0,0.437291
+user16,4351,343268,degrad_space,0,0.437291
 user16,4352,343268,consider_degrad,0,0.442754
-user16,4352,343268,degrad,0,0.442754
+user16,4352,343268,degrad_space,0,0.442754
 user16,4353,343269,consider_reconfig,0,0.090418
 user16,4353,343269,reconfig,0,0.090418
 user16,4354,343269,consider_reconfig,0,0.1893
@@ -631,60 +631,60 @@ user16,4354,343269,reconfig,0,0.1893
 user16,4355,343270,consider_reconfig,0,0.161149
 user16,4355,343270,reconfig,0,0.161149
 user16,4356,343270,consider_degrad,0,0.551393
-user16,4356,343270,degrad,0,0.551393
+user16,4356,343270,degrad_space,0,0.551393
 user16,4357,343270,consider_reconfig,0,0.0520405
 user16,4357,343270,reconfig,0,0.0520405
 user16,4358,343271,rigid,0,0.907076
 user16,4359,343271,rigid,0,0.715755
 user16,4360,343272,consider_degrad,0,0.436585
-user16,4360,343272,degrad,0,0.436585
+user16,4360,343272,degrad_space,0,0.436585
 user16,4361,343272,consider_degrad,0,0.426662
-user16,4361,343272,degrad,0,0.426662
+user16,4361,343272,degrad_space,0,0.426662
 user16,4362,343273,rigid,0,0.838258
 user16,4363,343273,consider_degrad,0,0.391194
-user16,4363,343273,degrad,0,0.391194
+user16,4363,343273,degrad_space,0,0.391194
 user16,4364,343273,consider_degrad,0,0.449729
-user16,4364,343273,degrad,0,0.449729
+user16,4364,343273,degrad_space,0,0.449729
 user16,4365,343274,rigid,0,0.79124
 user16,4366,343274,consider_reconfig,0,0.284271
 user16,4366,343274,reconfig,0,0.284271
 user16,4367,343275,consider_degrad,0,0.452869
-user16,4367,343275,degrad,0,0.452869
+user16,4367,343275,degrad_space,0,0.452869
 user16,4368,343275,consider_reconfig,0,0.0112201
 user16,4368,343275,reconfig,0,0.0112201
 user16,4369,343276,rigid,0,0.973134
 user16,4370,343276,consider_reconfig,0,0.212503
 user16,4370,343276,reconfig,0,0.212503
 user16,4371,343276,consider_degrad,0,0.605495
-user16,4371,343276,degrad,0,0.605495
+user16,4371,343276,degrad_space,0,0.605495
 user16,4372,343277,consider_degrad,0,0.340345
-user16,4372,343277,degrad,0,0.340345
+user16,4372,343277,degrad_space,0,0.340345
 user16,4373,343277,consider_degrad,0,0.392889
-user16,4373,343277,degrad,0,0.392889
+user16,4373,343277,degrad_space,0,0.392889
 user16,4374,343278,rigid,0,0.98755
 user16,4375,343278,consider_reconfig,0,0.0305605
 user16,4375,343278,reconfig,0,0.0305605
 user16,4376,343279,consider_degrad,0,0.641154
-user16,4376,343279,degrad,0,0.641154
+user16,4376,343279,degrad_space,0,0.641154
 user16,4377,343279,consider_reconfig,0,0.0021831
 user16,4377,343279,reconfig,0,0.0021831
 user16,4378,343279,rigid,0,0.96616
 user16,4379,343280,consider_degrad,0,0.472726
-user16,4379,343280,degrad,0,0.472726
+user16,4379,343280,degrad_space,0,0.472726
 user16,4380,343280,consider_degrad,0,0.516925
-user16,4380,343280,degrad,0,0.516925
+user16,4380,343280,degrad_space,0,0.516925
 user16,4381,343281,consider_degrad,0,0.499119
-user16,4381,343281,degrad,0,0.499119
+user16,4381,343281,degrad_space,0,0.499119
 user16,4382,343281,rigid,0,0.825293
 user16,4383,343282,consider_degrad,0,0.55645
-user16,4383,343282,degrad,0,0.55645
+user16,4383,343282,degrad_space,0,0.55645
 user16,4384,343282,consider_degrad,0,0.619372
-user16,4384,343282,degrad,0,0.619372
+user16,4384,343282,degrad_space,0,0.619372
 user16,4385,343283,consider_reconfig,0,0.12566
 user16,4385,343283,reconfig,0,0.12566
 user16,4386,343283,rigid,0,0.698648
 user16,4387,343283,consider_degrad,0,0.584193
-user16,4387,343283,degrad,0,0.584193
+user16,4387,343283,degrad_space,0,0.584193
 user16,4388,343284,rigid,0,0.688707
 user16,4389,343284,rigid,0,0.727079
 user16,4390,343285,consider_reconfig,0,0.119354
-- 
GitLab