From ac912167038ec19c26031f6acb5fcae3c02119dd Mon Sep 17 00:00:00 2001 From: perrotcap Date: Thu, 10 Oct 2024 16:09:04 +0200 Subject: [PATCH 1/4] deleted useless files --- ...obian_investments_profile_builder_disc.pkl | Bin 561 -> 0 bytes ...stments_profile_builder_disc_all_years.pkl | Bin 516 -> 0 bytes ...n_investments_profile_builder_disc_mix.pkl | Bin 570 -> 0 bytes ...investments_profile_builder_disc_poles.pkl | Bin 561 -> 0 bytes ...st_gradient_investments_profile_builder.py | 150 ------------------ 5 files changed, 150 deletions(-) delete mode 100644 energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc.pkl delete mode 100644 energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_all_years.pkl delete mode 100644 energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_mix.pkl delete mode 100644 energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl delete mode 100644 energy_models/tests/l1_test_gradient_investments_profile_builder.py diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc.pkl deleted file mode 100644 index 28fcb121223ee8b091dd756acdcb6a579a7025ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmZ>Y%CIzaj8qGb-0x?9k%6)6|NsAMtUOPaRz7|8cZ$>g{QJKSf4P4sp&@{Co)`5TWeseWV9!&$a~XEkA|X%pcr%48|gt+PA-gVUTqd`FHBD} z2~dB%n`iUolX9%hhp(;WyWP4jyn1q^VMSl&Z4>XC-ka^_l^p3_l$`s+Y|FuKul7!R zeD|q%WmbvfGv)-zs4W4pZ#VRP{{5wS`IReG{C_?=J^u4}mZV*B+F<(b22WtNKlE(Z!YL4|6|QxBbR3^PY`Qj8uhByj#gMt9ka- zrTO8kU$@#l?_#a7K6)f2{NRThchV;P+%bLiah}j+t`T>(KE7eg%V}z(wd%Lnro;?` z{h<<0e~tB}7$#lp?`TUg)Bm8gVA*NaWtYDc%wCboro88=`FUmAtpSz_*FLY@e0lYc zpsm}d>iMvRUjBN@;+z}f+q~Nu{}--*w|z^WmetK$w?j0!g0DAmD450Qf11ql@3GYH z+U*rlo1X1oz2o=Y@0mBsqFJ8^7QT`0OZ;|r=lOY@C%d{7`h^>w*-w679{cR}fpl|NsB28X-tQetpY1bTGeX-)4X0Pf+y$M5L$~ zApjf+5(K~jw+T=<0BNRx10Vnapa21&00uw+G&BH7L?n8KjM8Wt8USbj0LTHL13&{H z4FCgx2AXI9G5`P?000^Q0Av6ILqG&nkWq;8o|=!;BTrBb229cqQz4q3qeIjhJxvc2 zP}9A6f@p0g#A3KL!_^BZ3Ht^S zf$bW@wmw_~RC`0RI0mLz*BeRPjAG9jiTWEOz&YO_zB~hbeEJ0aM_fB$3Sm5*Ai+&= z@7NgzplEAnTDD}TAM!pR(S_adx#6~%CD6K`1iUjw^^Q zG8#RrPf&@qZ;DVrh8eO^QaV2m#8J`GMc@+=1Vo7w1!BQ95^Lo#Mu`>?)aa>%;IEBq zX`4=zDV4^DLZ#7+ct`j*hY-p+p`saEj+H30IFyJ}nR>vd>%#4t`Jfr%#V4+zyCn8-hY z{|-Rmte(FbMN&kZlV&8z$%t+a5tMO{(0`*C#*oJZiXoI`8Hvl}jxm(~i@744C`bU3 G7z6+~RMBz( diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_mix.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_mix.pkl deleted file mode 100644 index 9f385a30964cbbc140ef07ed56b5c56f8622e762..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 570 zcmV-A0>%A8T4*^jL0KkKSqZ^%>i_|c|NsB|OGN2u_;jdQmYBb9|MF|(Po0fG!l1YS z!GQ810f@i>@~9+)lA>tPGynhq&;S4fKmZv7AZWhe}cDGaE`&Ua3;|0FeXVS!LK+S2VKjwTw|%# z2N(=+s07dr^z53BnG07uG@naP*Vv^gD!eUWbUk{{wv-a!g_jI03?R4{9yFy4Zhlcy zvv{{|kZCS@>H+QVUxhH9wD8PI`MHrR5t>r8qy;p`f0adUz`S!udIkjbvc#QNA{Cc1 z&Bz!bWoksHqVTxO#jItwAvG$uo8^#K0>tXd@NpRdg#ad67DWvO{-QpG4z*Tm;pw#C*SxbK_Ps|17$ zi(|VZwAC%U8g}NCl4Ox0^md#lW&c0ciAD)h)3oioBe?C1ndv`pZ;P+tKtILYkxmpO I0&rZqz-mtTi~s-t diff --git a/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl b/energy_models/tests/jacobian_pkls/jacobian_investments_profile_builder_disc_poles.pkl deleted file mode 100644 index 60bff1e71ee432dc5323d41ec98c204a79ee0a3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 561 zcmZ>Y%CIzaj8qGb+^R6`9|Pm$|NsB5^@@4@{P)p0ks>nxpZ_m9{j|S{QEo=Vp@m%y z4oZv*4lv$fU~XVQ0g~(}Tm}XsJ~V+8-jxa+{=r|>SH65HY~0gp{S_R zVJGMAl_I_WnC5Abxs9SXMGoyffs`;oClG zZ}{KpD6Ne>=q@#@eTKTn71z}%N9SMTb~ziVY1$;U&_&~AiMXfB)D^C0yxy&m_^KRr z^1IFNEeDNQXY{+}IBF=XFIk_j!k$pnzJ9l#`3%$i+@_nF3-g|eMcS-M2;^9%J&S9i zMu7K@zSIv6+Eb=p=@2NFd5Pyu)_9}bfPiE(ZPkg4wr77@dVdlYa2E>wX&3&smJ#IYx$3EwZc;+lewNYhpdUv5o`bQJa85FOxtsRITVU&W7p?Ax%s?j lgTwqyC6k2jDo Date: Thu, 10 Oct 2024 16:09:23 +0200 Subject: [PATCH 2/4] Revert "removed energy price from clean energy price" This reverts commit 10d1278af9efe22ff1ef20e16b0c7348fe3653ab. --- .../clean_energy_simple_techno.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py index 56e5d2be..cab4cefc 100644 --- a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py +++ b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py @@ -21,4 +21,9 @@ class CleanEnergySimpleTechno(RenewableTechno): - pass + + def compute_specifif_costs_of_technos(self): + self.specific_costs = pd.DataFrame({ + GlossaryEnergy.Years: self.years, + GlossaryEnergy.ResourcesPriceValue: self.techno_infos_dict['resource_price'] + }) From 29a93d7ae4a2fe9d8273fa187a72aef810f61e26 Mon Sep 17 00:00:00 2001 From: perrotcap Date: Thu, 10 Oct 2024 16:10:59 +0200 Subject: [PATCH 3/4] revert change clean energy price --- .../clean_energy_simple_techno/clean_energy_simple_techno.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py index cab4cefc..e520aba2 100644 --- a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py +++ b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py @@ -14,10 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. ''' - +import pandas as pd from energy_models.core.techno_type.base_techno_models.renewable_techno import ( RenewableTechno, ) +from energy_models.glossaryenergy import GlossaryEnergy class CleanEnergySimpleTechno(RenewableTechno): From 0805218a76a93c135ff3949721c41b25bd7dd5eb Mon Sep 17 00:00:00 2001 From: perrotcap Date: Thu, 10 Oct 2024 17:24:58 +0200 Subject: [PATCH 4/4] ruff fix --- .../clean_energy_simple_techno/clean_energy_simple_techno.py | 1 + 1 file changed, 1 insertion(+) diff --git a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py index e520aba2..25a807ea 100644 --- a/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py +++ b/energy_models/models/clean_energy/clean_energy_simple_techno/clean_energy_simple_techno.py @@ -15,6 +15,7 @@ limitations under the License. ''' import pandas as pd + from energy_models.core.techno_type.base_techno_models.renewable_techno import ( RenewableTechno, )