apmtools 0.2.2__tar.gz → 0.2.4__tar.gz

{apmtools-0.2.2 → apmtools-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.002
+Version: 0.2.004
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.2 → apmtools-0.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.002"
+version = "0.2.004"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.2 → apmtools-0.2.4}/src/apmtools/classes.py

@@ -252,7 +252,7 @@ class Dataset(DictionaryPlus):
 
     def subset(self, filter_dict={}, filter_style='all', condition=None):
         """
-        Return a subset of a DictionaryPlus, specified in the parameter filter_dict (itself a dictionary) or condition (a function that takes at minimum a value from the dictionary as an input parameter, and return True/False if some condition specified in the function is met. Typically a lambda function of the form lambda x: True if condition else False)
+        Return a subset of a Dataset, specified in the parameter filter_dict (itself a dictionary) or condition (a function that takes at minimum a value from the dictionary as an input parameter, and return True/False if some condition specified in the function is met. Typically a lambda function of the form lambda x: True if condition else False)
         filter_dict is {attrib:["attrib_value_x","attrib_value_y",..]}, where 
             attrib is an attribute of the elements of dictionary, and attrib_value is a list
             of the values of such attrib that the elements of returned dictionary can have
@@ -476,7 +476,7 @@ class Dataset(DictionaryPlus):
                     self.scan_folder(directory=f"{directory}{j}/", levels=levels,
                                      level=level+1, monitor=monitor, levels_dict=levels_dict, gmt_timezone_shift=gmt_timezone_shift, interpolate=interpolate, add_m=add_m)
 
-    def save_summary(self, save_csv=True, filename="./", columns={}):
+    def save_summary(self, save_csv=True, filename="./", columns={}, merged=True):
         types_in = list(set(type(v) for v in self.values()))
 
         def match_class(x):
@@ -699,8 +699,11 @@ class Dataset(DictionaryPlus):
                 with open(f"{z[0]+"_"+filename if filename != "./" else z[0]+".csv"}", "w", encoding="utf-8") as output:
                     z[1].to_csv(output, index=False)
             out[z[0]] = z[1]
+        if merged:
+            return pd.concat([out[k] for k in out.keys()]).reset_index()
         return out
 
+
     def save_data(self, directory="./saved/", levels=[]):
         def get_specific_level(v, j):
             if hasattr(v, j):
@@ -882,7 +885,7 @@ class Summary(pd.DataFrame):
 
     def subset(self, filter_dict={}, filter_style='all'):
         """
-        Return a subset of a DictionaryPlus, specified in the parameter filter_dict (itself a dictionary) or condition (a function that takes at minimum a value from the dictionary as an input parameter, and return True/False if some condition specified in the function is met. Typically a lambda function of the form lambda x: True if condition else False)
+        Return a subset of a Summary, specified in the parameter filter_dict (itself a dictionary) or condition (a function that takes at minimum a value from the dictionary as an input parameter, and return True/False if some condition specified in the function is met. Typically a lambda function of the form lambda x: True if condition else False)
         filter_dict is {attrib:["attrib_value_x","attrib_value_y",..]}, where 
             attrib is an attribute of the elements of dictionary, and attrib_value is a list
             of the values of such attrib that the elements of returned dictionary can have
@@ -1398,7 +1401,10 @@ class Summary(pd.DataFrame):
         return output
 
     def get_monitor(self, value):
-        return self.subset({"monitor": [value]})
+        
+        out = self.subset({"monitor": [value]})
+        out = out.dropna(axis=1,how="all")
+        return out
 
     def plot_app(
         self,