ecopipeline 0.6.3__tar.gz → 0.6.5__tar.gz

{ecopipeline-0.6.3/src/ecopipeline.egg-info → ecopipeline-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ecopipeline
-Version: 0.6.3
+Version: 0.6.5
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)

{ecopipeline-0.6.3 → ecopipeline-0.6.5}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = ecopipeline
-version = 0.6.3
+version = 0.6.5
 authors = ["Carlos Bello, <bellocarlos@seattleu.edu>, Emil Fahrig <fahrigemil@seattleu.edu>, Casey Mang <cmang@seattleu.edu>, Julian Harris <harrisjulian@seattleu.edu>, Roger Tram <rtram@seattleu.edu>, Nolan Price <nolan@ecotope.com>"]
 description = Contains functions for use in Ecotope Datapipelines
 long_description = file: README.md

{ecopipeline-0.6.3 → ecopipeline-0.6.5}/src/ecopipeline/transform/transform.py

@@ -557,9 +557,12 @@ def cop_method_2(df: pd.DataFrame, cop_tm, cop_primary_column_name) -> pd.DataFr
     sum_power_in_df = pd.DataFrame({'PowerIn_Primary': df[sum_primary_cols].sum(axis=1),
                                     'PowerIn_TM': df[sum_tm_cols].sum(axis=1)
                                     })
-
     df['COP_DHWSys_2'] = (df[cop_primary_column_name] * (sum_power_in_df['PowerIn_Primary']/df['PowerIn_Total'])) + (cop_tm * (sum_power_in_df['PowerIn_TM']/df['PowerIn_Total']))
-
+    # NULLify incomplete calculations
+    sum_power_in_df.loc[df[sum_primary_cols].isna().any(axis=1), "PowerIn_Primary"] = np.nan
+    sum_power_in_df.loc[df[sum_tm_cols].isna().any(axis=1), "PowerIn_TM"] = np.nan
+    df.loc[df[sum_primary_cols+sum_tm_cols].isna().any(axis=1), "COP_DHWSys_2"] = np.nan
+    
     return df
 
 def convert_on_off_col_to_bool(df: pd.DataFrame, column_names: list) -> pd.DataFrame:
@@ -703,7 +706,7 @@ def flag_dhw_outage(df: pd.DataFrame, daily_df : pd.DataFrame, dhw_outlet_column
             first_true_index = consecutive_condition.idxmax()
             adjusted_time = first_true_index - pd.Timedelta(minutes=consecutive_minutes-1)
             events['start_time_pt'].append(day)
-            events['end_time_pt'].append(day)
+            events['end_time_pt'].append(next_day - pd.Timedelta(minutes=1))
             events['event_type'].append("HW_OUTAGE")
             events['event_detail'].append(f"Hot Water Outage Occured (first one starting at {adjusted_time.strftime('%H:%M')})")
     event_df = pd.DataFrame(events)

{ecopipeline-0.6.3 → ecopipeline-0.6.5/src/ecopipeline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ecopipeline
-Version: 0.6.3
+Version: 0.6.5
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)