pymast 0.0.2__tar.gz → 0.0.3__tar.gz

{pymast-0.0.2 → pymast-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymast
-Version: 0.0.2
+Version: 0.0.3
 Summary: Movement Analysis Software for Telemetry (MAST) for
 Home-page: https://github.com/knebiolo/mast
 Author: Kevin P. Nebiolo and Theodore Castro-Santos

{pymast-0.0.2 → pymast-0.0.3}/pymast/formatter.py

@@ -43,15 +43,19 @@ class cjs_data_prep():
             query_parts.append(f"rec_id == '{key}'")   
         qry = " & ".join(query_parts)
 
-        recap_data = pd.read_hdf(project.db,
-                             'recaptures',
-                             where = qry)
+        self.recap_data = pd.read_hdf(project.db,
+                             'recaptures')#, 
+                             #where = qry)
         
-        self.recap_data.set_index('freq_code', inplace = True)
-        project.tags.set_index('freq_code', inplace = True)
-        self.recap_data = pd.merge(recap_data, project.tags, how = 'left')
+        #self.recap_data.set_index('freq_code', inplace = True)
+        project.tags.reset_index('freq_code', inplace = True)
+        self.recap_data = pd.merge(self.recap_data, 
+                                   project.tags,
+                                   left_on = 'freq_code', 
+                                   right_on = 'freq_code',
+                                   how = 'left')
         self.recap_data.reset_index(drop = False, inplace = True)
-        project.tags.reset_index(drop = False, inplace = True)
+        #project.tags.reset_index(drop = False, inplace = True)
         
         # filter out tag data we don't want mucking up our staistical model
         if species != None:
@@ -102,7 +106,7 @@ class cjs_data_prep():
 
                 if fish not in start_times.index.values:
                     # fish never made it to the initial state
-                    self.recap_dat.drop(self.recap_dat[self.recap_data.freq_code == fish].index, inplace = True)
+                    self.recap_data.drop(self.recap_data[self.recap_data.freq_code == fish].index, inplace = True)
                 else:
                     # fish arrived at the initial state but their may be recaptures before arrival at initial state
                     t = start_times.at[fish,'first_recapture']

{pymast-0.0.2 → pymast-0.0.3}/pymast/parsers.py

@@ -495,7 +495,7 @@ def srx1200(file_name,
         # format frequency code
         telem_dat['FreqNo'] = telem_dat['Freq [MHz]'].apply(lambda x: f"{x:.3f}" )
         telem_dat = telem_dat[telem_dat['Tag/BPM'] != 999]
-        telem_dat['freq_code'] = telem_dat['FreqNo'] + ' ' + telem_dat['Tag/BPM'].astype(np.str)
+        telem_dat['freq_code'] = telem_dat['FreqNo'] + ' ' + telem_dat['Tag/BPM'].astype(str)
         
         # calculate 
         telem_dat['noise_ratio'] = predictors.noise_ratio(600,
@@ -572,7 +572,7 @@ def srx1200(file_name,
         telem_dat['FreqNo'] = telem_dat['Freq [MHz]'].apply(lambda x: f"{x:.3f}" )
         telem_dat = telem_dat[telem_dat['TagID/BPM'] != 999]
 
-        telem_dat['freq_code'] = telem_dat['FreqNo'] + ' ' + telem_dat['TagID/BPM'].astype(np.str)
+        telem_dat['freq_code'] = telem_dat['FreqNo'] + ' ' + telem_dat['TagID/BPM'].astype(str)
         
         # calculate 
         telem_dat['noise_ratio'] = predictors.noise_ratio(600,
@@ -741,7 +741,7 @@ def srx800(file_name,
         split = setup_df['change_date'].str.split(' ', expand=True)
         setup_df['day0'] = np.repeat(pd.to_datetime("1900-01-01"),len(setup_df))
         setup_df['Date'] = setup_df['day0'] + pd.to_timedelta(split[1].astype(int), unit='d')
-        setup_df['change_date'] = setup_df.Date.astype(np.str) + ' ' + split[2]
+        setup_df['change_date'] = setup_df.Date.astype(str) + ' ' + split[2]
         
 
     setup_df['change_date'] = pd.to_datetime(setup_df.change_date)

{pymast-0.0.2 → pymast-0.0.3}/pymast.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymast
-Version: 0.0.2
+Version: 0.0.3
 Summary: Movement Analysis Software for Telemetry (MAST) for
 Home-page: https://github.com/knebiolo/mast
 Author: Kevin P. Nebiolo and Theodore Castro-Santos

{pymast-0.0.2 → pymast-0.0.3}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name = 'pymast',
-      version = '0.0.2',
+      version = '0.0.3',
       description = '''Movement Analysis Software for Telemetry (MAST) for
 use in removing false positive and overlap detections from radio telemetry
 projects and assessing 1D movement patterns.''',