PyVisualFields 2.0.4__tar.gz → 2.0.6__tar.gz

{pyvisualfields-2.0.4/src/PyVisualFields.egg-info → pyvisualfields-2.0.6}/PKG-INFO

@@ -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 → pyvisualfields-2.0.6}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="PyVisualFields",
-    version="2.0.4",
+    version="2.0.6",
     author="Mohammad Eslami, Bharath Erusalagandi, Mousa Moradi",
     author_email="Mohammad_eslami@meei.harvard.edu",
     description="A python toolkit for visual field analysis",
@@ -16,14 +16,15 @@ setuptools.setup(
         "Bug Tracker": "https://github.com/mohaEs/PyVisualField/issues",
         "Demo Normalization": "https://github.com/mohaEs/PyVisualField/blob/main/demo_2_Deviation_Analysis.ipynb",
         "Demo Plotting": "https://github.com/mohaEs/PyVisualField/blob/main/demo_3_Plotting.ipynb",
-        "Demo Prorgression Analysis": "https://github.com/mohaEs/PyVisualField/blob/main/demo_4_Analysis.ipynb",
+        "Demo Progression Analysis": "https://github.com/mohaEs/PyVisualField/blob/main/demo_4_ProgressionAnalysis.ipynb",
         "Demo Data": "https://github.com/mohaEs/PyVisualField/blob/main/demo_1_Data.ipynb",    
         "Demo Glaucoma Detection": "https://github.com/mohaEs/PyVisualField/blob/main/demo5_PyGlaucoMetrics.ipynb",    
         "Harvard Ophthalmology AI LAB": "https://ophai.hms.harvard.edu/" 
     },
+    license="BSD-3-Clause",
     classifiers=[
         "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
+        "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
     ],
     package_dir={"": "src"},

{pyvisualfields-2.0.4 → pyvisualfields-2.0.6}/src/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-2.0.6/src/PyVisualFields/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.0.6"

{pyvisualfields-2.0.4 → pyvisualfields-2.0.6/src/PyVisualFields.egg-info}/PKG-INFO

@@ -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/src/PyVisualFields/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.0.4"