biomechzoo 0.4.8__py3-none-any.whl → 0.4.9__py3-none-any.whl

biomechzoo/biomechzoo.py

@@ -8,7 +8,7 @@ from biomechzoo.utils.batchdisp import batchdisp
 from biomechzoo.utils.get_split_events import get_split_events
 from biomechzoo.utils.split_trial import split_trial
 from biomechzoo.conversion.c3d2zoo_data import c3d2zoo_data
-from biomechzoo.conversion.csv2zoo_data import csv2zoo_data
+from biomechzoo.conversion.table2zoo import table2zoo_data
 from biomechzoo.conversion.mvnx2zoo_data import mvnx2zoo_data
 from biomechzoo.processing.removechannel_data import removechannel_data
 from biomechzoo.processing.renamechannel_data import renamechannel_data
@@ -99,36 +99,18 @@ class BiomechZoo:
         # Update self.folder after  processing
         self._update_folder(out_folder, inplace, in_folder)
 
-    def csv2zoo(self, out_folder=None, inplace=None, skip_rows=0):
+    def table2zoo(self, out_folder=None, inplace=None, skip_rows=0, extension='csv'):
         """ Converts generic .csv file in the folder to .zoo format """
         start_time = time.time()
         verbose = self.verbose
         in_folder = self.in_folder
         if inplace is None:
             inplace = self.inplace
-        fl = engine(in_folder, extension='.csv', name_contains=self.name_contains, subfolders=self.subfolders)
+        fl = engine(in_folder, extension=extension, name_contains=self.name_contains, subfolders=self.subfolders)
         for f in fl:
-            batchdisp('converting csv to zoo for {}'.format(f), level=2, verbose=verbose)
-            data = csv2zoo_data(f, type='csv', skip_rows=skip_rows)
-            f_zoo = f.replace('.csv', '.zoo')
-            zsave(f_zoo, data, inplace=inplace, out_folder=out_folder, root_folder=in_folder)
-        method_name = inspect.currentframe().f_code.co_name
-        batchdisp('{} process complete for {} file(s) in {:.2f} secs'.format(method_name, len(fl), time.time() - start_time), level=1, verbose=verbose)
-        # Update self.folder after  processing
-        self._update_folder(out_folder, inplace, in_folder)
-
-    def parquet2zoo(self, out_folder=None, inplace=None):
-        """ Converts generic .csv file in the folder to .zoo format """
-        start_time = time.time()
-        verbose = self.verbose
-        in_folder = self.in_folder
-        if inplace is None:
-            inplace = self.inplace
-        fl = engine(in_folder, extension='.parquet', name_contains=self.name_contains, subfolders=self.subfolders)
-        for f in fl:
-            batchdisp('converting parquet to zoo for {}'.format(f), level=2, verbose=verbose)
-            data = csv2zoo_data(f, type='parquet')
-            f_zoo = f.replace('.parquet', '.zoo')
+            batchdisp('converting {} to zoo for {}'.format(extension, f), level=2, verbose=verbose)
+            data = table2zoo_data(f, type=extension, skip_rows=skip_rows)
+            f_zoo = f.replace(extension, '.zoo')
             zsave(f_zoo, data, inplace=inplace, out_folder=out_folder, root_folder=in_folder)
         method_name = inspect.currentframe().f_code.co_name
         batchdisp('{} process complete for {} file(s) in {:.2f} secs'.format(method_name, len(fl), time.time() - start_time), level=1, verbose=verbose)

biomechzoo/conversion/{csv2zoo_data.py → table2zoo_data.py}

@@ -6,9 +6,12 @@ from biomechzoo.utils.set_zoosystem import set_zoosystem
 from biomechzoo.utils.compute_sampling_rate_from_time import compute_sampling_rate_from_time
 
 
-def csv2zoo_data(csv_path, type='csv', skip_rows=0, freq=None):
+def table2zoo_data(csv_path, type='csv', skip_rows=0, freq=None):
     # todo: check calculation for sampling rate
 
+    if type not in ['csv', 'parquet']:
+        raise NotImplementedError('Only csv and parquet currently supported')
+
     # Read header lines until 'endheader'
     metadata = {}
     if type == 'csv' and skip_rows > 0:
@@ -99,4 +102,4 @@ if __name__ == '__main__':
     project_root = os.path.dirname(current_dir)
     csv_file = os.path.join(project_root, 'data', 'other', 'opencap_walking1.csv')
 
-    data = csv2zoo_data(csv_file)
+    data = table2zoo_data(csv_file)

{biomechzoo-0.4.8.dist-info → biomechzoo-0.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: biomechzoo
-Version: 0.4.8
+Version: 0.4.9
 Summary: Python implementation of the biomechZoo toolbox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/mcgillmotionlab/biomechzoo

{biomechzoo-0.4.8.dist-info → biomechzoo-0.4.9.dist-info}/RECORD

@@ -1,7 +1,7 @@
 __init__.py,sha256=Uy3ykqw4l_lZKiUWSUFPRZpkZajYUfZLBaQLVhKzxdI,772
 biomechzoo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/__main__.py,sha256=hSMHN1Rxn2367fSGTLHoOQ4_pocZw0IWI7HFxl-74oY,88
-biomechzoo/biomechzoo.py,sha256=6YpqhUaMH76d9zjNAsnOvyU5zppbCMD1t72FIzA8VyI,20782
+biomechzoo/biomechzoo.py,sha256=gWTFroK4FGEu4Z43n1Bxpqao5rgtoQTsgVvR4BwoPcI,19785
 biomechzoo/biomech_ops/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/biomech_ops/continuous_relative_phase_data.py,sha256=RePbt6zyOI1iv74CWhxSrunIokTFYVfFmFnoW51781E,1300
 biomechzoo/biomech_ops/continuous_relative_phase_line.py,sha256=Fa1LFRuPlmGPLQLvln6HVnJy3zMSm9z5YeooHmTu0lc,1365
@@ -13,9 +13,9 @@ biomechzoo/biomech_ops/phase_angle_data.py,sha256=_ekUBW2v3iC4UawcDL38ZZLYJmQsAm
 biomechzoo/biomech_ops/phase_angle_line.py,sha256=p6osB17_3QQSyKLNojuc6nYhv-k0K6EUUH75EXu8ifc,1391
 biomechzoo/conversion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/conversion/c3d2zoo_data.py,sha256=gnSCw99Hg5JLdrGezZNVZ6EHqiD6i-mpsLRtWmEa-Mg,2855
-biomechzoo/conversion/csv2zoo_data.py,sha256=9FjlJjCSdT9d5n10Kc74hq5sXBmUdRA8CSIMWlPAk4o,3175
 biomechzoo/conversion/mvnx2zoo_data.py,sha256=O6WuKe_5fZJfd1gUe3oP9rND_i5P4WGEuu2MDvI3ypY,3560
 biomechzoo/conversion/opencap2zoo_data.py,sha256=n4bLsrJI0wTSzG5bgJcmxj1dp2plnUKFNRzcTIbmV1o,608
+biomechzoo/conversion/table2zoo_data.py,sha256=OLiRlYB8GqOwv4MAlmwhIkGLxgAvmrgUjTb-Irev4lU,3297
 biomechzoo/mvn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biomechzoo/mvn/load_mvnx.py,sha256=B4VGuidQ-5G_5E1t5vpU51Nb_Lu85_EOS_FmGZYjfX8,22499
 biomechzoo/mvn/main_mvnx.py,sha256=e1LasJQ9icyzjWnRCEcAWQq_-L13-mIzf7PzYA3QYDg,2394
@@ -43,9 +43,9 @@ biomechzoo/utils/version.py,sha256=JIXDUuOcaJiZv9ruMP6PtWvJBh4sP0D5kAvlqPiZK_I,1
 biomechzoo/utils/zload.py,sha256=FPT6_-gwaOOqOckjgPRfnKEVKMsmNVIcenmQZF2KOvo,1535
 biomechzoo/utils/zplot.py,sha256=WVA8aCy1Pqy_bo_HXab9AmW-cBd8J8MPX2LAOd6dznU,1512
 biomechzoo/utils/zsave.py,sha256=wnRNuDxQc8bwCji4UrfoGjYrSZmka4eaDxQ5rMa78pE,1759
-biomechzoo-0.4.8.dist-info/licenses/LICENSE,sha256=Fsz62nrgRORre3A1wNXUDISaHoostodMvocRPDdXc9w,1076
-biomechzoo-0.4.8.dist-info/METADATA,sha256=WllGPwbLIbr26wyfwv8ZYz_VjlCa9jskutlRuhMFV_A,1553
-biomechzoo-0.4.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-biomechzoo-0.4.8.dist-info/entry_points.txt,sha256=VdryUUiwwvx0WZxrgmMrsyfe5Z1jtyaxdXOi0zWHOqk,41
-biomechzoo-0.4.8.dist-info/top_level.txt,sha256=nJEtuEZ9UPoN3EOR-BJ6myevEu7B5quWsWhaM_YeQpw,20
-biomechzoo-0.4.8.dist-info/RECORD,,
+biomechzoo-0.4.9.dist-info/licenses/LICENSE,sha256=Fsz62nrgRORre3A1wNXUDISaHoostodMvocRPDdXc9w,1076
+biomechzoo-0.4.9.dist-info/METADATA,sha256=VVG2UyRLhjRchJAnMc80aqXLb-0oqCHZauXxntwDq-w,1553
+biomechzoo-0.4.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+biomechzoo-0.4.9.dist-info/entry_points.txt,sha256=VdryUUiwwvx0WZxrgmMrsyfe5Z1jtyaxdXOi0zWHOqk,41
+biomechzoo-0.4.9.dist-info/top_level.txt,sha256=nJEtuEZ9UPoN3EOR-BJ6myevEu7B5quWsWhaM_YeQpw,20
+biomechzoo-0.4.9.dist-info/RECORD,,