From ab0f323a862971991fa8b691f8d4143e9ce3408b Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 19:48:10 +0200 Subject: [PATCH 01/11] rename files to avoid crash in github action --- ...lsating-sphere.ipynb => animations-pulsating-sphere.ipynb.tmp} | 0 ...ons_pulsating_sphere.py => animations_pulsating_sphere.py.tmp} | 0 .../{plot_particle_density.py => plot_particle_density.py.tmp} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename doc/examples/{animations-pulsating-sphere.ipynb => animations-pulsating-sphere.ipynb.tmp} (100%) rename doc/examples/{animations_pulsating_sphere.py => animations_pulsating_sphere.py.tmp} (100%) rename doc/examples/{plot_particle_density.py => plot_particle_density.py.tmp} (100%) diff --git a/doc/examples/animations-pulsating-sphere.ipynb b/doc/examples/animations-pulsating-sphere.ipynb.tmp similarity index 100% rename from doc/examples/animations-pulsating-sphere.ipynb rename to doc/examples/animations-pulsating-sphere.ipynb.tmp diff --git a/doc/examples/animations_pulsating_sphere.py b/doc/examples/animations_pulsating_sphere.py.tmp similarity index 100% rename from doc/examples/animations_pulsating_sphere.py rename to doc/examples/animations_pulsating_sphere.py.tmp diff --git a/doc/examples/plot_particle_density.py b/doc/examples/plot_particle_density.py.tmp similarity index 100% rename from doc/examples/plot_particle_density.py rename to doc/examples/plot_particle_density.py.tmp From 847d092a15fbe8ef0634bf2b3a7f44e687d552df Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 19:54:08 +0200 Subject: [PATCH 02/11] tmp mods for github action running through --- .github/workflows/test.yml | 6 +++--- doc/examples.rst | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 54f10553..05bcd537 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,9 +8,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macOS-latest, windows-latest] - python-version: ['3.11', '3.12'] - + os: [ubuntu-latest] + python-version: ['3.12'] + steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/doc/examples.rst b/doc/examples.rst index 0248604a..05139c39 100644 --- a/doc/examples.rst +++ b/doc/examples.rst @@ -16,5 +16,4 @@ Examples examples/sound-field-synthesis examples/modal-room-acoustics examples/mirror-image-source-model - examples/animations-pulsating-sphere example-python-scripts From 912c28162272e638b713dd410f8c16925374d8f4 Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 19:58:22 +0200 Subject: [PATCH 03/11] tmp mods for github action running through --- doc/example-python-scripts.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/example-python-scripts.rst b/doc/example-python-scripts.rst index 2e38f113..9b85f635 100644 --- a/doc/example-python-scripts.rst +++ b/doc/example-python-scripts.rst @@ -5,8 +5,5 @@ Various example scripts are located in the directory ``doc/examples/``, e.g. * :download:`examples/horizontal_plane_arrays.py`: Computes the sound fields for various techniques, virtual sources and loudspeaker array configurations -* :download:`examples/animations_pulsating_sphere.py`: Creates animations of a - pulsating sphere, see also `the corresponding Jupyter notebook - `__ * :download:`examples/soundfigures.py`: Illustrates the synthesis of sound figures with Wave Field Synthesis From 383286a0a7aa065ddb52002cc85eb54c1fb3a576 Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:15:24 +0200 Subject: [PATCH 04/11] Update conf.py extlinks formating issue --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 35b28742..00865f9b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -83,7 +83,7 @@ } extlinks = {'sfs': ('https://sfs.readthedocs.io/en/3.2/%s', - 'https://sfs.rtfd.io/')} + 'https://sfs.rtfd.io/%s')} plot_include_source = True plot_html_show_source_link = False From d20e99556fc1bf331410bc395e2b1bc811ff440a Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:34:33 +0200 Subject: [PATCH 05/11] Update array.py --- sfs/array.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sfs/array.py b/sfs/array.py index 17274757..e17450b5 100644 --- a/sfs/array.py +++ b/sfs/array.py @@ -661,6 +661,7 @@ def weights_midpoint(positions, *, closed): Examples -------- >>> import sfs + >>> np.set_printoptions(legacy='1.25') # tmp solve for numpy2 format issue >>> x0, n0, a0 = sfs.array.circular(2**5, 1) >>> a = sfs.array.weights_midpoint(x0, closed=True) >>> max(abs(a0-a)) From 0ac834c7d6e7cbeddd89848497808a6ffbd0e0b0 Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:42:03 +0200 Subject: [PATCH 06/11] Update array.py remove set_print as it did not work --- sfs/array.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sfs/array.py b/sfs/array.py index e17450b5..17274757 100644 --- a/sfs/array.py +++ b/sfs/array.py @@ -661,7 +661,6 @@ def weights_midpoint(positions, *, closed): Examples -------- >>> import sfs - >>> np.set_printoptions(legacy='1.25') # tmp solve for numpy2 format issue >>> x0, n0, a0 = sfs.array.circular(2**5, 1) >>> a = sfs.array.weights_midpoint(x0, closed=True) >>> max(abs(a0-a)) From f1009f7dcf7d736e11f9d00f4048a80a7b559c86 Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:42:27 +0200 Subject: [PATCH 07/11] Update array.py try this insetad --- sfs/array.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfs/array.py b/sfs/array.py index 17274757..6e70a54f 100644 --- a/sfs/array.py +++ b/sfs/array.py @@ -664,7 +664,7 @@ def weights_midpoint(positions, *, closed): >>> x0, n0, a0 = sfs.array.circular(2**5, 1) >>> a = sfs.array.weights_midpoint(x0, closed=True) >>> max(abs(a0-a)) - 0.0003152601902411123 + np.float64(0.0003152601902411123) """ positions = _util.asarray_of_rows(positions) From 1f9b213bf63c98c1d18e71f1d28c01f70482f558 Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:43:14 +0200 Subject: [PATCH 08/11] Update array.py row_stack -> vstack --- sfs/array.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfs/array.py b/sfs/array.py index 6e70a54f..148a5b5f 100644 --- a/sfs/array.py +++ b/sfs/array.py @@ -672,7 +672,7 @@ def weights_midpoint(positions, *, closed): before, after = -1, 0 # cyclic else: before, after = 1, -2 # mirrored - positions = _np.row_stack((positions[before], positions, positions[after])) + positions = _np.vstack((positions[before], positions, positions[after])) distances = _np.linalg.norm(_np.diff(positions, axis=0), axis=1) return (distances[:-1] + distances[1:]) / 2 From 6bd6b5b0131c7a77021a71b733a9cfff5e03a2bf Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:51:02 +0200 Subject: [PATCH 09/11] redo --- doc/example-python-scripts.rst | 3 +++ doc/examples.rst | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/example-python-scripts.rst b/doc/example-python-scripts.rst index 9b85f635..2e38f113 100644 --- a/doc/example-python-scripts.rst +++ b/doc/example-python-scripts.rst @@ -5,5 +5,8 @@ Various example scripts are located in the directory ``doc/examples/``, e.g. * :download:`examples/horizontal_plane_arrays.py`: Computes the sound fields for various techniques, virtual sources and loudspeaker array configurations +* :download:`examples/animations_pulsating_sphere.py`: Creates animations of a + pulsating sphere, see also `the corresponding Jupyter notebook + `__ * :download:`examples/soundfigures.py`: Illustrates the synthesis of sound figures with Wave Field Synthesis diff --git a/doc/examples.rst b/doc/examples.rst index 05139c39..0248604a 100644 --- a/doc/examples.rst +++ b/doc/examples.rst @@ -16,4 +16,5 @@ Examples examples/sound-field-synthesis examples/modal-room-acoustics examples/mirror-image-source-model + examples/animations-pulsating-sphere example-python-scripts From b20741806b370d5ecaf11e29b17a38780acc087b Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:51:59 +0200 Subject: [PATCH 10/11] redo --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05bcd537..54f10553 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,9 +8,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] - python-version: ['3.12'] - + os: [ubuntu-latest, macOS-latest, windows-latest] + python-version: ['3.11', '3.12'] + steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} From 7162ecbf534fcbcac941c457b21f544971be9f00 Mon Sep 17 00:00:00 2001 From: Frank Schultz Date: Tue, 8 Jul 2025 20:52:34 +0200 Subject: [PATCH 11/11] redo --- ...lsating-sphere.ipynb.tmp => animations-pulsating-sphere.ipynb} | 0 ...ons_pulsating_sphere.py.tmp => animations_pulsating_sphere.py} | 0 .../{plot_particle_density.py.tmp => plot_particle_density.py} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename doc/examples/{animations-pulsating-sphere.ipynb.tmp => animations-pulsating-sphere.ipynb} (100%) rename doc/examples/{animations_pulsating_sphere.py.tmp => animations_pulsating_sphere.py} (100%) rename doc/examples/{plot_particle_density.py.tmp => plot_particle_density.py} (100%) diff --git a/doc/examples/animations-pulsating-sphere.ipynb.tmp b/doc/examples/animations-pulsating-sphere.ipynb similarity index 100% rename from doc/examples/animations-pulsating-sphere.ipynb.tmp rename to doc/examples/animations-pulsating-sphere.ipynb diff --git a/doc/examples/animations_pulsating_sphere.py.tmp b/doc/examples/animations_pulsating_sphere.py similarity index 100% rename from doc/examples/animations_pulsating_sphere.py.tmp rename to doc/examples/animations_pulsating_sphere.py diff --git a/doc/examples/plot_particle_density.py.tmp b/doc/examples/plot_particle_density.py similarity index 100% rename from doc/examples/plot_particle_density.py.tmp rename to doc/examples/plot_particle_density.py