PyVisualFields 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

PyVisualFields/PyGlaucoMetrics.py

@@ -311,11 +311,14 @@ def HAP2_part2_severity(row):
     l_cols = [f"l{i}" for i in range(1, 55) if f"l{i}" in row.index]
     pdp_cols = [f"pdp{i}" for i in range(1, 55) if f"pdp{i}" in row.index]
 
-    if "md" not in row.index:
-        return "Unknown"
+    # if "md" not in row.index:
+    #     return "Unknown"
 
-    md = pd.to_numeric(row["md"], errors="coerce")
-    if pd.isna(md):
+    if "md" in row.index and pd.notna(row["md"]):
+        md = pd.to_numeric(row["md"], errors="coerce")
+    elif "tmd" in row.index and pd.notna(row["tmd"]):
+        md = pd.to_numeric(row["tmd"], errors="coerce")
+    else:
         return "Unknown"
 
     sens = pd.to_numeric(row[l_cols], errors="coerce")
@@ -371,9 +374,25 @@ def HAP2_part2_severity(row):
         return "Early"
 
     # -------------------------
-    # Otherwise moderate
+    # Moderate defect
+    # At least one criterion
     # -------------------------
-    return "Moderate"
+    only_one_hemifield_central_lt15 = (
+        (sup_lt15 and not inf_lt15)
+        or (inf_lt15 and not sup_lt15)
+    )
+
+    moderate = (
+        (-12 <= md <= -6)
+        or (only_one_hemifield_central_lt15 and not any_central_0)
+        or (13 <= n_pdp_5 <= 26)
+        or (5 <= n_pdp_1 <= 13)
+    )
+
+    if moderate:
+        return "Moderate"
+
+    return ""
 
 
 def Fn_HAP2_part2(df):

PyVisualFields/__init__.py

@@ -1 +1 @@
-__version__ = "2.0.4"
+__version__ = "2.0.6"

{pyvisualfields-2.0.4.dist-info → pyvisualfields-2.0.6.dist-info}/METADATA

@@ -1,19 +1,20 @@
 Metadata-Version: 2.4
 Name: PyVisualFields
-Version: 2.0.4
+Version: 2.0.6
 Summary: A python toolkit for visual field analysis
 Home-page: https://github.com/mohaEs/PyVisualField
 Author: Mohammad Eslami, Bharath Erusalagandi, Mousa Moradi
 Author-email: Mohammad_eslami@meei.harvard.edu
+License: BSD-3-Clause
 Project-URL: Bug Tracker, https://github.com/mohaEs/PyVisualField/issues
 Project-URL: Demo Normalization, https://github.com/mohaEs/PyVisualField/blob/main/demo_2_Deviation_Analysis.ipynb
 Project-URL: Demo Plotting, https://github.com/mohaEs/PyVisualField/blob/main/demo_3_Plotting.ipynb
-Project-URL: Demo Prorgression Analysis, https://github.com/mohaEs/PyVisualField/blob/main/demo_4_Analysis.ipynb
+Project-URL: Demo Progression Analysis, https://github.com/mohaEs/PyVisualField/blob/main/demo_4_ProgressionAnalysis.ipynb
 Project-URL: Demo Data, https://github.com/mohaEs/PyVisualField/blob/main/demo_1_Data.ipynb
 Project-URL: Demo Glaucoma Detection, https://github.com/mohaEs/PyVisualField/blob/main/demo5_PyGlaucoMetrics.ipynb
 Project-URL: Harvard Ophthalmology AI LAB, https://ophai.hms.harvard.edu/
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
@@ -29,6 +30,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist

{pyvisualfields-2.0.4.dist-info → pyvisualfields-2.0.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 PyVisualFields/Deviation_Analysis.py,sha256=kgi0fJyF0wvJTDjswiD6F7DC78S0s4B1Siu8By3IjzA,28110
-PyVisualFields/PyGlaucoMetrics.py,sha256=SGKiihats2IU3sME3GdYyg2933U-sb7Jk1NwXzE6lCA,23432
-PyVisualFields/__init__.py,sha256=ZOg41aCgKEuObK5WhegikXektFWPJaeZ-TMDh0Ke95M,22
+PyVisualFields/PyGlaucoMetrics.py,sha256=-Uj_pO9yxqY6-H4ZhrSRdE3zbMdnyy68wLo2i_kmvN0,23956
+PyVisualFields/__init__.py,sha256=4Yxft_MNOtwQG58mZpa8eoM0XBHa8VNkTPH9_i0gDaM,22
 PyVisualFields/utils.py,sha256=z_jnJiLnbxTH1hkN-ZfVNmCQqpJwsuYXSl0wEYx7uRE,24626
 PyVisualFields/vfprogression.py,sha256=FjKtVZ3DRcS31CZRcAHMTfDxYYF3UWLTOjcr3YZdCRg,34215
 PyVisualFields/visualFields.py,sha256=aSZaKE5pc67TyuVtrMLYtKe7lbInzVWKnpP-6ezQwHA,61905
@@ -18,8 +18,8 @@ PyVisualFields/pkl_files/vfctrSunyiu24d2.pkl,sha256=e2hspPbpVYWXBDVn6fJ9KRK-JYIH
 PyVisualFields/pkl_files/vfpwgRetest24d2.pkl,sha256=WyWZ3mHr1JL4TCUVUu0WFpIFdqAiwvNyL_pd51duPKY,106683
 PyVisualFields/pkl_files/vfpwgSunyiu24d2.pkl,sha256=kYIreVpqaRX-Hkl9ZPZ7agnqJplu8DxFM08X17L_fTg,14598
 PyVisualFields/pkl_files/vfseries.pkl,sha256=aWkDkByTkgmCKH2nYZrB1hoHt-fi_FxY1gamZ6iqZu0,36363
-pyvisualfields-2.0.4.dist-info/licenses/LICENSE,sha256=m3BJDRLy-Xnz1WmgtnVniIpPIlwv0MYil80-tjCetYc,1570
-pyvisualfields-2.0.4.dist-info/METADATA,sha256=maBlo7s8o5CzOam3L2toNb1W35lrG5ALJgR7aTyL0-c,12778
-pyvisualfields-2.0.4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pyvisualfields-2.0.4.dist-info/top_level.txt,sha256=r-Mpr1QBoJaRDJQ-POzcuukSnBCkNasixPj3P2UWWRw,15
-pyvisualfields-2.0.4.dist-info/RECORD,,
+pyvisualfields-2.0.6.dist-info/licenses/LICENSE,sha256=m3BJDRLy-Xnz1WmgtnVniIpPIlwv0MYil80-tjCetYc,1570
+pyvisualfields-2.0.6.dist-info/METADATA,sha256=CvqdCh02vVa8E-IxZlbz5rQJzOSBvCivXlvdzi9bfso,12829
+pyvisualfields-2.0.6.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pyvisualfields-2.0.6.dist-info/top_level.txt,sha256=r-Mpr1QBoJaRDJQ-POzcuukSnBCkNasixPj3P2UWWRw,15
+pyvisualfields-2.0.6.dist-info/RECORD,,