improvements:

- added the dell equivalent machines to the graph to see how they compare
- updated the price of electricity

concho/procs_chooser.py

@@ -109,7 +109,7 @@ class ConfigFlopsPerEuro(ConfigAxisDef):
         return u'num total DP operations/total cost [€/^-1]'
 
     def get_value_for_config(self, config):
-        kWHPrice = 0.07 * 1.5
+        kWHPrice = 0.30   # from yjuet on 20/01/2023 : 300€/MWh
         containerLifetime = 7.0  # in years
         powerUsageEfficiency = 0.5
 
@@ -166,7 +166,7 @@ def plot_configs(configs, xaxis_def, yaxis_def, plot_title):
             'dell-poweredge-c6320': 1.0,
             'dell-poweredge-c6420': 1.0,
             'dell-precision-3630': 0.2,
-            'hpe-proliant-dl360-gen10': 0.6
+            'hpe-proliant-dl360-gen10': 0.55
         }[model]
         value = 0.9
         return matplotlib.colors.hsv_to_rgb((hue, saturation, value))
@@ -213,7 +213,7 @@ def plot_configs(configs, xaxis_def, yaxis_def, plot_title):
     plt.minorticks_on()
     plt.grid(b=True, which='major', color='b', linestyle='-', linewidth=0.5)
     plt.grid(b=True, which='minor', color='b', linestyle='-', linewidth=0.2)    
-    plt.legend(bbox_to_anchor=(1.1, 1.1), ncol=3)
+    plt.legend(bbox_to_anchor=(1.1, 1.1), ncol=2)
     plt.draw()
 
     plt.show()

tests/test1.py

@@ -75,7 +75,8 @@ def test_credits_2021_configs():
 
 def test_ur1_presents_2023_configs():
     configurators = [
-        MatinfoConfigurator('20230120-cat2-conf3-hpe-dl360.html', HpeConfiguratorParser()),
+        MatinfoConfigurator('20210407 - Cat2 Conf4 PowerEdge R640 - Dell.html', DellConfiguratorParser2021()),
+        MatinfoConfigurator('20230120-cat2-conf3-hpe-dl360-gen10.html', HpeConfiguratorParser()),
     ]
 
     def config_filter(config):