sarapy 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

sarapy/dataProcessing/OpsProcessor.py

@@ -305,7 +305,7 @@ if __name__ == "__main__":
     import logging
     
 
-    historical_data_path = "examples/2025-06-21/UPM000N/historical-data.json"
+    historical_data_path = "examples\\2025-08-04 copy\\UPM008N\\historical-data.json"
     with open(historical_data_path, 'r') as file:
         samples = json.load(file)
 
@@ -313,6 +313,9 @@ if __name__ == "__main__":
 
     op = OpsProcessor(classifier_file='modelos\\pipeline_rf.pkl', imputeDistances = False,
                       regresor_file='modelos\\regresor.pkl', poly_features_file='modelos\\poly_features.pkl')
-    
-    print(op.processOperations(samples[:20]))
-    # op.processOperations(samples2)
+
+    ops_clasificadas = op.processOperations(samples)
+    df_ops_clasificadas = pd.DataFrame(ops_clasificadas)
+
+    print(df_ops_clasificadas.describe())
+

sarapy/mlProcessors/PlantinFMCreator.py

@@ -20,7 +20,7 @@ class PlantinFMCreator(BaseEstimator, TransformerMixin):
     
     def __init__(self, imputeDistances = True, distanciaMedia:float = 1.8,
                  umbral_precision:float = 0.3, dist_mismo_lugar = 0.0, max_dist = 100,
-                 umbral_ratio_dCdP:float = 0.5, deltaO_medio = 4):
+                 umbral_ratio_dCdP:float = 0.5, deltaO_medio = 4, baseDeltaP = 10):
         """Inicializa la clase FMCreator.
         
         Args:
@@ -39,6 +39,7 @@ class PlantinFMCreator(BaseEstimator, TransformerMixin):
         self.max_dist = max_dist
         self.umbral_ratio_dCdP = umbral_ratio_dCdP
         self.deltaO_medio = deltaO_medio
+        self.baseDeltaP = baseDeltaP
         
         ##creamos un diccionario para saber la posición de cada dato dentro del array devuelto por transform()
         self._dataPositions = {"DST_PT": 0, "deltaO": 2, "ratio_dCdP": 3, "distances": 4}
@@ -74,12 +75,12 @@ class PlantinFMCreator(BaseEstimator, TransformerMixin):
         
 
         date_oprc = self.tlmDataProcessor["date_oprc",:] #datos de fecha y hora de operación
-        time_ac = self.tlmDataProcessor["TIME_AC",:] #datos de fecha y hora de operación en formato timestamp
+        time_ac = self.tlmDataProcessor["TIME_AC",:]/self.baseDeltaP #datos de fecha y hora de operación en formato timestamp
         lats = self.tlmDataProcessor["latitud",:] #latitudes de las operaciones
         longs = self.tlmDataProcessor["longitud",:] #longitudes de las operaciones 
         self.dst_pt = self.tlmDataProcessor["SC_PT",:] #distorsión del plantín
         self.inest_pt = self.tlmDataProcessor["INST_PT",:] #inest 
-        # precitions = X[:,4].astype(float) #precision del GPS   
+
         
         ##***** OBTENEMOS LOS DATOS PARA FITEAR LOS OBJETOS Y ASÍ PROCESAR LA FM *****
         
@@ -87,7 +88,8 @@ class PlantinFMCreator(BaseEstimator, TransformerMixin):
         timeData = np.hstack((date_oprc.reshape(-1,1),time_ac.reshape(-1, 1)))
         
         self._timeDeltas = timeProcessor.fit_transform(timeData)
-        
+        # print(np.median(self._timeDeltas[:,tpDP["ratio_dCdP"]]))
+
         ##fitteamos geoprocessor con las latitudes y longitudes
         points = np.hstack((lats.reshape(-1,1),longs.reshape(-1,1)))
         self._distances = geoprocessor.fit_transform(points)
@@ -113,11 +115,6 @@ class PlantinFMCreator(BaseEstimator, TransformerMixin):
         self.fit(X)
         return self.transform(X)
     
-    # @property
-    # def tlmExtracted(self):
-    #     """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()."""
@@ -144,7 +141,7 @@ if __name__ == "__main__":
     import json
     from sarapy.preprocessing import TransformInputData
 
-    historical_data_path = "examples/2025-06-21/UPM000N/historical-data.json"
+    historical_data_path = "examples\\2025-08-04\\UPM003N\\historical-data.json"
     with open(historical_data_path, 'r') as file:
         historical_data = json.load(file)
     df = pd.DataFrame(historical_data)
@@ -157,4 +154,4 @@ if __name__ == "__main__":
     fmcreator = PlantinFMCreator(imputeDistances=False)
 
     fm, dst_pt, inest_pt = fmcreator.fit_transform(X) 
-    print(fm.shape)  # Debería ser (n_operaciones, 3)
+    print(np.median(fm,axis=0))

sarapy/preprocessing/TransformInputData.py

@@ -137,7 +137,7 @@ if __name__ == "__main__":
     import pandas as pd
     import json
 
-    historical_data_path = "examples/2025-06-21/UPM000N/historical-data.json"
+    historical_data_path = "examples\\2025-08-04\\UPM006N\\historical-data.json"
     with open(historical_data_path, 'r') as file:
         historical_data = json.load(file)
     df = pd.DataFrame(historical_data)
@@ -146,4 +146,4 @@ if __name__ == "__main__":
     data_positions = json.load(open("sarapy/preprocessing/telemetriaDataPosition.json", 'r'))
     transform_input_data = TransformInputData()
     transformed_data = transform_input_data.transform(historical_data)
-    print(transformed_data[-1])
+    print(transformed_data[:2])

sarapy/preprocessing/TransformToOutputData.py

@@ -10,7 +10,7 @@ class TransformToOutputData(BaseEstimator, TransformerMixin):
             - dataToTransform: array con los datos de las operaciones clasificadas.
             Actualmente el array de dataToTransform es de (n,5) con las columnas siguientes
             
-                - 0: timestamps
+                - 0: timestamp
                 - 1: tag_seedling
                 - 2: tag_fertilizer           
         Returns:
@@ -32,15 +32,15 @@ class TransformToOutputData(BaseEstimator, TransformerMixin):
             - X: array con los datos de las operaciones clasificadas.
             Actualmente el array de dataToTransform es de (n,5) con las columnas siguientes
             
-                - 0: timestamps
+                - 0: timestamp
                 - 1: tag_seedling
                 - 2: tag_fertilizer       
         """
         self.is_fitted = True
-        keys = ["timestamps","tag_seedling", "tag_fertilizer"]        
+        keys = ["timestamp","tag_seedling", "tag_fertilizer"]        
         self.temp_df = pd.DataFrame(X, columns = keys)
 
-        ##convierto las columnas "timestamps", "tag_seedling" a int
+        ##convierto las columnas "timestamp", "tag_seedling" a int
         for col in ["tag_seedling"]:
             self.temp_df[col] = self.temp_df[col].astype(float).astype(int)
         ##convierto la columna "tag_fertilizer" a float de y redondeo a 3 decimales
@@ -54,7 +54,7 @@ class TransformToOutputData(BaseEstimator, TransformerMixin):
             - X: array con los datos de las operaciones clasificadas.
             Actualmente el array de dataToTransform es de (n,5) con las columnas siguientes
             
-                - 0: timestamps
+                - 0: timestamp
                 - 1: tag_seedling
                 - 2: tag_fertilizer              
         Returns:
@@ -69,7 +69,7 @@ class TransformToOutputData(BaseEstimator, TransformerMixin):
             - X: array con los datos de las operaciones clasificadas.
             Actualmente el array de dataToTransform es de (n,5) con las columnas siguientes
             
-                - 0: timestamps
+                - 0: timestamp
                 - 1: tag_seedling
                 - 2: tag_fertilizer         
         Returns:

sarapy/version.py

@@ -1,2 +1,2 @@
 ## Version of the package   
-__version__ = "2.1.0"
+__version__ = "2.2.0"

{sarapy-2.1.0.dist-info → sarapy-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sarapy
-Version: 2.1.0
+Version: 2.2.0
 Home-page: https://github.com/lucasbaldezzari/sarapy
 Author: Lucas Baldezzari
 Author-email: Lucas Baldezzari <lmbaldezzari@gmail.com>
@@ -19,6 +19,14 @@ Requires-Dist: geopy
 
 Library for processing SARAPICO project metadata of _AMG SA_.
 
+#### Version 2.2.0
+
+- Se agrega baseDeltaP en PlantinFMCreator para poder dividir el timestamp de la electrónica por 10, ya que se envía en décimas de segundo.
+   
+#### Version 2.1.1
+
+- Se corrige error de tiepo en TransformToOutputData.
+
 #### Version 2.1.0
 
 - Se modifica TransformInputdata para poder obtener el timestamp en newSample de OpsProcessor. Se modifica transformOutputData para entregar los datos en base a la solicitud de #43. Se modifica OpsProcessor para poder obtener los datos de salida según solicitud en #43. Close #43.

{sarapy-2.1.0.dist-info → sarapy-2.2.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
 sarapy/__init__.py,sha256=aVoywqGSscYYDycLaYJnz08dlQabl9gH0h4Q5KtHM9o,74
-sarapy/version.py,sha256=Mggl7XGGseYHWRAVliZYoEOj2Nt43ALrs5sSYbS8DK4,51
+sarapy/version.py,sha256=KOlO2hui0K8-Vgk9NSIA7DmWhS5E7jpA2nk5zqFERaE,51
 sarapy/dataProcessing/GeoProcessor.py,sha256=ARjgKTXDVdf_cFCXyFmzlnmmmay3HG3q-yeJ9QrAcQU,5919
-sarapy/dataProcessing/OpsProcessor.py,sha256=zu6AJ2wQD84-u-fxxTIqGbdw4NrRRye9gHZO3A8Z724,17269
+sarapy/dataProcessing/OpsProcessor.py,sha256=edoZBO-loAU-uVvjkNeFiRfUGFnaz2ImMsT25DMxDGM,17349
 sarapy/dataProcessing/TLMSensorDataProcessor.py,sha256=RuITlryuSaIWvYyJwE5wxp85HVZ6mr5kUVALikfwS4g,3603
 sarapy/dataProcessing/TimeSeriesProcessor.py,sha256=aig3A3_SCa9FVSWxGWiapBUX7Lj9Wi1BVyZi-XXZZYQ,6414
 sarapy/dataProcessing/__init__.py,sha256=Kqs5sFtq6RMEa3KLJFbsGRoYsIxHL1UUGMuplyCyQFk,200
 sarapy/mlProcessors/FertilizerFMCreator.py,sha256=LNi86CI6eVuQ0_UBVJNd_-L79fcY2-zY2NCm9ypl6OM,2354
 sarapy/mlProcessors/FertilizerTransformer.py,sha256=PefMNrsvfqqjup0lcypzZB0IKzZbvTlTI03u4ITNuUo,3003
 sarapy/mlProcessors/PlantinClassifier.py,sha256=PoPvtrqTXCmr0cLaMNRdDzhvzUJNZhLtvZNeE0qd_0Q,7905
-sarapy/mlProcessors/PlantinFMCreator.py,sha256=meK8SH1rUlBOAfC4BPGUgpEIfgr-yXp9SwKdxVtmGo4,7035
+sarapy/mlProcessors/PlantinFMCreator.py,sha256=Rp6Mx_bhe0tvcktaG8vC8Dq8LPsBzKx4IjfVledvy6I,6926
 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
-sarapy/preprocessing/TransformInputData.py,sha256=ZQ8k_4JFp78G5VqZEuzYmF8VCDcOxEnHKbd_4w7PPjY,8536
-sarapy/preprocessing/TransformToOutputData.py,sha256=xXFRTwpv-R2duG4ixOVBLojHc0z3FD_l5gRzinF4DQc,3143
+sarapy/preprocessing/TransformInputData.py,sha256=hp2P0Jry7ORUU_N3bMlAz1sCTvD5Qwfm376O8xqwPEo,8539
+sarapy/preprocessing/TransformToOutputData.py,sha256=2hSeFkrSt1OO_jiX4SQJtL3Dhm_9xLy7zCgkj8jo9OE,3137
 sarapy/preprocessing/__init__.py,sha256=Wg_Csy8Xiz8BN8A4-T7iPwcL_ol5ApEx6YtybItKB8M,100
 sarapy/stats/__init__.py,sha256=ZrLMSistwynmmx4HUcI-ePRzqQ4bjp85JT4fTmbzC-c,27
 sarapy/stats/stats.py,sha256=raQBnn2RRtwYOuKN4Mgk6Rhk4hajx1TVcGlYnT2TMmA,11412
@@ -22,8 +22,8 @@ sarapy/utils/amg_decoder.py,sha256=JZ7cbu7DlCuatuq2F7aBfUr7S7U-K5poBgxw5nY6rNI,4
 sarapy/utils/amg_ppk.py,sha256=c0GusnxdntU-E0JOezzbIfC7SWoJmKAbad_zYDCJ3-c,1060
 sarapy/utils/getRawOperations.py,sha256=8aA1fIkNCnUYgiWfnFggRT_U35z432gZBrZ7seGO5w4,817
 sarapy/utils/plotting.py,sha256=kX-eYw618urMcUBkNPviQZdBziDc_TR3GInTsO90kU4,4065
-sarapy-2.1.0.dist-info/LICENCE,sha256=N00sU3vSQ6F5c2vML9_qP4IFTkCPFFj0YGDB2CZP-uQ,840
-sarapy-2.1.0.dist-info/METADATA,sha256=SUxMaAystOQGL48pzY351JHV6JgnZkiw5yhNJEqZ1RY,5695
-sarapy-2.1.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-sarapy-2.1.0.dist-info/top_level.txt,sha256=4mUGZXfX2Fw47fpY6MQkaJeuOs_8tbjLkkNp34DJWiA,7
-sarapy-2.1.0.dist-info/RECORD,,
+sarapy-2.2.0.dist-info/LICENCE,sha256=N00sU3vSQ6F5c2vML9_qP4IFTkCPFFj0YGDB2CZP-uQ,840
+sarapy-2.2.0.dist-info/METADATA,sha256=4yYQOkyZXWyLc3UqIHtYbxMxpznXjRat6kGwHD60Jk0,5945
+sarapy-2.2.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+sarapy-2.2.0.dist-info/top_level.txt,sha256=4mUGZXfX2Fw47fpY6MQkaJeuOs_8tbjLkkNp34DJWiA,7
+sarapy-2.2.0.dist-info/RECORD,,