Feature/link capacity added

README.md

@@ -41,9 +41,10 @@ rng = MersenneTwisterRNG()
 ```
 
 Then perform the timeseries generation:
+
 ```python
 generator = ThermalDataGenerator(rng=rng, days=days)
-results = generator.generate_time_series(cluster, 1)
+results = generator.generate_time_series_for_clusters(cluster, 1)
 ```
 
 The actual timeseries for the total available power of the cluster are available in

requirements-dev.txt

@@ -4,5 +4,5 @@ matplotlib>=3.5.1
 mypy~=1.7.1
 pandas-stubs
 pytest-cov
-pytest~=7.0.0
+pytest~=8.3.3
 types-PyYAML

requirements.txt

@@ -1,4 +1,6 @@
 numpy==1.24.4
-pandas
-pydantic
-PyYAML
+pandas~=2.2.3
+pydantic~=2.9.2
+PyYAML~=6.0.2
+pytest~=8.3.3
+matplotlib~=3.9.2

src/antares/tsgen/cluster_import.py

@@ -14,7 +14,7 @@
 
 import numpy as np
 
-from .ts_generator import ProbabilityLaw, ThermalCluster
+from .ts_generator import OutageGenerationParameters, ProbabilityLaw, ThermalCluster
 
 
 def import_thermal_cluster(path: Path, days_per_year: int = 365) -> ThermalCluster:
@@ -24,10 +24,8 @@ def import_thermal_cluster(path: Path, days_per_year: int = 365) -> ThermalClust
     }
     array = np.genfromtxt(path, delimiter=",", dtype=str)
     hourly_modulation = np.tile(array[3][1 : 24 + 1].astype(int), 365)
-    return ThermalCluster(
+    outage_gen_params = OutageGenerationParameters(
         unit_count=int(array[1][1]),
-        nominal_power=float(array[2][1]),
-        modulation=hourly_modulation,
         fo_law=law_dict[array[4][1]],
         fo_volatility=float(array[5][1]),
         po_law=law_dict[array[6][1]],
@@ -39,3 +37,8 @@ def import_thermal_cluster(path: Path, days_per_year: int = 365) -> ThermalClust
         npo_min=array[12][1 : days_per_year + 1].astype(int),
         npo_max=array[13][1 : days_per_year + 1].astype(int),
     )
+    return ThermalCluster(
+        outage_gen_params,
+        nominal_power=float(array[2][1]),
+        modulation=hourly_modulation,
+    )

src/antares/tsgen/cluster_resolve.py

@@ -13,7 +13,7 @@
 import pandas as pd
 
 from .cluster_parsing import InputCluster
-from .ts_generator import ProbabilityLaw, ThermalCluster
+from .ts_generator import OutageGenerationParameters, ProbabilityLaw, ThermalCluster
 
 
 def resolve_thermal_cluster(
@@ -25,10 +25,8 @@ def resolve_thermal_cluster(
         "UNIFORM": ProbabilityLaw.UNIFORM,
         "GEOMETRIC": ProbabilityLaw.GEOMETRIC,
     }
-    return ThermalCluster(
+    outage_gen_params = OutageGenerationParameters(
         unit_count=parsed_yaml.unit_count,
-        nominal_power=parsed_yaml.nominal_power,
-        modulation=modulation["modulation"].to_numpy(dtype=float),
         fo_law=law_dict[parsed_yaml.fo_law],
         fo_volatility=parsed_yaml.fo_volatility,
         po_law=law_dict[parsed_yaml.po_law],
@@ -40,3 +38,8 @@ def resolve_thermal_cluster(
         npo_min=parameters_ts["POMax"].to_numpy(dtype=int),
         npo_max=parameters_ts["POMin"].to_numpy(dtype=int),
     )
+    return ThermalCluster(
+        outage_gen_params,
+        nominal_power=parsed_yaml.nominal_power,
+        modulation=modulation["modulation"].to_numpy(dtype=float),
+    )