Fix commodity price calculations

docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv

@@ -18,70 +18,70 @@ A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030
 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030
-A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030
 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030
 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030
 A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035
 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035
 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035
 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035
-A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035
 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035
 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035
 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035
 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
-A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035
 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035
-A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035
 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040
 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040
 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040
 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040
-A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040
 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040
 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040
+A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
-A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040
-A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045
 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045
 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045
 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045
-A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045
 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045
 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045
-A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
+A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
-A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045
-A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
@@ -90,24 +90,24 @@ A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050
 A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050
-A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050
+A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
-A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,0.90630000000,R1,2045,R1,power,windturbine,newcapa,2050
 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050
 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050
-A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
-A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050
+A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
+A2,2.40630000000,R1,2045,R1,power,windturbine,newcapa,2050
 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
-A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050
 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
 A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
 A1,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050
 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050
-A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050
 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050
 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
 A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050