diff --git a/access/__init__.py b/access/__init__.py index 30bfa03..cce0caf 100644 --- a/access/__init__.py +++ b/access/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.1.7" +__version__ = "1.1.8" """ :mod:`access` --- Accessibility Metrics ================================================= diff --git a/access/fca.py b/access/fca.py index 122d714..fee5643 100644 --- a/access/fca.py +++ b/access/fca.py @@ -214,7 +214,8 @@ def two_stage_fca(demand_df, supply_df, cost_df, max_cost = None, weight_fn = weight_fn) #create a temporary dataframe, temp, that holds the supply and aggregate demand at each location - temp = supply_df.join(total_demand_series, how = 'right', rsuffix='_W') + total_demand_series.name += "_W" + temp = supply_df.join(total_demand_series, how = 'right') #there may be NA values due to a shorter supply dataframe than the demand dataframe. #in this case, replace any potential NA values(which correspond to supply locations with no supply) with 0. @@ -303,7 +304,8 @@ def three_stage_fca(demand_df, supply_df, cost_df, max_cost, weight_fn = weight_fn, three_stage_weight = True) #create a temporary dataframe, temp, that holds the supply and aggregate demand at each location - temp = supply_df.join(total_demand_series, how = 'right', rsuffix = '_W') + total_demand_series.name += "_W" + temp = supply_df.join(total_demand_series, how = 'right') #there may be NA values due to a shorter supply dataframe than the demand dataframe. #in this case, replace any potential NA values(which correspond to supply locations with no supply) with 0.