From 49b6e0938197c612de0e226398c83f4473091159 Mon Sep 17 00:00:00 2001 From: Patrick Herring Date: Tue, 31 Mar 2020 08:53:22 -0700 Subject: [PATCH] v2020.3.31 release --- CHANGES.md | 9 +++++++++ beep/__init__.py | 2 +- ...06-30_2C-10per_6C_CH10_full_model_multi_features.json | 2 +- beep/utils/retrigger.py | 7 ++++--- setup.py | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index f6fd46fd..37c7ff4b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,14 @@ +v2020.3.31 +---------- +* Add appveyor integration and fix path problems to allow windows compatibility - Thanks to Joseph Montoya +* Update the rest to increment by 12 min per protocol +* add cumulative capacity to summary stats +* Update the template file to change lower safety voltage to 2.0V +* add charge energy and discharge energy to the biologic parser +* add method for biologic file parsing + v2020.3.19 ---------- * add cumulative capacity to summary stats diff --git a/beep/__init__.py b/beep/__init__.py index 22b0626d..c50d7282 100644 --- a/beep/__init__.py +++ b/beep/__init__.py @@ -21,7 +21,7 @@ # Versioning. The python code version is frequently tagged # with a commit hash from the repo, which is supplied via # an environment variable by the integration build procedure -__version__ = "2020.3.18" +__version__ = "2020.3.31" VERSION_TAG = os.environ.get("BEEP_VERSION_TAG") if VERSION_TAG is not None: __version__ = '-'.join([__version__, VERSION_TAG]) diff --git a/beep/tests/test_files/2017-06-30_2C-10per_6C_CH10_full_model_multi_features.json b/beep/tests/test_files/2017-06-30_2C-10per_6C_CH10_full_model_multi_features.json index d6133316..e4094dca 100644 --- a/beep/tests/test_files/2017-06-30_2C-10per_6C_CH10_full_model_multi_features.json +++ b/beep/tests/test_files/2017-06-30_2C-10per_6C_CH10_full_model_multi_features.json @@ -1 +1 @@ -{"@module": "beep.featurize", "@class": "DegradationPredictor", "name": "full_model", "X": {"discharge_capacity_cycle_2": [1.06918], "max_discharge_capacity_difference": [0.8851966], "discharge_capacity_cycle_100": [0.96991605], "integrated_time_temperature_cycles_1:100": [222726.94174602136], "charge_time_cycles_1:5": [612.3784400000004], "abs_min_discharge_capacity_difference_cycles_2:100": [-0.7348436256906956], "abs_mean_discharge_capacity_difference_cycles_2:100": [-1.1053494691021108], "abs_variance_discharge_capacity_difference_cycles_2:100": [-2.221331230186896], "abs_skew_discharge_capacity_difference_cycles_2:100": [-0.833268529824358], "abs_kurtosis_discharge_capacity_difference_cycles_2:100": [0.25659684973168734], "abs_first_discharge_capacity_difference_cycles_2:100": [-0.9555498187487086], "max_temperature_cycles_1:100": [38.543324], "min_temperature_cycles_1:100": [27.851921], "slope_discharge_capacity_cycle_number_2:100": [-0.0010792954789115617], "intercept_discharge_capacity_cycle_number_2:100": [1.0836943592991142], "slope_discharge_capacity_cycle_number_91:100": [-0.0013609268484848626], "intercept_discharge_capacity_cycle_number_91:100": [1.1050065801818196], "min_internal_resistance_cycles_2:100": [0.016267318], "internal_resistance_cycle_2": [0.017852232], "internal_resistance_difference_cycles_2:100": [-0.0009825359999999991]}, "feature_labels": ["discharge_capacity_cycle_2", "max_discharge_capacity_difference", "discharge_capacity_cycle_100", "integrated_time_temperature_cycles_1:100", "charge_time_cycles_1:5", "abs_min_discharge_capacity_difference_cycles_2:100", "abs_mean_discharge_capacity_difference_cycles_2:100", "abs_variance_discharge_capacity_difference_cycles_2:100", "abs_skew_discharge_capacity_difference_cycles_2:100", "abs_kurtosis_discharge_capacity_difference_cycles_2:100", "abs_first_discharge_capacity_difference_cycles_2:100", "max_temperature_cycles_1:100", "min_temperature_cycles_1:100", "slope_discharge_capacity_cycle_number_2:100", "intercept_discharge_capacity_cycle_number_2:100", "slope_discharge_capacity_cycle_number_91:100", "intercept_discharge_capacity_cycle_number_91:100", "min_internal_resistance_cycles_2:100", "internal_resistance_cycle_2", "internal_resistance_difference_cycles_2:100"], "predict_only": false, "prediction_type": "multi", "nominal_capacity": 1.0628421000000001, "y": {"capacity_0.98": [44], "capacity_0.95": [71], "capacity_0.92": [94], "capacity_0.89": [114], "capacity_0.86": [132], "capacity_0.83": [147], "capacity_0.8": [161]}, "@version": "2020.3.5"} \ No newline at end of file +{"@module": "beep.featurize", "@class": "DegradationPredictor", "name": "full_model", "X": {"discharge_capacity_cycle_2": [1.06918], "max_discharge_capacity_difference": [0.8851966], "discharge_capacity_cycle_100": [0.96991605], "integrated_time_temperature_cycles_1:100": [222726.94174602136], "charge_time_cycles_1:5": [612.3784400000004], "abs_min_discharge_capacity_difference_cycles_2:100": [-0.7348436256906956], "abs_mean_discharge_capacity_difference_cycles_2:100": [-1.1053494691021108], "abs_variance_discharge_capacity_difference_cycles_2:100": [-2.221331230186896], "abs_skew_discharge_capacity_difference_cycles_2:100": [-0.833268529824358], "abs_kurtosis_discharge_capacity_difference_cycles_2:100": [0.25659684973168734], "abs_first_discharge_capacity_difference_cycles_2:100": [-0.9555498187487086], "max_temperature_cycles_1:100": [38.543324], "min_temperature_cycles_1:100": [27.851921], "slope_discharge_capacity_cycle_number_2:100": [-0.0010792954789115617], "intercept_discharge_capacity_cycle_number_2:100": [1.0836943592991142], "slope_discharge_capacity_cycle_number_91:100": [-0.0013609268484848626], "intercept_discharge_capacity_cycle_number_91:100": [1.1050065801818196], "min_internal_resistance_cycles_2:100": [0.016267318], "internal_resistance_cycle_2": [0.017852232], "internal_resistance_difference_cycles_2:100": [-0.0009825359999999991]}, "feature_labels": ["discharge_capacity_cycle_2", "max_discharge_capacity_difference", "discharge_capacity_cycle_100", "integrated_time_temperature_cycles_1:100", "charge_time_cycles_1:5", "abs_min_discharge_capacity_difference_cycles_2:100", "abs_mean_discharge_capacity_difference_cycles_2:100", "abs_variance_discharge_capacity_difference_cycles_2:100", "abs_skew_discharge_capacity_difference_cycles_2:100", "abs_kurtosis_discharge_capacity_difference_cycles_2:100", "abs_first_discharge_capacity_difference_cycles_2:100", "max_temperature_cycles_1:100", "min_temperature_cycles_1:100", "slope_discharge_capacity_cycle_number_2:100", "intercept_discharge_capacity_cycle_number_2:100", "slope_discharge_capacity_cycle_number_91:100", "intercept_discharge_capacity_cycle_number_91:100", "min_internal_resistance_cycles_2:100", "internal_resistance_cycle_2", "internal_resistance_difference_cycles_2:100"], "predict_only": false, "prediction_type": "multi", "nominal_capacity": 1.0628421000000001, "y": {"capacity_0.98": [44], "capacity_0.95": [71], "capacity_0.92": [94], "capacity_0.89": [114], "capacity_0.86": [132], "capacity_0.83": [147], "capacity_0.8": [161]}, "@version": "2020.3.18"} \ No newline at end of file diff --git a/beep/utils/retrigger.py b/beep/utils/retrigger.py index 4e93936d..6c64c6b4 100644 --- a/beep/utils/retrigger.py +++ b/beep/utils/retrigger.py @@ -80,11 +80,11 @@ def scan(config): # print(db_objects) # print(len([obj for obj in objects if obj['Key'] not in db_objects])) # objects = [obj for obj in objects if obj['Key'] not in db_objects] - objects = [obj for obj in objects if "PredictionDiagnostics" in obj['Key'] + objects = [obj for obj in objects if "PreDiag" in obj['Key'] and "x" not in obj['Key'] and "Complete" not in obj['Key'] - # and obj['LastModified'] < datetime.datetime(2020, 2, 15, 5, 35, 43, tzinfo=tzutc())] - and "_000128_" in obj['Key'] + # and obj['LastModified'] < datetime.datetime(2020, 3, 24, 5, 35, 43, tzinfo=tzutc()) + and "_000260_" in obj['Key'] ] print(len(objects)) @@ -99,6 +99,7 @@ def scan(config): } events.put_upload_retrigger_event('complete', retrigger_data) print(retrigger_data) + time.sleep(1) if __name__ == "__main__": diff --git a/setup.py b/setup.py index 0598b4b9..f000bf16 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup(name="beep", url="https://github.com/TRI-AMDD/beep", - version="2020.3.18", + version="2020.3.31", description=DESCRIPTION, long_description=LONG_DESCRIPTION, long_description_content_type='text/markdown',