fameio 3.2.0__py3-none-any.whl → 3.4.0__py3-none-any.whl

fameio/time.py

@@ -17,14 +17,15 @@ START_IN_REAL_TIME = "2000-01-01_00:00:00"
 DATE_FORMAT = "%Y-%m-%d_%H:%M:%S"
 DATE_REGEX = re.compile("[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}:[0-9]{2}:[0-9]{2}")
 FAME_FIRST_DATETIME = dt.datetime.strptime(START_IN_REAL_TIME, DATE_FORMAT)
+TIME_SPAN_REGEX = re.compile(r"^[0-9]+\s*[A-z]+$")
 
 
 class ConversionError(InputError, OutputError):
-    """Indicates that time stamp conversion failed"""
+    """Indicates that time stamp conversion failed."""
 
 
 class TimeUnit(Enum):
-    """Time units defined in FAME"""
+    """Time units defined in FAME."""
 
     SECONDS = auto()
     MINUTES = auto()
@@ -36,7 +37,7 @@ class TimeUnit(Enum):
 
 
 class Constants:
-    """Time steps in FAME simulations associated with corresponding TimeUnits"""
+    """Time steps in FAME simulations associated with corresponding TimeUnits."""
 
     FIRST_YEAR = 2000
     STEPS_PER_SECOND = 1
@@ -63,7 +64,7 @@ class Constants:
 
 
 class FameTime:
-    """Handles conversion of TimeSteps and TimeDurations into TimeStamps and vice versa"""
+    """Handles conversion of TimeSteps and TimeDurations into TimeStamps and vice versa."""
 
     _TIME_UNIT_UNKNOWN = "TimeUnit conversion of '{}' not implemented."
     _FORMAT_INVALID = "'{}' is not recognised as time stamp string - check its format."
@@ -71,11 +72,12 @@ class FameTime:
     _INVALID_TOO_LARGE = "Cannot convert time stamp string '{}' - last day of leap year is Dec 30th!"
     _NO_TIMESTAMP = "Time value expected, but '{}' is neither a time stamp string nor an integer."
     _INVALID_DATE_FORMAT = "Received invalid date format '{}'."
+    _INVALID_SPAN_FORMAT = "Time span must be provided in the format '<positive integer> <TimeUnit>' but was: '{}'"
+    _INVALID_TIME_UNIT = f"Time span unit '{{}}' unknown, must be one of: {[u.name for u in TimeUnit]}"
 
     @staticmethod
     def convert_datetime_to_fame_time_step(datetime_string: str) -> int:
-        """
-        Converts Datetime string to FAME time step
+        """Converts Datetime string to FAME time step.
 
         Args:
             datetime_string: a datetime in FAME formatting
@@ -101,8 +103,7 @@ class FameTime:
 
     @staticmethod
     def _convert_to_datetime(datetime_string: str) -> dt.datetime:
-        """
-        Converts given `datetime_string` in FAME formatting to real-world datetime
+        """Converts given `datetime_string` in FAME formatting to real-world datetime.
 
         Args:
             datetime_string: to be converted to datetime
@@ -120,8 +121,7 @@ class FameTime:
 
     @staticmethod
     def convert_fame_time_step_to_datetime(fame_time_steps: int, date_format: str = DATE_FORMAT) -> str:
-        """
-        Converts given `fame_time_steps` to corresponding real-world datetime string in `date_format`
+        """Converts given `fame_time_steps` to corresponding real-world datetime string in `date_format`.
 
         Args:
             fame_time_steps: an integer representing time in FAME's internal format
@@ -146,8 +146,7 @@ class FameTime:
 
     @staticmethod
     def convert_time_span_to_fame_time_steps(value: int, unit: TimeUnit) -> int:
-        """
-        Converts value of `TimeUnit.UNIT` to FAME time steps
+        """Converts value of `TimeUnit.UNIT` to FAME time steps.
 
         Args:
             value: amount of the units to be converted
@@ -164,16 +163,42 @@ class FameTime:
             return steps * value
         raise log_error(ConversionError(FameTime._TIME_UNIT_UNKNOWN.format(unit)))
 
+    @staticmethod
+    def convert_text_to_time_span(string: str) -> int:
+        """Converts given string in form of "<positive integer> <TimeUnit>" to a time span in FAME time steps.
+
+        Args:
+            string: to convert to a time span from
+
+        Returns:
+            FAME time steps equivalent of `value x unit`
+
+        Raises:
+            ConversionError: if an unknown time unit or an unsupported format is used, logged with level "ERROR"
+        """
+        string = string.strip()
+        if TIME_SPAN_REGEX.fullmatch(string) is None:
+            raise log_error(ConversionError(FameTime._INVALID_SPAN_FORMAT.format(string)))
+        multiple, unit_name = string.split()
+        unit_name = unit_name.upper()
+        if not unit_name.endswith("S"):
+            unit_name += "S"
+        try:
+            unit = TimeUnit[unit_name]
+        except KeyError as e:
+            raise log_error(ConversionError(FameTime._INVALID_TIME_UNIT.format(unit_name))) from e
+        return FameTime.convert_time_span_to_fame_time_steps(int(multiple), unit)
+
     @staticmethod
     def is_datetime(string: Any) -> bool:
-        """Returns `True` if given `string` matches Datetime string format and can be converted to FAME time step"""
+        """Returns `True` if given `string` matches Datetime string format and can be converted to FAME time step."""
         if isinstance(string, str):
             return DATE_REGEX.fullmatch(string.strip()) is not None
         return False
 
     @staticmethod
     def is_fame_time_compatible(value: int | str) -> bool:
-        """Returns `True` if given int or string `value` can be converted to a FAME time step"""
+        """Returns `True` if given int or string `value` can be converted to a FAME time step."""
         if isinstance(value, int):
             return True
         if isinstance(value, str):
@@ -182,7 +207,7 @@ class FameTime:
 
     @staticmethod
     def _is_integer(string: str) -> bool:
-        """Returns `True` if given string can be interpreted as integer"""
+        """Returns `True` if given string can be interpreted as integer."""
         try:
             int(string)
         except ValueError:
@@ -191,9 +216,10 @@ class FameTime:
 
     @staticmethod
     def convert_string_if_is_datetime(value: int | str) -> int:
-        """
-        Returns FAME time steps of given `value`. If it is a valid FAME datetime string it is converted to
-        FAME time steps, or, if given `value` is an integer, it is returned without modification.
+        """Returns FAME time steps of given `value`.
+
+        If it is a valid FAME datetime string it is converted to FAME time steps.
+        Else if given `value` is an integer, it is returned without modification.
 
         Args:
             value: to be converted
@@ -211,3 +237,15 @@ class FameTime:
             return int(value)
         except ValueError as e:
             raise log_error(ConversionError(FameTime._NO_TIMESTAMP.format(value))) from e
+
+    @staticmethod
+    def get_first_fame_time_step_of_year(year: int) -> int:
+        """Returns FAME time in integer format of first time step of given year.
+
+        Args:
+            year: to get the first time step for
+
+        Returns:
+            first time step in the requested year in integer format
+        """
+        return (year - FAME_FIRST_DATETIME.year) * Constants.STEPS_PER_YEAR

fameio/tools.py

@@ -6,25 +6,63 @@ from __future__ import annotations
 from pathlib import Path
 from typing import Any
 
+from fameio.logs import log_error
+
+CSV_FILE_SUFFIX = ".csv"
+
+_ERR_INVALID_PATTERN = "Pattern '{}' cannot be used here due to: '{}'"
+
 
 def keys_to_lower(dictionary: dict[str, Any]) -> dict[str, Any]:
-    """Returns new dictionary content of given `dictionary` but its top-level `keys` in lower case"""
+    """Returns new dictionary content of given `dictionary` but its top-level `keys` in lower case."""
     return {keys.lower(): value for keys, value in dictionary.items()}
 
 
 def ensure_is_list(value: Any) -> list:
-    """Returns a list: Either the provided `value` if it is a list, or a new list containing the provided value"""
+    """Returns a list: Either the provided `value` if it is a list, or a new list containing the provided value."""
     if isinstance(value, list):
         return value
     return [value]
 
 
 def ensure_path_exists(path: Path | str):
-    """Creates a specified path if not already existent"""
+    """Creates a specified path if not already existent."""
     Path(path).mkdir(parents=True, exist_ok=True)
 
 
 def clean_up_file_name(name: str) -> str:
-    """Returns given `name` replacing spaces and colons with underscore, and slashed with a dash"""
+    """Returns given `name` replacing spaces and colons with underscore, and slashed with a dash."""
     translation_table = str.maketrans({" ": "_", ":": "_", "/": "-"})
     return name.translate(translation_table)
+
+
+def get_csv_files_with_pattern(base_path: Path, pattern: str) -> list[Path]:
+    """Find all csv files matching the given `pattern` based on the given `base_path`.
+
+    Args:
+        base_path: to start the search from
+        pattern: to match the files against that are to be found
+
+    Returns:
+        Full file paths for files ending with ".csv" and matching the given pattern
+
+    Raises:
+        ValueError: if pattern cannot be used to search path, logged with level "ERROR"
+    """
+    try:
+        return [file for file in base_path.glob(pattern) if file.suffix.lower() == CSV_FILE_SUFFIX]
+    except NotImplementedError as e:
+        raise log_error(ValueError(_ERR_INVALID_PATTERN.format(pattern, e))) from e
+
+
+def extend_file_name(original_file: Path, appendix: str) -> Path:
+    """Return original file path, but appending `FILE_NAME_APPENDIX` before the suffix.
+
+    Args:
+        original_file: from which to derive the new path
+        appendix: to be added to the end of the file name before the suffix
+
+    Returns:
+        new file path including the appendix in the file name
+    """
+    return Path(original_file.parent, original_file.stem + appendix + original_file.suffix)

{fameio-3.2.0.dist-info → fameio-3.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fameio
-Version: 3.2.0
+Version: 3.4.0
 Summary: Tools for input preparation and output digestion of FAME models
 License: Apache-2.0
 Keywords: FAME,fameio,agent-based modelling,energy systems
@@ -47,8 +47,7 @@ SPDX-License-Identifier: Apache-2.0 -->
 *Tools for input preparation and output digestion of FAME models*
 
 FAME-Io compiles input for FAME models in protobuf format and extracts model outputs to human-readable files.
-Please visit the [FAME-Wiki](https://gitlab.com/fame-framework/wiki/-/wikis/home) to get an explanation of FAME and its
-components.
+Please visit the [FAME-Wiki](https://gitlab.com/fame-framework/wiki/-/wikis/home) to get an explanation of FAME and its components.
 
 # Installation
 
@@ -56,30 +55,26 @@ We recommend installing `fameio` using PyPI:
 
     pip install fameio
 
-You may also use `pipx`. For detailed information please refer to the
-official `pipx` [documentation](https://github.com/pypa/pipx).
+You may also use `pipx`. For detailed information please refer to the official `pipx` [documentation](https://github.com/pypa/pipx).
 
     pipx install fameio
 
-`fameio` is currently developed and tested for Python 3.8 or higher.
+`fameio` is currently developed and tested for Python 3.9 or higher.
 See the `pyproject.toml` for a complete listing of dependencies.
 
 # Usage
 
-FAME-Io currently offers two main scripts `makeFameRunConfig` and `convertFameResults`.
-Both are automatically installed with the package.
+FAME-Io currently offers two main scripts `makeFameRunConfig` and `convertFameResults`, plus a helper script `reformatTimeSeries`
+All are automatically installed with the package.
 The first one creates a protobuf file for FAME applications using YAML definition files and CSV files.
-The latter one reads output files from FAME applications in protobuf format and converts them to CSV files.
+The second one reads output files from FAME applications in protobuf format and converts them to CSV files.
+The third script reformats time series CSV files to FAME format.
 
-You may use the [example data](https://gitlab.com/dlr-ve/esy/amiris/examples) provided for
-the [AMIRIS](https://gitlab.com/dlr-ve/esy/amiris/amiris) model which can be used to simulate electricity markets
-in [Germany](https://gitlab.com/dlr-ve/esy/amiris/examples/-/tree/main/Germany2019), [Austria](https://gitlab.com/dlr-ve/esy/amiris/examples/-/tree/main/Austria2019),
-and a simple [proof-of-concept model](https://gitlab.com/dlr-ve/esy/amiris/examples/-/tree/main/Simple).
+You may use the [example data](https://gitlab.com/dlr-ve/esy/amiris/examples) provided for the [AMIRIS](https://gitlab.com/dlr-ve/esy/amiris/amiris) model which can be used to simulate electricity markets in [Germany](https://gitlab.com/dlr-ve/esy/amiris/examples/-/tree/main/Germany2019), [Austria](https://gitlab.com/dlr-ve/esy/amiris/examples/-/tree/main/Austria2019), and a simple [proof-of-concept model](https://gitlab.com/dlr-ve/esy/amiris/examples/-/tree/main/Simple).
 
 ## Make a FAME run configuration
 
-Digests configuration files in YAML format, combines them with CSV data files and creates a single input file for FAME
-applications in protobuf format.
+Digests configuration files in YAML format, combines them with CSV data files and creates a single input file for FAME applications in protobuf format.
 Call structure:
 
     makeFameRunConfig -f <path/to/scenario.yaml>
@@ -512,7 +507,7 @@ Contracts:
     ReceiverId: 2
     ProductName: ProductOfAgent_1
     FirstDeliveryTime: -25
-    DeliveryIntervalInSteps: 3600
+    Every: 3600
     Metadata:
       Some: "additional information can go here"
 
@@ -520,7 +515,7 @@ Contracts:
     ReceiverId: 1
     ProductName: ProductOfAgent_2
     FirstDeliveryTime: -22
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
     Attributes:
       ProductAppendix: value
       TimeOffset: 42
@@ -532,7 +527,8 @@ Contract Parameters:
 * `ReceiverId` unique ID of agent receiving the product
 * `ProductName` name of the product to be sent
 * `FirstDeliveryTime` first time of delivery in the format "seconds after the January 1st 2000, 00:00:00"
-* `DeliveryIntervalInSteps` delay time in between deliveries in seconds
+* `Every` delay time in between deliveries; either an integer value in seconds, or a qualified time span in the format "<integer> <TimeUnit>(s)", where TimeUnit is one of "second", "minute", "hour", "day", "week", "month", "year" - with an options "s" at the end; mind that week, month, and year refer to fixed-length intervals of 168, 730, and 8760 hours.
+* `DeliveryIntervalInSteps` deprecated; delay time in between deliveries in seconds (use instead of `Every`)
 * `Metadata` can be assigned to add further helpful information about a Contract
 * `Attributes` can be set to include additional information as `int`, `float`, `enum`, or `dict` data types
 
@@ -546,59 +542,72 @@ example:
 ```yaml
 Contracts:
   # effectively 3 similar contracts (0 -> 11), (0 -> 12), (0 -> 13)
-  # with otherwise identical ProductName, FirstDeliveryTime & DeliveryIntervalInSteps
+  # with otherwise identical ProductName, FirstDeliveryTime, and Every
   - SenderId: 0
     ReceiverId: [ 11, 12, 13 ]
     ProductName: MyOtherProduct
     FirstDeliveryTime: 100
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
 
   # effectively 3 similar contracts (1 -> 10), (2 -> 10), (3 -> 10)
-  # with otherwise identical ProductName, FirstDeliveryTime & DeliveryIntervalInSteps
+  # with otherwise identical ProductName, FirstDeliveryTime, and Every
   - SenderId: [ 1, 2, 3 ]
     ReceiverId: 10
     ProductName: MyProduct
     FirstDeliveryTime: 100
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
 
   # effectively 3 similar contracts (1 -> 11), (2 -> 12), (3 -> 13)
-  # with otherwise identical ProductName, FirstDeliveryTime & DeliveryIntervalInSteps
+  # with otherwise identical ProductName, FirstDeliveryTime, and Every
   - SenderId: [ 1, 2, 3 ]
     ReceiverId: [ 11, 12, 13 ]
     ProductName: MyThirdProduct
     FirstDeliveryTime: 100
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
 ```
 
-Combined with YAML anchors complex contract chains can be easily reduced to a minimum of required configuration.
-The following example is equivalent to the previous one and allows a quick extension of contracts to a new couple of
-agents e.g. (4;14):
+When combined with YAML anchors, the complexity of extensive contract chains can be reduced.
+The following example is equivalent to the previous one, enabling contracts to be quickly extended to a new group of agents:
 
 ```yaml
 Groups:
-  - &agentList1: [ 1,2,3 ]
-  - &agentList2: [ 11,12,13 ]
+  - &agentList1: [ 1, 2, 3 ]
+  - &agentList2: [ 11, 12, 13 ]
 
 Contracts:
   - SenderId: 0
     ReceiverId: *agentList2
     ProductName: MyOtherProduct
     FirstDeliveryTime: 100
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
 
   - SenderId: *agentList1
     ReceiverId: 10
     ProductName: MyProduct
     FirstDeliveryTime: 100
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
 
   - SenderId: *agentList1
     ReceiverId: *agentList2
     ProductName: MyThirdProduct
     FirstDeliveryTime: 100
-    DeliveryIntervalInSteps: 3600
+    Every: 1 hour
 ```
 
+Lists can be nested in senders and receivers as follows:
+
+```
+Groups:
+  - SenderId: 42
+    ReceiverId: [1, [2, 3], [4, [5]]]
+    ProductName: AnImportantProduct
+    FirstDeliveryTime: 101
+    Every: 30 minutes
+```
+
+This feature should not be overused, as nested lists can become messy and difficult to read.
+Special care should be taken when using it with an N-to-N mapping, as it will be difficult to check whether senders and receivers are matched correctly.
+
 #### StringSets
 
 This optional section defines values of type `string_set`.
@@ -644,10 +653,8 @@ TIME_SERIES inputs are not directly fed into the Scenario YAML file.
 Instead, TIME_SERIES reference a CSV file that can be stored some place else.
 These CSV files follow a specific structure:
 
-* They should contain exactly two columns - any other columns are ignored.
-  A warning is raised if more than two non-empty columns are detected.
-* The first column must be a time stamp in form `YYYY-MM-DD_hh:mm:ss` or
-  a [FAME-Timestamp](https://gitlab.com/fame-framework/wiki/-/wikis/architecture/decisions/TimeStamp) integer value.
+* They should contain exactly two columns - any other columns are ignored. A warning is raised if more than two non-empty columns are detected.
+* The first column must be a time stamp in form `YYYY-MM-DD_hh:mm:ss` or a [FAME-Timestamp](https://gitlab.com/fame-framework/wiki/-/wikis/architecture/decisions/TimeStamp) integer value.
 * The second column must be a numerical value (either integer or floating-point)
 * The separator of the two columns is a semicolon
 * The data must **not** have headers, except for comments marked with `#`
@@ -663,11 +670,10 @@ Exemplary content of a valid CSV file:
     2016-01-01_00:00:00;42  # optional comment on this particular data point
     2017-01-01_00:00:00;0.1
 
-Please refer also to the detailed article about `TimeStamps` in
-the [FAME-Wiki](https://gitlab.com/fame-framework/wiki/-/wikis/TimeStamp).
-For large CSV files (with more than 20,000 rows) we recommend using the integer representation of FAME-Timestamps in the
-first column (instead of text representation) to improve conversion speed.
+Please refer also to the detailed article about `TimeStamps` in the [FAME-Wiki](https://gitlab.com/fame-framework/wiki/-/wikis/TimeStamp).
+For large CSV files (with more than 20,000 rows) we recommend using the integer representation of FAME-Timestamps in the first column (instead of text representation) to improve conversion speed.
 A warning will be raised for very large files (exceeding 50,000 rows) that require time stamp conversion.
+Use `reformatTimeSeries` to convert one or multiple timeseries CSV files into FAME format to improve conversion speed and avoid this warning.
 
 ### Split and join multiple YAML files
 
@@ -936,6 +942,24 @@ run_config = handle_args(my_arg_string, my_defaults)
 convert_results(run_config)
 ```
 
+## Reformat time series
+
+Takes CSV time series files and reformats them into FAME time format.
+This improves speed of run configuration creation but also reduces readability of the CSV files' content.
+Thus, we recommend to apply this reformatting only for CSV time series files with more than 20,000 lines.
+
+Call structure:
+
+    reformatTimeSeries -fp <file_or_file_pattern*.csv>
+
+You may also specify any of the following arguments:
+
+| Command                       | Action                                                                                                                                                                                 |
+|-------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `-l` or `--log` <option>      | Sets the logging level. Default is `WARNING`. Options are `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`.                                                                             |
+| `-lf` or `--logfile` <file>   | Sets the logging file. Default is `None`. If `None` is provided, all logs get only printed to the console.                                                                             |
+| `--replace` or `--no-replace` | If `--replace` is specified, existing csv files are replaced with the new content. Otherwise and by default, new files are created extending the original file name by "_reformatted". |
+
 ## Cite FAME-Io
 
 If you use FAME-Io for academic work, please cite as follows.

fameio-3.4.0.dist-info/RECORD

@@ -0,0 +1,60 @@
+fameio/__init__.py,sha256=LiE7kRXW0pMIB4hTPC0T_ppGz9O0swd0Ca1-b99hOMc,229
+fameio/cli/__init__.py,sha256=YAxIBl8azJDFaKr0iGaba94UH3Xy-KhQtxrGtwz3FpM,179
+fameio/cli/convert_results.py,sha256=hSdxWFsF7Q6Z9sWRRJso-xFqxBgAyToTy32aJJnOSH4,3451
+fameio/cli/make_config.py,sha256=vfxREWB4NUf_eZior0L4cu-B3DQZAtUq5splAnN36m0,2720
+fameio/cli/options.py,sha256=WG07XKzRTat4Pk57DkdEDv0iTM7SzijrSLr7HXwRKkY,1322
+fameio/cli/parser.py,sha256=yV5YNve0Rv_cVDpZhRK-wmnXyxCJ0_587aR2c3wVCuU,10441
+fameio/cli/reformat.py,sha256=4UyxaDbT7f-nDs7crgt38s9RYXfM--bNLL4jiCtdJEw,2181
+fameio/input/__init__.py,sha256=WNyeYBuu0aQ363JX_ULUhI6OQtC123y_3k5zl1TUJS0,508
+fameio/input/loader/__init__.py,sha256=VtDJtTItjHTZ04uB30t70kRn4-ElWr2C-hj6y1_cnLs,2753
+fameio/input/loader/controller.py,sha256=lpzcn8iGgWV6wAMduE-1P7unNFvVFESX5iMj6boKI0E,7714
+fameio/input/loader/loader.py,sha256=zvsmFuK5vNOhBFwFPR2wQ-vcl-Mwip-NgTJUXpfTwYw,5321
+fameio/input/metadata.py,sha256=oV11xeI9fXyY1Qcl79mV1UyA3K4eH1751qHKAMa8cYE,6568
+fameio/input/resolver.py,sha256=NakBjnCCWRMz-8gTC_Ggx-2tXq-u6OPjfBOua0Rd2nA,1902
+fameio/input/scenario/__init__.py,sha256=Pb8O9rVOTwEo48WIgiq1kBnpovpc4D_syC6EjTFGHew,404
+fameio/input/scenario/agent.py,sha256=n0H8nHwQFfAeTwdJceJpi9VV1muYjJu_PjmzC_vrP84,5526
+fameio/input/scenario/attribute.py,sha256=pp9cquxfBUKNFwV3bTDBkDXv1k8ThBiAL6Eh-ag4kQk,11386
+fameio/input/scenario/contract.py,sha256=fv4XRMMF8X9Q1LMNJsWcPfQx-EY40gDBWsEMJ7rsaBQ,15324
+fameio/input/scenario/exception.py,sha256=o64hd7FQrkTF6Ze075Cbt4TM3OkcyJFVSi4qexLuMoU,1939
+fameio/input/scenario/fameiofactory.py,sha256=HgLHVQGKsTPEFy8K1ILB7F_lJtHoMhu89inOgDWYP5k,2800
+fameio/input/scenario/generalproperties.py,sha256=C3ND-PLb1FrCRheIBIyxXHKsZVMW8GZVHUidyInqrOw,3749
+fameio/input/scenario/scenario.py,sha256=GeS-IDYB-Q6-26QPeKQgA1-FVW90tBHHTBcfrNiwYJA,8376
+fameio/input/scenario/stringset.py,sha256=a1PehtkMVaVd1S_HCu9-3DxEWCXflzM32HDdqFZSCDY,2529
+fameio/input/schema/__init__.py,sha256=oIsJVC0hUhwJf_XIBpd1NNTR8sOWEthAy98m6uR7gKc,327
+fameio/input/schema/agenttype.py,sha256=pOXRJXpiOWDfIq7el52CcPqbnnt8lkiXtIcT_i4F_xc,5684
+fameio/input/schema/attribute.py,sha256=Q5pn2BK2QP6L0t8xI7QN5SVqylWYIfyBJoTvIoiTHkw,14901
+fameio/input/schema/java_packages.py,sha256=WlU7Vjesscqiiv8i24J1AhEwsJwG4QviC6k6QOddG24,2944
+fameio/input/schema/schema.py,sha256=5KXd1d9KxQ6JCMYqI81yOEBUX4s_uEPXM8twXzDEjaA,3851
+fameio/input/validator.py,sha256=VMgj1u-qedarKuMrD3fkBZhdYVWvYha768iEdI58Fvc,24040
+fameio/input/writer.py,sha256=XE70AysjcJgmIjepzdzYV7S3lmb4F8V0Yvs8krRzXRo,15867
+fameio/logs.py,sha256=kRaGxHjvmB2WjxKSHr-G9IoVCexkWaALzE4Mtky7Kik,4519
+fameio/output/__init__.py,sha256=ixupBH6NNsC36gL4egdS6jg1fcpH1nFqJGeAUKDrS3E,211
+fameio/output/agent_type.py,sha256=qyt7sVOo6KY1NSbe384Io9dSjXxw0KJQ-RS7TZtcgPM,6551
+fameio/output/conversion.py,sha256=qUC5Xfe8p72TKP5_PuxLnGUo2pPIevumV2PH-GB5aRA,4692
+fameio/output/csv_writer.py,sha256=WIILdfS2gk4z9LIE8Ds58_ZLA3PfglMGJrdEsk0_71k,8103
+fameio/output/data_transformer.py,sha256=mlyCrOdvVM9s-A6ROekequPif56qOaRAKvQjK86dXY0,5251
+fameio/output/execution_dao.py,sha256=w7_6a462RAF1D4URnzMGOT4aKqV9oNGAZMHZR2yLb4A,6803
+fameio/output/input_dao.py,sha256=NC9LMj9I93Ugt1BfFJH1j8sfpuO7cYXw0Ypoqa3LS7c,8460
+fameio/output/output_dao.py,sha256=1j39qH_utLEE_AYRw2aoWLAomEUgScFECDIphwYysUA,4888
+fameio/output/reader.py,sha256=uuhZnNeT1plV5iO_qkoI2L1k87WaU8uhmSUFpFnO0hI,6569
+fameio/output/yaml_writer.py,sha256=vxbJTeqBGVMao7P6_ODpv20ANtswlPYPIob9T7tn5GI,1091
+fameio/scripts/__init__.py,sha256=obt5YXd1mRl9VLswVQnLJzkkU0rbv5TbxoQoPdro3qM,1278
+fameio/scripts/__init__.py.license,sha256=2-OqCNxP4504xY2XQqseYypJi1_Qx4xJSzO3t7c3ACM,107
+fameio/scripts/convert_results.py,sha256=ML7v7XxyDW3bjCHRfG07rnudjEafpyfJSyXjfL9Bycc,7994
+fameio/scripts/convert_results.py.license,sha256=EXKiZn-aoR7nO3auGMNGk9upHbobPLHAIBYUO0S6LUg,107
+fameio/scripts/exception.py,sha256=q0tewaxn_xM1QgqSYVw_rjth2e9DPaTgWWCjDtYxjLg,236
+fameio/scripts/make_config.py,sha256=O6GghQ1M1Y6bxlaS1c9joB066SCaCWvG_V-WTFqFreU,2016
+fameio/scripts/make_config.py.license,sha256=EXKiZn-aoR7nO3auGMNGk9upHbobPLHAIBYUO0S6LUg,107
+fameio/scripts/reformat.py,sha256=jYJsl0UkXtZyn2GyA-QVAARilkHa_ZBWa5CGNIGNDuo,2850
+fameio/scripts/reformat.py.license,sha256=EXKiZn-aoR7nO3auGMNGk9upHbobPLHAIBYUO0S6LUg,107
+fameio/series.py,sha256=ipjDsDmgVlVzaYvXwXcWM8fpCy5w8hTNWTi4hPmvOuM,13654
+fameio/time.py,sha256=S8TagfGA7B44JPkj8YfC3ftkxODNTC6ZXELNQyHC1VA,10201
+fameio/tools.py,sha256=metmgKuZ0lubmTIPY3w_ertDxSLQtHIa6OlpcapyIk4,2478
+fameio-3.4.0.dist-info/entry_points.txt,sha256=IUbTceB_CLFOHulubEf9jgiCFsV2TchlzCssmjbiOKI,176
+fameio-3.4.0.dist-info/LICENSE.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
+fameio-3.4.0.dist-info/LICENSES/Apache-2.0.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
+fameio-3.4.0.dist-info/LICENSES/CC-BY-4.0.txt,sha256=y9WvMYKGt0ZW8UXf9QkZB8wj1tjJrQngKR7CSXeSukE,19051
+fameio-3.4.0.dist-info/LICENSES/CC0-1.0.txt,sha256=9Ofzc7m5lpUDN-jUGkopOcLZC3cl6brz1QhKInF60yg,7169
+fameio-3.4.0.dist-info/METADATA,sha256=qRURN8lvabRE9CmzKRuwsoi_1rKyv71TGkkdLJUAydE,42374
+fameio-3.4.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+fameio-3.4.0.dist-info/RECORD,,

{fameio-3.2.0.dist-info → fameio-3.4.0.dist-info}/entry_points.txt

@@ -1,4 +1,5 @@
 [console_scripts]
 convertFameResults=fameio.scripts:convertFameResults
 makeFameRunConfig=fameio.scripts:makeFameRunConfig
+reformatTimeSeries=fameio.scripts:reformatTimeSeries
 

fameio-3.2.0.dist-info/RECORD

@@ -1,56 +0,0 @@
-fameio/__init__.py,sha256=LiE7kRXW0pMIB4hTPC0T_ppGz9O0swd0Ca1-b99hOMc,229
-fameio/cli/__init__.py,sha256=YAxIBl8azJDFaKr0iGaba94UH3Xy-KhQtxrGtwz3FpM,179
-fameio/cli/convert_results.py,sha256=ix5pcmci8GG6q5JTteA9m-na1YmyJTqOuqfEs5CSKGE,3460
-fameio/cli/make_config.py,sha256=-kw6-I4mFU5NRi2MjKhnRzU9WxEqGNlrzjX6lHr9Wpo,2734
-fameio/cli/options.py,sha256=k_bVfVo8GEoqJzLLfzVpfrol51IA9AWjIGASQsATruY,1269
-fameio/cli/parser.py,sha256=8T3FRpeiBm-6VkILTd_XVatFYpopiZjFRGNSs_l35Vo,8909
-fameio/input/__init__.py,sha256=73a3vchTU9c--1uJcJTTaB8CGajnTD-ufraQjNtzh8k,504
-fameio/input/loader/__init__.py,sha256=yo-sEnI7i0puMpKHENw9zaNq6VfYDLVyw6T0GXiOu6Q,2715
-fameio/input/loader/controller.py,sha256=yb7lLc3KDBzdZ7myZ6Q6FPBwX3DkSfHU7f8ArtAbcuI,7769
-fameio/input/loader/loader.py,sha256=uxIt6lwPuo6gpme-BA-W6eLayVic9cH5m6M7ZnJ-xGk,5324
-fameio/input/metadata.py,sha256=vaDSKmk433XMvZhehAU60LdASEhrs29mp1zpQJ0NffY,6544
-fameio/input/resolver.py,sha256=RK6X4mSv2OPEO_ZXc6VJWN0pfvA0okkSse7fHuCOVP0,1920
-fameio/input/scenario/__init__.py,sha256=Pb8O9rVOTwEo48WIgiq1kBnpovpc4D_syC6EjTFGHew,404
-fameio/input/scenario/agent.py,sha256=D2rt94jNqoCpvVDVa2TUXrxw2D_L9dCzOOGXleDVQE8,5451
-fameio/input/scenario/attribute.py,sha256=T7eTDU80HFAVZqpjkh1W7-PSnE9epQZ_gdLTMHdeEv4,9720
-fameio/input/scenario/contract.py,sha256=H6XWbVUmRJzpAfWMFW7R4f8upuYAWtEumUOy-Rqx-Uk,13174
-fameio/input/scenario/exception.py,sha256=uZSiudjgQ0cwIDJPJoowsTRJxm6MmcobEOpzSDDZfUI,1944
-fameio/input/scenario/fameiofactory.py,sha256=-LHVHirqa_TXA0RvABRQSV_tM--VTYtDpWlt4K9kmIw,2847
-fameio/input/scenario/generalproperties.py,sha256=gEiOPN0vRDy0ChsN4aG7D5GyKVfTTEAl6G7ZIoVLfgc,3751
-fameio/input/scenario/scenario.py,sha256=9jdJ37MFSUoklAyVi2q_4719o8vcHXtAQCig2B3mkiY,8396
-fameio/input/scenario/stringset.py,sha256=qm2C8HTWVcZIf20gj456FpTfkD1fVu6icoc4NpkMJ5w,2534
-fameio/input/schema/__init__.py,sha256=oIsJVC0hUhwJf_XIBpd1NNTR8sOWEthAy98m6uR7gKc,327
-fameio/input/schema/agenttype.py,sha256=vouiTB_p63y1ceXZXpsUaGdh6QLx_TroFA7peoTcgIE,5699
-fameio/input/schema/attribute.py,sha256=XpCfbZybuftLv5iQlsoJQ99MJEdNt3sGu38gxuJ_V8s,14916
-fameio/input/schema/java_packages.py,sha256=nbvOcj1P0GPyKDQFwK7fO0rS16ElOd7YPEKt5qteYF0,2948
-fameio/input/schema/schema.py,sha256=D6mkCm1CjNxe4xPATkaFf9hqfX9fbBRtbZp3gb8lqLE,3844
-fameio/input/validator.py,sha256=gDAW51la4p3kzjoWbL1G_Hjoab1d5hYFD88rMOfUKSs,19213
-fameio/input/writer.py,sha256=QUd1m3a-xMlgoWoO1JTrFG2IVWst-gVh9ZSa4XAIhtA,15937
-fameio/logs.py,sha256=idBSshztqzXQM92yZWDIB9pNAUMQIsY4JyRh2fqdXz0,4252
-fameio/output/__init__.py,sha256=ixupBH6NNsC36gL4egdS6jg1fcpH1nFqJGeAUKDrS3E,211
-fameio/output/agent_type.py,sha256=2GGDzyMRNIn7B8fzwwx_6TSwRkDTEA6w5eHs67ck3jM,6462
-fameio/output/conversion.py,sha256=Zps-U1SMvRkYGtTm3T2EYbjmmpKYvV5XoI_sxiYto0I,4676
-fameio/output/csv_writer.py,sha256=Ye26DZ0A_xDvOTi0zPQp7MqtfIibQqWYrNaypI67c0o,7602
-fameio/output/data_transformer.py,sha256=haQFtuiplfndfG5uAZjiEf39zeOhRXVV8ZXH0-PLEfU,5250
-fameio/output/input_dao.py,sha256=PZuZO6FpcVsTvOhr4JLiC0oHW2lSkongtUDmfmr2nCg,8432
-fameio/output/output_dao.py,sha256=slKQJM--dlyr48ZaHp6fsmsyxaokPGSizQETbM7S2as,4890
-fameio/output/reader.py,sha256=fiitnvTGLv4uEz4GT2-2UdCZRlj_AOUrQqQA_8irOaU,6599
-fameio/output/yaml_writer.py,sha256=vuXqbCsO5yvKJreoEbI7qiMg1rNEkhGzK9XYZiMmDTs,1095
-fameio/scripts/__init__.py,sha256=9HlariFV2QOJ69XIJtLSIyKBBGmJN2Vgih3r1K7Ln5Y,937
-fameio/scripts/__init__.py.license,sha256=2-OqCNxP4504xY2XQqseYypJi1_Qx4xJSzO3t7c3ACM,107
-fameio/scripts/convert_results.py,sha256=2k9cYh1rzA5ukfQEbrGH8GIK86v7z8PyS0FNRHx-sVY,7694
-fameio/scripts/convert_results.py.license,sha256=EXKiZn-aoR7nO3auGMNGk9upHbobPLHAIBYUO0S6LUg,107
-fameio/scripts/exception.py,sha256=sgGGTIVKUzflp0J7H4lEsPBgALHqZ898BILeCVrJRzs,235
-fameio/scripts/make_config.py,sha256=htGUKVUJtTL6i8kF1PJPGZEGJCqPvNKoW-dMg0BLhrE,2021
-fameio/scripts/make_config.py.license,sha256=EXKiZn-aoR7nO3auGMNGk9upHbobPLHAIBYUO0S6LUg,107
-fameio/series.py,sha256=P5DvPOwzZxN5h4b0LFSqT0xw8WSqHXtb9-bp3j_povA,12192
-fameio/time.py,sha256=-rF7-XEDgbvDmIL3nGSpOtJwtjfa05jfCysnyepQ2Wo,8458
-fameio/tools.py,sha256=SsPWTeqc2vS4_F4bBkLXY2LX5fp6ITe0f2FTxkejmlY,1104
-fameio-3.2.0.dist-info/entry_points.txt,sha256=jvQVfwJjZXPWQjJlhj1Dt6PTeblryTc1GxjKeK90twI,123
-fameio-3.2.0.dist-info/LICENSE.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
-fameio-3.2.0.dist-info/LICENSES/Apache-2.0.txt,sha256=eGHBZnhr9CWjE95SWjRfmhtK1lvVn5X4Fpf3KrrAZDg,10391
-fameio-3.2.0.dist-info/LICENSES/CC-BY-4.0.txt,sha256=y9WvMYKGt0ZW8UXf9QkZB8wj1tjJrQngKR7CSXeSukE,19051
-fameio-3.2.0.dist-info/LICENSES/CC0-1.0.txt,sha256=9Ofzc7m5lpUDN-jUGkopOcLZC3cl6brz1QhKInF60yg,7169
-fameio-3.2.0.dist-info/METADATA,sha256=2k0dbtDQhG3ep0HyXlt8UQf0Xy1b4kc-ysGL--Etp6I,39946
-fameio-3.2.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-fameio-3.2.0.dist-info/RECORD,,