Merge pull request #441 from GermanZero-de/ags-check-default-year-to-…

…2021

change default year to 2021 and use correct ags master

commands/arguments.py

@@ -17,7 +17,7 @@
 
 class DynamicChoicesAction(argparse.Action):
     def __call__(self, parser, namespace, values, option_string=None):
-        year_ref = getattr(namespace, "year_ref", 2018)  # Default to 2018 if not set
+        year_ref = getattr(namespace, "year_ref", 2021)  # Default to 2021 if not set
         ags_master = RefData.load(int(year_ref)).ags_master()
         if values not in ags_master:
             raise argparse.ArgumentError(

src/climatevision/generator/refdata.py

@@ -4,11 +4,11 @@
 
 # pyright: strict
 
-from dataclasses import dataclass
-from typing import Generic, TypeVar, Callable, Iterable
-from os import path, getcwd
 import csv
 import json
+from dataclasses import dataclass
+from os import getcwd, path
+from typing import Callable, Generic, Iterable, TypeVar
 
 from .years import YEAR_REF_CHOICES
 
@@ -789,7 +789,7 @@ def load(
         population_0_columns = ["total"] if fix_missing_entries else []
         d = cls(
             year_ref=year_ref,
-            ags_master=DataFrame.load_ags(datadir, "ags", filename="master"),  # type: ignore
+            ags_master=DataFrame.load_ags(datadir, "ags", filename=filename(year_ref, "ags")),  # type: ignore
             area=load_data_frame_ags(
                 datadir, year_ref, "area", set_nans_to_0_in_columns=area_0_columns
             ),
@@ -835,8 +835,7 @@ def load(
             industry_dehst=load_data_frame_ags(datadir, year_ref, "industry_facilites"),
             fix_missing_entries=fix_missing_entries,
         )
-        from . import calculate_derived_facts
-        from . import calculate_derived_assumptions
+        from . import calculate_derived_assumptions, calculate_derived_facts
 
         calculate_derived_facts.calculate_derived_facts(d)
         calculate_derived_assumptions.calculate_derived_assumptions(d)

src/climatevision/generator/years.py

@@ -1,4 +1,4 @@
-YEAR_REF_DEFAULT = 2018
+YEAR_REF_DEFAULT = 2021
 YEAR_REF_CHOICES = [2018, 2021]
 YEAR_REF_HELP = "year of the reference data"