AeroViz 0.1.8__tar.gz → 0.1.9.1__tar.gz

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz/dataProcess/Chemistry/_ocec.py

@@ -114,8 +114,7 @@ def _basic(_lcres, _mass, _ocec_ratio, _ocec_ratio_month, _hr_lim, _range, _wiso
     _out = {}
 
     # OC1, OC2, OC3, OC4, PC
-    _df_bsc = _lcres[['OC1_raw', 'OC2_raw', 'OC3_raw', 'OC4_raw']] / _lcres['Sample_Volume'].to_frame().values.copy()
-    _df_bsc.rename(columns={'OC1_raw': 'OC1', 'OC2_raw': 'OC2', 'OC3_raw': 'OC3', 'OC4_raw': 'OC4'}, inplace=True)
+    _df_bsc = _lcres[['OC1', 'OC2', 'OC3', 'OC4', 'PC']].copy()
 
     # SOC, POC, OC/EC
     if _ocec_ratio is not None:
@@ -144,7 +143,8 @@ def _basic(_lcres, _mass, _ocec_ratio, _ocec_ratio_month, _hr_lim, _range, _wiso
     _df_ratio = DataFrame(index=_df_bsc.index)
 
     for _ky, _val in _df_bsc.items():
-        if 'OC/EC' in _ky: continue
+        if 'OC/EC' in _ky:
+            continue
         _df_ratio[f'{_ky}/Thermal_OC'] = _val / _lcres['Thermal_OC']
         _df_ratio[f'{_ky}/Optical_OC'] = _val / _lcres['Optical_OC']
 
@@ -159,14 +159,14 @@ def _basic(_lcres, _mass, _ocec_ratio, _ocec_ratio_month, _hr_lim, _range, _wiso
         _df_ratio[f'Optical_EC/PM'] = _lcres['Optical_EC'] / _mass
 
     # ratio status
-    _df_bsc = concat((_lcres, _df_bsc.copy()), axis=1)
+    _df_bsc = concat((_lcres.loc[:, :'Sample_Volume'], _df_bsc.copy()), axis=1)
 
     for _ky, _df in _df_ratio.items():
         _df_bsc[f'{_ky}_status'] = 'Normal'
         _df_bsc[f'{_ky}_status'] = _df_bsc[f'{_ky}_status'].mask(_df > 1, 'Warning')
 
     # out
-    _out['ratio'] = _df_ratio
     _out['basic'] = _df_bsc
+    _out['ratio'] = _df_ratio
 
     return _out

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz/plot/hysplit/hysplit.py

@@ -12,6 +12,9 @@ from AeroViz.plot.utils import set_figure
 
 __all__ = ['hysplit']
 
+# 設置默認文件路徑
+DEFAULT_FILE = Path(__file__).parent.parent.parent / 'data' / '240228_00.txt'
+
 
 def read_hysplit_data(file: Path):
     data = pd.read_csv(file, skiprows=8, sep=r'\s+', names=range(0, 12), engine='python')
@@ -23,7 +26,7 @@ def read_hysplit_data(file: Path):
 
 
 @set_figure
-def hysplit(file: Path):
+def hysplit(file: Path = DEFAULT_FILE):
     data = read_hysplit_data(file)
 
     # 創建地圖
@@ -76,4 +79,4 @@ def hysplit(file: Path):
 
 
 if __name__ == "__main__":
-    hysplit(Path("../../data/240228_00.txt"))  # 請替換為您的實際檔案路徑
+    hysplit()  # 請替換為您的實際檔案路徑

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz/rawDataReader/core/__init__.py

@@ -101,11 +101,13 @@ class AbstractReader(ABC):
 
                 # validate rate calculation
                 if period_size < sample_size or sample_size < qc_size or period_size == 0 or sample_size == 0:
-                    raise ValueError(f"Invalid sample sizes: period={period_size}, sample={sample_size}, QC={qc_size}")
+                    _acq_rate, _yid_rate, _OEE_rate = 0, 0, 0
+                    # raise ValueError(f"Invalid sample sizes: period={period_size}, sample={sample_size}, QC={qc_size}")
 
-                _acq_rate = round((sample_size / period_size) * 100, 1)
-                _yid_rate = round((qc_size / sample_size) * 100, 1)
-                _OEE_rate = round((qc_size / period_size) * 100, 1)
+                else:
+                    _acq_rate = round((sample_size / period_size) * 100, 1)
+                    _yid_rate = round((qc_size / sample_size) * 100, 1)
+                    _OEE_rate = round((qc_size / period_size) * 100, 1)
 
                 self.logger.info(f'{_nam}:')
                 self.logger.info(f"\tAcquisition rate: {_acq_rate}%")
@@ -114,7 +116,7 @@ class AbstractReader(ABC):
                 self.logger.info(f"{'=' * 60}")
 
                 print(f'\n\t{_nam} : ')
-                print(f'\t\tacquisition rate | yield rate | OEE rate :'
+                print(f'\t\tacquisition rate | yield rate -> OEE rate :'
                       f' \033[91m{_acq_rate}% | {_yid_rate}% -> {_OEE_rate}%\033[0m')
 
         if self.meta['deter_key'] is not None:

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz/rawDataReader/script/OCEC.py

@@ -9,7 +9,7 @@ class Reader(AbstractReader):
 
     def _raw_reader(self, file):
         with open(file, 'r', encoding='utf-8', errors='ignore') as f:
-            _df = read_csv(f, skiprows=3).apply(to_numeric, errors='coerce')
+            _df = read_csv(f, skiprows=3)
 
             _df['Start Date/Time'] = _df['Start Date/Time'].str.strip()
             _df['time'] = to_datetime(_df['Start Date/Time'], format='%m/%d/%Y %I:%M:%S %p', errors='coerce')
@@ -51,6 +51,8 @@ class Reader(AbstractReader):
                 'ECPk5-ug C': 'EC5_raw',
             })
 
+            _df = _df.apply(to_numeric, errors='coerce')
+
             _df['OC1'] = _df['OC1_raw'] / _df['Sample_Volume']
             _df['OC2'] = _df['OC2_raw'] / _df['Sample_Volume']
             _df['OC3'] = _df['OC3_raw'] / _df['Sample_Volume']
@@ -64,7 +66,7 @@ class Reader(AbstractReader):
             # _df['EC4'] = _df['EC4_raw'] / _df['Sample_Volume']
             # _df['EC5'] = _df['EC5_raw'] / _df['Sample_Volume']
 
-            _df = _df[['Thermal_OC', 'Optical_OC', 'Thermal_EC', 'Optical_EC', 'TC', 'Sample_Volume',
+            _df = _df[['Thermal_OC', 'Thermal_EC', 'Optical_OC', 'Optical_EC', 'TC', 'Sample_Volume',
                        'OC1', 'OC2', 'OC3', 'OC4', 'PC']]
 
             return _df.loc[~_df.index.duplicated() & _df.index.notna()]

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AeroViz
-Version: 0.1.8
+Version: 0.1.9.1
 Summary: Aerosol science
 Home-page: https://github.com/Alex870521/AeroViz
 Author: alex
@@ -18,6 +18,7 @@ Requires-Dist: scipy==1.14.0
 Requires-Dist: seaborn==0.13.2
 Requires-Dist: scikit-learn==1.5.1
 Requires-Dist: windrose==1.9.2
+Requires-Dist: cartopy==0.24.1
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: rich~=13.7.1
 

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz.egg-info/SOURCES.txt

@@ -104,5 +104,4 @@ AeroViz/tools/database.py
 AeroViz/tools/dataclassifier.py
 AeroViz/tools/dataprinter.py
 AeroViz/tools/datareader.py
-test/test_aeroviz_imports.py
-test/test_plot.py
+test/test_aeroviz_imports.py

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/AeroViz.egg-info/requires.txt

@@ -5,5 +5,6 @@ scipy==1.14.0
 seaborn==0.13.2
 scikit-learn==1.5.1
 windrose==1.9.2
+cartopy==0.24.1
 tabulate==0.9.0
 rich~=13.7.1

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AeroViz
-Version: 0.1.8
+Version: 0.1.9.1
 Summary: Aerosol science
 Home-page: https://github.com/Alex870521/AeroViz
 Author: alex
@@ -18,6 +18,7 @@ Requires-Dist: scipy==1.14.0
 Requires-Dist: seaborn==0.13.2
 Requires-Dist: scikit-learn==1.5.1
 Requires-Dist: windrose==1.9.2
+Requires-Dist: cartopy==0.24.1
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: rich~=13.7.1
 

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/requirements.txt

@@ -5,5 +5,6 @@ scipy==1.14.0
 seaborn==0.13.2
 scikit-learn==1.5.1
 windrose==1.9.2
+cartopy==0.24.1
 tabulate==0.9.0
 rich~=13.7.1

{aeroviz-0.1.8 → aeroviz-0.1.9.1}/setup.py

@@ -5,7 +5,7 @@ with open('requirements.txt') as f:
 
 setup(
     name="AeroViz",
-    version="0.1.8",
+    version="0.1.9.1",
     author="alex",
     author_email="alex870521@gmail.com",
     description="Aerosol science",

aeroviz-0.1.8/test/test_plot.py

@@ -1,132 +0,0 @@
-from pathlib import Path
-from AeroViz import plot, DataBase, DataClassifier
-
-
-def use_scatter():
-    # example of using plot.scatter
-    df = DataBase(load_data=True)
-
-    df = df[['Vis_LPV', 'PM2.5', 'RH', 'VC', 'Extinction', 'Scattering']].dropna()
-    # plot.scatter(df, x='PM2.5', y='Extinction', c='VC', s='RH', cmap='YlGnBu', diagonal=True)
-    plot.scatter(df, x='Scattering', y='Extinction', color='r', regression=True, regression_line_color='darkred',
-                 diagonal=True)
-
-
-def use_regression():
-    # example of using plot.linear_regression
-    df = DataBase(load_data=True)
-
-    plot.linear_regression(df, x='PM2.5', y='Extinction')
-    plot.linear_regression(df, x='PM2.5', y=['Extinction', 'Scattering', 'Absorption'], xlim=[0, None], ylim=[0, None])
-    # plot.multiple_linear_regression(df, x=['AS', 'AN', 'OM', 'EC', 'SS', 'Soil'], y=['Extinction'])
-    # plot.multiple_linear_regression(df, x=['NO', 'NO2', 'CO', 'PM1'], y=['PM25'])
-
-
-def use_pie():
-    pass
-
-
-def use_bar():
-    pass
-
-
-def use_CBPF_windrose():
-    # example of using plot.meteorology
-    df = DataBase(load_data=True)
-
-    # plot.meteorology.wind_rose(df, 'WS', 'WD', typ='bar')
-    # plot.meteorology.wind_rose(df, 'WS', 'WD', 'PM25', typ='scatter')
-
-    # plot.meteorology.CBPF(df, 'WS', 'WD', 'PM25')
-    # plot.meteorology.CBPF(df, 'WS', 'WD', 'PM25', percentile=[0, 25])
-    # plot.meteorology.CBPF(df, 'WS', 'WD', 'PM25', percentile=[25, 50])
-    # plot.meteorology.CBPF(df, 'WS', 'WD', 'PM25', percentile=[50, 75])
-    plot.meteorology.CBPF(df, 'WS', 'WD', 'PM2.5', percentile=[75, 100], resolution=50)
-
-
-def use_SMPS():
-    # example of using plot.distribution
-    PNSD = DataBase(load_PSD=True)
-
-    plot.distribution.heatmap(PNSD, unit='Number')
-    plot.distribution.heatmap_tms(PNSD, unit='Number', freq='60d')
-
-    # Classify the data
-    # PNSD_state_class, _ = DataClassifier(df=PNSD, by='State', statistic='Table')
-    # plot.distribution.plot_dist(PNSD_state_class, _, unit='Number', additional='error')
-
-    # PNSE_ext_class, _ = DataClassifier(df=PNSD, by='Extinction', statistic='Table', qcut=20)
-    # plot.distribution.three_dimension(PNSE_ext_class, unit='Number')
-
-    # plot.distribution.curve_fitting(np.array(PNSE_ext_class.columns, dtype=float), PNSE_ext_class.iloc[0, :], mode=3, unit='Number')
-
-
-def use_linear_regression_and_scatter_to_verify():
-    # example of using plot.linear_regression and plot.scatter
-    df = DataBase(load_data=True)
-
-    plot.linear_regression(df, x='Extinction', y=['Bext_internal', 'Bext_external'], xlim=[0, 300], ylim=[0, 600])
-    plot.linear_regression(df, x='Scattering', y=['Bsca_internal', 'Bsca_external'], xlim=[0, 300], ylim=[0, 600])
-    plot.linear_regression(df, x='Absorption', y=['Babs_internal', 'Babs_external'], xlim=[0, 100], ylim=[0, 200])
-
-    plot.scatter(df, x='Extinction', y='Bext_Fixed_PNSD', xlim=[0, 600], ylim=[0, 600], title='Fixed PNSD',
-                 regression=True, diagonal=True)
-    plot.scatter(df, x='Extinction', y='Bext_Fixed_RI', xlim=[0, 600], ylim=[0, 600], title='Fixed RI',
-                 regression=True, diagonal=True)
-
-
-def use_extinction_by_particle_gas():
-    # example of using plot.bar and plot.pie
-    df = DataBase(load_data=True)
-
-    ser_grp_sta, ser_grp_sta_std = DataClassifier(df, by='State', df_support=df)
-    ext_particle_gas = ser_grp_sta.loc[:, ['Scattering', 'Absorption', 'ScatteringByGas', 'AbsorptionByGas']]
-
-    # plot.bar(data_set=ext_particle_gas, data_std=None,
-    #          labels=[rf'$b_{{sp}}$', rf'$b_{{ap}}$', rf'$b_{{sg}}$', rf'$b_{{ag}}$'],
-    #          unit='Extinction',
-    #          style="stacked",
-    #          colors=plot.Color.paired)
-
-    plot.pie(data_set=ext_particle_gas,
-             labels=[rf'$b_{{sp}}$', rf'$b_{{ap}}$', rf'$b_{{sg}}$', rf'$b_{{ag}}$'],
-             unit='Extinction',
-             style='donut',
-             colors=plot.Color.paired,
-             title=['', '', '', ''])
-
-
-def use_timeseries():
-    # example of using plot.timeseries
-    df = DataBase(load_data=True)
-
-    # plot.timeseries(df['2021-02-01':'2021-03-31'],
-    #                 y=['Extinction', 'Scattering'], color=None, style=['line', 'line'],
-    #                 ylim=[0, None], ylim2=[0, None], rolling=50,
-    #                 inset_kws2=dict(bbox_to_anchor=(1.12, 0, 1.2, 1)))
-
-    plot.timeseries(df['2021-02-01':'2021-02-11'],
-                    y='WS', color='WD', style='scatter',
-                    scatter_kws=dict(cmap='hsv'), cbar_kws=dict(ticks=[0, 90, 180, 270, 360]),
-                    ylim=[0, None])
-
-    # plot.timeseries_template(df.loc['2021-02-01':'2021-03-31'])
-
-
-def use_diurnal_pattern():
-    df = DataBase(load_data=True)
-    plot.diurnal_pattern(df, 'PM2.5')
-
-
-def use_hysplit():
-    plot.hysplit(Path("/AeroViz/data/240228_00.txt"))
-
-if __name__ == '__main__':
-    # use_SMPS()
-    # use_scatter()
-    # use_regression()
-    # use_CBPF_windrose()
-    # use_extinction_by_particle_gas()
-    # use_timeseries()
-    # use_diurnal_pattern()
-    use_hysplit()