Update iso calculation to enable adjusted angles

Signed-off-by: Andrew Mitchell <mitchellacoustics15@gmail.com>
MitchellAcoustics · Jan 25, 2024 · 0aa7ebd · 0aa7ebd
1 parent 88b2f53
commit 0aa7ebd
Show file tree

Hide file tree

Showing 10 changed files with 845 additions and 4,224 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,3 +10,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Changed the name of the `calculate_paq_coords` to `calculate_iso_coords` to better reflect the function's purpose.
+- Updated the formula for `calculate_iso_coords` to the more generalised form given in Aletta et. al. (2024).
diff --git a/docs/tutorials/HowToAnalyseAndRepresentSoundscapes.ipynb b/docs/tutorials/HowToAnalyseAndRepresentSoundscapes.ipynb
diff --git a/docs/tutorials/QuickStart.ipynb b/docs/tutorials/QuickStart.ipynb
diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "soundscapy"
-version = "0.5.3"
+version = "0.6.0"
 description = "A python library for analysing and visualising soundscape assessments."
 authors = [
     { name = "Andrew Mitchell", email = "andrew.mitchell.18@ucl.ac.uk" },
@@ -74,4 +74,6 @@ dev = [
     "black>=23.7.0",
     "pycircular>=0.1.2",
     "statsmodels>=0.14.0",
+    "ndtest @ git+https://github.com/syrte/ndtest",
+    "librosa>=0.10.1",
 ]
diff --git a/soundscapy/__init__.py b/soundscapy/__init__.py
@@ -6,7 +6,7 @@
 
 from soundscapy.analysis._AnalysisSettings import AnalysisSettings, get_default_yaml
 from soundscapy.analysis._Binaural import Binaural
-from soundscapy.utils import _sspy_accessor, surveys
+from soundscapy.utils import _sspy_accessor, surveys, ssid
 from soundscapy.databases import isd, araus, satp
 from soundscapy import plotting
 

diff --git a/soundscapy/utils/parameters.py b/soundscapy/utils/parameters.py
@@ -65,3 +65,21 @@
     "demographics": ["Age", "Gender", "Occupation", "Education", "Ethnicity", "Resid"],
     "misc": ["AnythingElse"],
 }
+
+EQUAL_ANGLES = (0, 45, 90, 135, 180, 225, 270, 315)
+
+# Adjusted angles as defined in Aletta et. al. (2024)
+LANGUAGE_ANGLES = {
+    "eng": (0, 46, 94, 138, 177, 241, 275, 340),
+    "arb": (0, 36, 45, 135, 167, 201, 242, 308),
+    "cmn": (0, 18, 38, 154, 171, 196, 217, 318),
+    "hrv": (0, 84, 93, 160, 173, 243, 273, 354),
+    "nld": (0, 43, 111, 125, 174, 257, 307, 341),
+    "deu": (0, 64, 97, 132, 182, 254, 282, 336),
+    "ell": (0, 72, 86, 133, 161, 233, 267, 328),
+    "ind": (0, 53, 104, 123, 139, 202, 284, 308),
+    "ita": (0, 57, 104, 143, 170, 274, 285, 336),
+    "spa": (0, 41, 103, 147, 174, 238, 279, 332),
+    "swe": (0, 66, 87, 146, 175, 249, 275, 335),
+    "tur": (0, 55, 97, 106, 157, 254, 289, 313),
+}