diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d4bd5dcc..ce219478f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [0.9.2] - 2021-04-22 + +### Fixed +- Manual and pyincore-viz links in documentation [INCORE1-1122](https://opensource.ncsa.illinois.edu/jira/browse/INCORE1-1122) +- Relationship between dsf and huestimate variables in Population dislocation analysis [INCORE1-1123](https://opensource.ncsa.illinois.edu/jira/browse/INCORE1-1123) + ## [0.9.1] - 2021-04-09 ### Added - Support bridge hurricane damage and calculation from refactored fragility curves [INCORE1-1058](https://opensource.ncsa.illinois.edu/jira/browse/INCORE1-1058) diff --git a/docs/source/conf.py b/docs/source/conf.py index f89ed554f..a9c496f1d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -33,9 +33,9 @@ author = '' # The short X.Y version -version = '0.9.1' +version = '0.9.2' # The full version, including alpha/beta/rc tags -release = '0.9.1' +release = '0.9.2' # -- General configuration --------------------------------------------------- diff --git a/pyincore/analyses/populationdislocation/populationdislocation.py b/pyincore/analyses/populationdislocation/populationdislocation.py index 753c0b2a8..13c93fff8 100644 --- a/pyincore/analyses/populationdislocation/populationdislocation.py +++ b/pyincore/analyses/populationdislocation/populationdislocation.py @@ -147,7 +147,7 @@ def get_dislocation(self, seed_i: int, inventory: pd.DataFrame, value_loss: pd.D # pd.Series to np.array # creats d_sf column it if it does not exist, overwrites d_sf values if it does if "huestimate" in inventory.columns: - inventory["d_sf"] = (inventory["huestimate"] > 1).astype(int) + inventory["d_sf"] = (inventory["huestimate"] == 1).astype(int) elif "huestimate_x" in inventory.columns: inventory = PopulationDislocationUtil.compare_columns(inventory, "huestimate_x", @@ -155,7 +155,7 @@ def get_dislocation(self, seed_i: int, inventory: pd.DataFrame, value_loss: pd.D if "huestimate_x-huestimate_y" in inventory.columns: exit("Column huestimate is ambiguous, check the input datasets!") else: - inventory["d_sf"] = (inventory["huestimate"] > 1).astype(int) + inventory["d_sf"] = (inventory["huestimate"] == 1).astype(int) # drop d_sf_x, d_sf_y if they exist if "d_sf_x" in inventory.columns: @@ -163,6 +163,7 @@ def get_dislocation(self, seed_i: int, inventory: pd.DataFrame, value_loss: pd.D if "d_sf_y" in inventory.columns: inventory = inventory.drop(columns=["d_sf_y"]) dsf = inventory["d_sf"].values + hue = inventory["huestimate"].values.astype(int) pbd = inventory["pblackbg"].values phd = inventory["phispbg"].values diff --git a/pyincore/globals.py b/pyincore/globals.py index e6028e7eb..c24625204 100644 --- a/pyincore/globals.py +++ b/pyincore/globals.py @@ -10,7 +10,7 @@ import os import shutil -PACKAGE_VERSION = "0.9.1" +PACKAGE_VERSION = "0.9.2" INCORE_API_PROD_URL = "https://incore.ncsa.illinois.edu" INCORE_API_DEV_URL = "https://incore-dev.ncsa.illinois.edu" diff --git a/setup.py b/setup.py index 49056b84b..6f7497890 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setup( name='pyincore', - version='0.9.1', + version='0.9.2', packages=find_packages(where=".", exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), include_package_data=True, package_data={