sarapy 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

sarapy/dataProcessing/OpsProcessor.py

@@ -1,7 +1,4 @@
 ###Documentación en https://github.com/lucasbaldezzari/sarapy/blob/main/docs/Docs.md
-import warnings
-import datetime
-from dateutil.tz import tzutc
 import numpy as np
 import pandas as pd
 from sarapy.mlProcessors import PlantinFMCreator
@@ -193,6 +190,9 @@ class OpsProcessor():
             ##chequeo si first_day_op_classified es True, si es así, no se considera la primera fila de las classified_ops
             if self.operationsDict[ID_NPDP]["first_day_op_classified"]:
                 classified_ops = classified_ops[1:]
+
+            ##actualizo las operaciones que hayan sido hardcodeadas luego de despertar y/o reiniciar la electrónica
+            classified_ops = self.updateBedoreAwake(classified_ops)
                 
             # plantinClassifications = np.vstack((plantinClassifications, classified_ops)) if plantinClassifications is not None else classified_ops
             plantinClassifications = np.concatenate((plantinClassifications, classified_ops)) if plantinClassifications is not None else classified_ops
@@ -282,12 +282,30 @@ class OpsProcessor():
 
         for ID_NPDP in self.operationsDict.keys():
             self._operationsDict[ID_NPDP]["sample_ops"] = None
+
+    def updateBedoreAwake(self, classified_ops):
+        """
+        Función para actualizar las operaciones que hayan sido hardcodeadas luego de despertar y/o reiniciar la electrónica.
+
+        Se chequea la bandera MODE de los datos de telemetría entregados por la electrónica.
+
+        Args:
+        - classified_ops: np.array con las operaciones clasificadas.
+
+        Returns:
+        - classified_ops: np.array con las operaciones clasificadas.
+        """
+
+        ##me quedo con los índices donde MODEFlag es igual a 1
+        mask = self.plantinFMCreator.tlmExtracted[:,self.plantinFMCreator.tlmdeDP["MODEFlag"]]==1
+        classified_ops[mask] = 0 ##hardcodeo las operaciones que hayan sido clasificadas como 1
+        return classified_ops
             
     @property
     def operationsDict(self):
         return self._operationsDict
     
-    
+
 if __name__ == "__main__":
     #cargo archivo examples\volcado_17112023_NODE_processed.csv
     import pandas as pd
@@ -296,8 +314,8 @@ if __name__ == "__main__":
     import sarapy.utils.getRawOperations as getRawOperations
     from sarapy.dataProcessing import OpsProcessor
 
-    data_path = os.path.join(os.getcwd(), "examples\\2024-09-04\\UPM012N\\data.json")
-    historical_data_path = os.path.join(os.getcwd(), "examples\\2024-09-04\\UPM012N\\historical-data.json")
+    data_path = os.path.join(os.getcwd(), "examples\\2024-09-16\\UPM001N\\data.json")
+    historical_data_path = os.path.join(os.getcwd(), "examples\\2024-09-16\\UPM001N\\historical-data.json")
 
     raw_data = pd.read_json(data_path, orient="records").to_dict(orient="records")
     raw_data2 = pd.read_json(historical_data_path, orient="records").to_dict(orient="records")
@@ -315,4 +333,5 @@ if __name__ == "__main__":
     ##
     df = pd.DataFrame(classifications)
     tag_seedling = df["tag_seedling"].values
-    print(tag_seedling.mean())
+    print(tag_seedling.mean())
+    print(df["tag_seedling"].shape)

sarapy/mlProcessors/PlantinFMCreator.py

@@ -1,6 +1,4 @@
 ###Documentación en https://github.com/lucasbaldezzari/sarapy/blob/main/docs/Docs.md
-
-import warnings
 import numpy as np
 from sklearn.base import BaseEstimator, TransformerMixin
 from sarapy.dataProcessing import TLMSensorDataProcessor, TimeSeriesProcessor, GeoProcessor
@@ -138,6 +136,11 @@ class PlantinFMCreator(BaseEstimator, TransformerMixin):
         """Devuelve los datos de telemetría extraídos."""
         return self._tlmExtracted
     
+    @property
+    def tlmdeDP(self):
+        """Devuelve el diccionario con la posición de los datos dentro del array devuelto por transform()."""
+        return self._tlmdeDP
+
     @property
     def timeDeltas(self):
         """Devuelve los datos de tiempo extraídos."""

sarapy/version.py

@@ -1,2 +1,2 @@
 ## Version of the package   
-__version__ = "1.1.3"
+__version__ = "1.1.5"

{sarapy-1.1.3.dist-info → sarapy-1.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sarapy
-Version: 1.1.3
+Version: 1.1.5
 Home-page: https://github.com/lucasbaldezzari/sarapy
 Author: Lucas Baldezzari
 Author-email: Lucas Baldezzari <lmbaldezzari@gmail.com>
@@ -17,7 +17,15 @@ Requires-Dist: geopy
 
 # SARAPY
 
-Library for processing SARAPICO project metadata of _AMG_.
+Library for processing SARAPICO project metadata of _AMG SA_.
+
+#### Version 1.1.5
+
+- Se quita print de función update.
+
+#### Version 1.1.4
+
+- Se implementa actualización de operaciones con bandera MODE en 1. Se hacen operaciones de plantin iguales a 0 para todas las operaciones con MODE = 1.
 
 #### Version 1.1.3
 

{sarapy-1.1.3.dist-info → sarapy-1.1.5.dist-info}/RECORD

@@ -1,13 +1,13 @@
 sarapy/__init__.py,sha256=aVoywqGSscYYDycLaYJnz08dlQabl9gH0h4Q5KtHM9o,74
-sarapy/version.py,sha256=XMwZelUPnYJt_GfegGPZxR6z_nj3U3pzn8-m2u7mvi0,51
+sarapy/version.py,sha256=fpIUJRMaOvr74IVvNAnR0CjRClgOOsjYZWCcuo-tQH8,51
 sarapy/dataProcessing/GeoProcessor.py,sha256=ARjgKTXDVdf_cFCXyFmzlnmmmay3HG3q-yeJ9QrAcQU,5919
-sarapy/dataProcessing/OpsProcessor.py,sha256=-mxZPA7V6r7xkkQBICmNBiT7FJGVs3C3D-DaPN34yHE,16433
+sarapy/dataProcessing/OpsProcessor.py,sha256=BjrJ58Lk1pQSqOCUvhFTXTo-cw12zZ5JJrW1VVbtfdQ,17365
 sarapy/dataProcessing/TLMSensorDataProcessor.py,sha256=GfSIRYD_biFlOMTfSQSwW0HsUouZuUL3ScvL4uUHTPQ,23824
 sarapy/dataProcessing/TimeSeriesProcessor.py,sha256=-uic18Sut9yMCenbLO1-VabmKifKABt_FbCCP_fLcmE,5403
 sarapy/dataProcessing/__init__.py,sha256=Kqs5sFtq6RMEa3KLJFbsGRoYsIxHL1UUGMuplyCyQFk,200
 sarapy/dataProcessing/amg_decoder.py,sha256=JZ7cbu7DlCuatuq2F7aBfUr7S7U-K5poBgxw5nY6rNI,4319
 sarapy/mlProcessors/PlantinClassifier.py,sha256=ahoDIgxfKiq0sMm4dR1M4rLO-J6SxDMrASjlmswj3QI,6781
-sarapy/mlProcessors/PlantinFMCreator.py,sha256=Le3Itc2xpRvajs0ws3zd5ZkO_bSpKXy3xiWiRrulXI4,8404
+sarapy/mlProcessors/PlantinFMCreator.py,sha256=FeEz0MiorkMPodPgN9FtBDJ22WVLoLwK4g-CFI46DAk,8568
 sarapy/mlProcessors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sarapy/preprocessing/DistancesImputer.py,sha256=NvbVAh5m0yFxVgDbEFnEX7RSG13qLjO7i2gqjDAWsf4,9106
 sarapy/preprocessing/FertilizerImputer.py,sha256=zK6ONAilwPHvj-bC7yxnQYOkDBCCkWh6__57vYK9anM,1490
@@ -18,8 +18,8 @@ sarapy/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sarapy/utils/amg_decoder.py,sha256=JZ7cbu7DlCuatuq2F7aBfUr7S7U-K5poBgxw5nY6rNI,4319
 sarapy/utils/amg_ppk.py,sha256=c0GusnxdntU-E0JOezzbIfC7SWoJmKAbad_zYDCJ3-c,1060
 sarapy/utils/getRawOperations.py,sha256=8aA1fIkNCnUYgiWfnFggRT_U35z432gZBrZ7seGO5w4,817
-sarapy-1.1.3.dist-info/LICENCE,sha256=N00sU3vSQ6F5c2vML9_qP4IFTkCPFFj0YGDB2CZP-uQ,840
-sarapy-1.1.3.dist-info/METADATA,sha256=wrx25yDTSjHfV3NK-psqZ4Pv_vZ2KeEm7CZKc02jPsw,2990
-sarapy-1.1.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sarapy-1.1.3.dist-info/top_level.txt,sha256=4mUGZXfX2Fw47fpY6MQkaJeuOs_8tbjLkkNp34DJWiA,7
-sarapy-1.1.3.dist-info/RECORD,,
+sarapy-1.1.5.dist-info/LICENCE,sha256=N00sU3vSQ6F5c2vML9_qP4IFTkCPFFj0YGDB2CZP-uQ,840
+sarapy-1.1.5.dist-info/METADATA,sha256=WYQ7CXiHIz--kttqPzK3gGG6RnD1jl8idsH5tb98iUo,3234
+sarapy-1.1.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sarapy-1.1.5.dist-info/top_level.txt,sha256=4mUGZXfX2Fw47fpY6MQkaJeuOs_8tbjLkkNp34DJWiA,7
+sarapy-1.1.5.dist-info/RECORD,,