v0.1.3 (#13)

CHANGELOG.md

@@ -1,13 +1,18 @@
 Changelog
 =========
 
+v0.1.3 (2023-08-05)
+-------------------
+
+* Remove unused imports
+* Use 8760 values for `cluster.modulation` instead of 24.
+
 v0.1.2 (2023-08-02)
 -------------------
 
 * Add `py.typed` file to avoid mypy issue in projects importing the code
 * Fix little typo inside `README.md` file.
 
-
 v0.1.1 (2023-08-02)
 -------------------
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "antares-timeseries-generation"
-version = "0.1.2"
+version = "0.1.3"
 license = {text="MPL-2.0"}
 description = 'Timeseries generation library aiming at creating input data for Antares simulator studies.'
 readme = "README.md"

sonar-project.properties

@@ -1,4 +1,4 @@
-sonar.projectVersion=0.1.2
+sonar.projectVersion=0.1.3
 sonar.organization=antaressimulatorteam
 sonar.projectKey=AntaresSimulatorTeam_antares-timeseries-generation
 sonar.sources=src

src/antares/tsgen/cluster_import.py

@@ -23,10 +23,11 @@ def import_thermal_cluster(path: Path, days_per_year: int = 365) -> ThermalClust
         "GEOMETRIC": ProbabilityLaw.GEOMETRIC,
     }
     array = np.genfromtxt(path, delimiter=",", dtype=str)
+    hourly_modulation = np.tile(array[3][1 : 24 + 1].astype(int), 365)
     return ThermalCluster(
         unit_count=int(array[1][1]),
         nominal_power=float(array[2][1]),
-        modulation=array[3][1 : 24 + 1].astype(int),
+        modulation=hourly_modulation,
         fo_law=law_dict[array[4][1]],
         fo_volatility=float(array[5][1]),
         po_law=law_dict[array[6][1]],

src/antares/tsgen/cluster_parsing.py

@@ -11,10 +11,10 @@
 # This file is part of the Antares project.
 
 from pathlib import Path
-from typing import Iterable, Optional, TextIO, Tuple
+from typing import Optional, TextIO, Tuple
 
 import pandas as pd
-from pydantic import BaseModel, Field
+from pydantic import BaseModel
 from yaml import safe_load
 
 

src/antares/tsgen/main.py

@@ -11,7 +11,6 @@
 # This file is part of the Antares project.
 import argparse
 from pathlib import Path
-from typing import List, Optional
 
 
 def main() -> None:
@@ -35,7 +34,7 @@ def main() -> None:
         "--scenario", type=int, help="number of scenario of the simulation", default=1
     )
 
-    args = parser.parse_args()
+    parser.parse_args()
 
 
 if __name__ == "__main__":

src/antares/tsgen/random_generator.py

@@ -11,7 +11,6 @@
 # This file is part of the Antares project.
 import random
 from abc import ABC, abstractmethod
-from typing import Optional
 
 from .mersenne_twister import MersenneTwister
 

src/antares/tsgen/ts_generator.py

@@ -11,7 +11,7 @@
 # This file is part of the Antares project.
 
 from dataclasses import dataclass
-from typing import List, Tuple
+from typing import Tuple
 
 import numpy as np
 import numpy.typing as npt
@@ -91,8 +91,8 @@ def _check_cluster(cluster: ThermalCluster) -> None:
     _check_1_dim(cluster.npo_min, "Minimum count of planned outages")
     _check_1_dim(cluster.npo_max, "Maximum count of planned outages")
     _check_1_dim(cluster.modulation, "Hourly modulation")
-    if len(cluster.modulation) != 24:
-        raise ValueError("hourly modulation array must have 24 values.")
+    if len(cluster.modulation) != 8760:
+        raise ValueError("hourly modulation array must have 8760 values.")
 
     _check_array(
         cluster.fo_rate < 0, "Forced failure rate is negative on following days"
@@ -419,9 +419,8 @@ def generate_time_series(
                 now = (now + 1) % log_size
 
         hourly_available_units = _daily_to_hourly(output.available_units)
-        hourly_modulation = np.tile(cluster.modulation, self.days)
         output.available_power = (
-            hourly_available_units * cluster.nominal_power * hourly_modulation
+            hourly_available_units * cluster.nominal_power * cluster.modulation
         )
 
         return output