pymast 0.0.1__tar.gz → 0.0.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymast
-Version: 0.0.1
+Version: 0.0.2
 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.1 → pymast-0.0.2}/pymast/__init__.py

@@ -14,9 +14,8 @@ from .overlap_removal import *
 from .parsers import *
 
 # Finally, import the radio_project class, which depends on parsers, predictor, and naive_bayes
-<<<<<<< Updated upstream:mast/__init__.py
-from .radio_project import *
-=======
+
 from .radio_project import *
 
->>>>>>> Stashed changes:biotas_refactor/__init__.py
+
+

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

@@ -15,7 +15,7 @@ import sqlite3
 import datetime
 from matplotlib import rcParams
 from scipy import interpolate
-from mast.radio_project import radio_project
+from pymast.radio_project import radio_project
 
 
 font = {'family': 'serif','size': 6}
@@ -77,46 +77,42 @@ class cjs_data_prep():
             '''
 
             print ("Adding release time for this fish")
-            sql = "SELECT FreqCode, TagType, RelDate, RelLoc, CapLoc FROM tblMasterTag WHERE TagType = 'Study'"
-            relDat = pd.read_sql_query(sql,con = conn, parse_dates = 'RelDate')
+            rel_dat = project.tags
             if self.rel_loc is not None:
-                relDat = relDat[relDat.RelLoc == rel_loc]
+                rel_dat = rel_dat[rel_dat.rel_loc == rel_loc]
             if self.cap_loc is not None:
-                relDat = relDat[relDat.CapLoc == cap_loc]
-            relDat['RelDate'] = pd.to_datetime(relDat.RelDate)
-            relDat['Epoch'] = (relDat['RelDate'] - datetime.datetime(1970,1,1)).dt.total_seconds()
-            relDat.rename(columns = {'RelDate':'timeStamp'}, inplace = True)
-            relDat['RecapOccasion'] = np.repeat('R00',len(relDat))
-            #relDat.dropna(inplace =True)
-            relDat['overlapping'] = np.zeros(len(relDat))
-            self.data = self.data.append(relDat)
-
+                rel_dat = rel_dat[rel_dat.cap_loc == cap_loc]
+            rel_dat['rel_date'] = pd.to_datetime(rel_dat.rel_date)
+            rel_dat['epoch'] = (rel_dat['rel_date'] - datetime.datetime(1970,1,1)).dt.total_seconds()
+            rel_dat.rename(columns = {'rel_date':'time_stamp'}, inplace = True)
+            rel_dat['recap_occasion'] = np.repeat('R00',len(rel_dat))
+            rel_dat['overlapping'] = np.zeros(len(rel_dat))
+            self.recap_data = pd.concat([self.recap_data,rel_dat],axis = 0)
 
         else:
             print ("Starting Initial Recap Release Procedure")
             # Identify first recapture times
-            startTimes = self.data[self.data.RecapOccasion == "R00"].groupby(['FreqCode'])['Epoch'].min().to_frame()
-            startTimes.reset_index(drop = False, inplace = True)
-            startTimes.set_index('FreqCode',inplace = True)
-            startTimes.rename(columns = {'Epoch':'FirstRecapture'},inplace = True)
+            start_times = self.recap_data[self.recap_data.recap_occasion == "R00"].groupby(['freq_code'])['epoch'].min().to_frame()
+            start_times.reset_index(drop = False, inplace = True)
+            start_times.set_index('freq_code',inplace = True)
+            start_times.rename(columns = {'epoch':'first_recapture'},inplace = True)
 
             # make sure fish start from the first recapture occassion and that there are no recaps before release
-            for fish in self.data.FreqCode.unique():
+            for fish in self.recap_data.freq_code.unique():
 
-                if fish not in startTimes.index.values:
+                if fish not in start_times.index.values:
                     # fish never made it to the initial state
-                    self.data.drop(self.data[self.data.FreqCode == fish].index, inplace = True)
+                    self.recap_dat.drop(self.recap_dat[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 = startTimes.at[fish,'FirstRecapture']
-                    self.data.drop(self.data[(self.data.FreqCode == fish) & (self.data.Epoch < t)].index, inplace = True)
+                    t = start_times.at[fish,'first_recapture']
+                    self.recap_data.drop(self.recap_data[(self.recap_data.freq_code == fish) & (self.recap_data.epoch < t)].index, inplace = True)
 
-        print (self.data.head())
-        c.close()
+        print (self.recap_data.head())
 
-    def input_file(self,modelName, outputWS):
+    def input_file(self,model_name, output_ws):
         #Step 1: Create cross tabulated data frame with FreqCode as row index and recap occasion as column
-        cross_tab = pd.pivot_table(self.data, values = 'Epoch', index = 'FreqCode', columns = 'RecapOccasion', aggfunc = 'min')
+        cross_tab = pd.pivot_table(self.recap_data, values = 'epoch', index = 'freq_code', columns = 'recap_occasion', aggfunc = 'min')
 
         #Step 2: Fill in those nan values with 0, we can't perform logic on nothing!'''
         cross_tab.fillna(value = 0, inplace = True)
@@ -134,7 +130,7 @@ class cjs_data_prep():
         self.cross = cross_tab
         # Check your work
         print (cross_tab.head(100))
-        cross_tab.to_csv(os.path.join(outputWS,'%s_cjs.csv'%(modelName)))
+        cross_tab.to_csv(os.path.join(output_ws,'%s_cjs.csv'%(model_name)))
 
 class lrdr_data_prep():
     '''Class creates input files for Live Recapture Dead Recovery modeling in MARK'''

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

@@ -4,7 +4,7 @@ import pandas as pd
 import numpy as np
 import datetime
 import os
-import mast.predictors as predictors
+import pymast.predictors as predictors
 
 def ares(file_name, 
                  db_dir, 
@@ -222,7 +222,7 @@ def orion_import(file_name,
                     
                     telem_dat_sub = telem_dat_sub.astype({'power':'float32',
                                                           'freq_code':'object',
-                                                          'time_stamp':'datetime64',
+                                                          'time_stamp':'datetime64[ns]',
                                                           'scan_time':'float32',
                                                           'channels':'int32',
                                                           'rec_type':'object',
@@ -851,8 +851,11 @@ def srx800(file_name,
             telem_dat_sub['epoch'] = np.round((telem_dat_sub.time_stamp - pd.Timestamp("1970-01-01")) / pd.Timedelta('1s'),6)
             
             # get setup number for every row
-            telem_dat_sub['setup'] = get_setup(telem_dat_sub.epoch.values,
-                                               setup_df.epoch.values)
+            try:
+                telem_dat_sub['setup'] = get_setup(telem_dat_sub.epoch.values,
+                                                   setup_df.epoch.values)
+            except:
+                print ('why you fail?')
             
             # get frequency from channel
             telem_dat_sub['Frequency'] = get_frequency(telem_dat_sub.setup.values,
@@ -890,7 +893,7 @@ def srx800(file_name,
             # write to hdf
             telem_dat_sub = telem_dat_sub.astype({'power':'float32',
                                                   'freq_code':'object',
-                                                  'time_stamp':'datetime64',
+                                                  'time_stamp':'datetime64[ns]',
                                                   'scan_time':'float32',
                                                   'channels':'int32',
                                                   'rec_type':'object',

{pymast-0.0.1 → pymast-0.0.2}/pymast/predictors.py

@@ -121,6 +121,7 @@ def detection_history (epoch, pulse_rate, num_detects, num_channels, scan_time,
             lower_limit_dict[i] = np.where(scan_time > 2 * pulse_rate,
                                            epoch + (pulse_rate * i - 1),
                                            epoch + ((scan_time * channels * i) - 1))
+
             upper_limit_dict[i] = np.where(scan_time > 2 * pulse_rate, 
                                            epoch + (pulse_rate * i + 1),
                                            epoch + ((scan_time * channels * i) + 1))

{pymast-0.0.1 → pymast-0.0.2}/pymast/radio_project.py

@@ -9,9 +9,9 @@ import pandas as pd
 import os
 import h5py
 import datetime
-import mast.naive_bayes as naive_bayes
-import mast.parsers as  parsers
-import mast.predictors as predictors
+import pymast.naive_bayes as naive_bayes
+import pymast.parsers as  parsers
+import pymast.predictors as predictors
 import matplotlib.pyplot as plt
 from matplotlib import rcParams
 from scipy import interpolate
@@ -295,7 +295,7 @@ class radio_project():
         # make sure data types are correct - these next steps are critical
         try:
             train_dat = train_dat.astype({'power': 'float32', 
-                                          'time_stamp': 'datetime64',
+                                          'time_stamp': 'datetime64[ns]',
                                           'epoch': 'float32',
                                           'freq_code': 'object',
                                           'noise_ratio': 'float32',
@@ -486,12 +486,8 @@ class radio_project():
                           min_itemsize = {'freq_code':20,
                                           'rec_type':20,
                                           'rec_id':20,
-<<<<<<< Updated upstream:mast/radio_project.py
                                           'det_hist':20})      
-=======
-                                          'det_hist':20})  
->>>>>>> Stashed changes:biotas_refactor/radio_project.py
-                
+
     def undo_import(self, rec_id):
         # Read the table from the HDF5 file
         with pd.HDFStore(self.db, 'r+') as store:
@@ -712,7 +708,7 @@ class radio_project():
             class_dat = class_dat.astype({'freq_code': 'object',
                                           'epoch': 'float32',
                                           'rec_id': 'object',
-                                          'time_stamp': 'datetime64',
+                                          'time_stamp': 'datetime64[ns]',
                                           'power': 'float32', 
                                           'noise_ratio': 'float32',
                                           'scan_time': 'int32',
@@ -1133,7 +1129,7 @@ class radio_project():
                         rec_dat = rec_dat.astype({'freq_code': 'object',
                                                 'epoch': 'float32',
                                                 'rec_id': 'object',
-                                                'time_stamp': 'datetime64',
+                                                'time_stamp': 'datetime64[ns]',
                                                 'power': 'float32', 
                                                 'noise_ratio': 'float32',
                                                 'lag': 'float32',
@@ -1167,4 +1163,4 @@ class radio_project():
                 
 
             
-                    
+                    

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymast
-Version: 0.0.1
+Version: 0.0.2
 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.1 → pymast-0.0.2}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name = 'pymast',
-      version = '0.0.1',
+      version = '0.0.2',
       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.''',