remove nodatavalues from calculation

Author: Stephanie Reeder

ODMTools.py

@@ -20,7 +20,7 @@
 
 import pyodbc
 import pymysql
-import psycopg2
+#import psycopg2
 
 tool = LoggerTool()
 logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.INFO)

odmtools/odmdata/memory_database.py

@@ -21,6 +21,7 @@ def __init__(self, taskserver=None):
         self.df = None
         # Series_Service handles remote database
         self.series_service = None
+
         # Memory_service handles in memory database
         self.mem_service = SeriesService("sqlite:///:memory:")
         # TODO clean up closing of program
@@ -201,7 +202,7 @@ def initEditValues(self, seriesID):
         """
         if not self.editLoaded:
             logger.debug("Load series from db")
-
+            self.series = self.series_service.get_series_by_id(seriesID)
             self.df = self.series_service.get_values_by_series(seriesID)
             self.editLoaded = True
 

odmtools/odmservices/edit_service.py

@@ -347,19 +347,20 @@ def interpolate(self):
 
         self.memDB.update(update_list)
 
-
         self._populate_series()
 
         self.filtered_dataframe = self._series_points_df[self._series_points_df.index.isin(ids)]
 
+
     def drift_correction(self, gap_width):
         if self.isOneGroup():
             tmp_filter_list =self.get_filtered_points()
             startdate =tmp_filter_list.index[0]
             x_l = (tmp_filter_list.index[-1]-startdate).total_seconds()
-
+            #nodv= self.memDB.series_service.get_variable_by_id(self.memDB.df["VariableID"][0])
+            nodv = self.memDB.series.variable.no_data_value
             # y_n = y_0 + G(x_i / x_l)
-            f = lambda row :  row["DataValue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l))
+            f = lambda row :  row["DataValue"]+(gap_width * ((row.name-startdate).total_seconds() / x_l)) if row["DataValue"] != nodv else row["DataValue"]
             tmp_filter_list["DataValue"]=tmp_filter_list.apply(f, axis = 1)
 
             update_list = [{"value": row["DataValue"], "id":index} for index, row in tmp_filter_list.iterrows()]