Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix path finder #714

Merged
merged 160 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
f7f915b
add test for reflexion using issue
nicolas-f Oct 7, 2024
f7f41a5
enhance test
nicolas-f Oct 7, 2024
068849a
projection cones where filtered out by checking other walls of the sa…
nicolas-f Oct 7, 2024
ef28e52
advanced export of projection cones, with reflection order recursive
nicolas-f Oct 8, 2024
70e8250
fix image source fetching
nicolas-f Oct 8, 2024
51b7a64
Correction Impact Noise / Calcul / Test
Adrien-lb Oct 8, 2024
b3dbbd5
Update Create_Isosurface.groovy
MaguetteD Oct 9, 2024
27e2d38
fix reflection code. Complete unit test with second order reflection.
nicolas-f Oct 10, 2024
aa22a02
artifact v4
nicolas-f Oct 10, 2024
24db249
edit Cl.yml version :
Adrien-lb Oct 11, 2024
d0cc5d8
fix interpolation and normalize inserted polygons (this operation was…
nicolas-f Oct 11, 2024
94a1667
updated fields
nicolas-f Oct 11, 2024
2eaecf0
Revert "Update Create_Isosurface.groovy"
nicolas-f Oct 11, 2024
f79593a
upload v4 again
nicolas-f Oct 11, 2024
402779a
Merge pull request #692 from Universite-Gustave-Eiffel/fix_revert
nicolas-f Oct 11, 2024
2f5c361
Merge remote-tracking branch 'origin/4.X' into fixReflection
nicolas-f Oct 11, 2024
041385c
check reflection with a DEM at 500m
nicolas-f Oct 11, 2024
a53b819
rename attribute
nicolas-f Oct 15, 2024
e46a27e
update json test
nicolas-f Oct 15, 2024
0bc9f87
Merge remote-tracking branch 'origin/fixReflection' into fixReflection5X
nicolas-f Oct 15, 2024
49b57e7
merge refl fix
nicolas-f Oct 15, 2024
4b74a73
fix building Z
nicolas-f Oct 15, 2024
cd8e752
fix xml version, export raypath
nicolas-f Oct 15, 2024
381d92c
add altered version of cnossos result
nicolas-f Oct 15, 2024
03cfe1a
export all paths
nicolas-f Oct 16, 2024
5d259be
good? path
nicolas-f Oct 16, 2024
16789ed
reformated
nicolas-f Oct 16, 2024
4174cef
refactoring of get profile (fix, simplification, clarity, performance)
nicolas-f Oct 16, 2024
3241a17
fetch ground coefficient
nicolas-f Oct 17, 2024
2c314ef
TC11 pass
nicolas-f Oct 17, 2024
d3af39f
lower some unit test expected error
nicolas-f Oct 17, 2024
ca5f983
remove duplicate code, stop propagation early if horizontal edge diff…
nicolas-f Oct 17, 2024
d7b61d2
fix freefield
nicolas-f Oct 18, 2024
a4f22a1
commit good tc1 data
nicolas-f Oct 18, 2024
1a567f2
save source and receiver id
nicolas-f Oct 18, 2024
24d719c
export all, set with expected result
nicolas-f Oct 18, 2024
d750f1a
Fix mean plane coefficient for receiver source paths on diffraction o…
nicolas-f Oct 18, 2024
64f8003
cleaning, interpolation of TopoZ value
nicolas-f Oct 18, 2024
f3b20e5
fix freefield intersection test
nicolas-f Oct 18, 2024
64ac142
fix topo Z
nicolas-f Oct 18, 2024
2874642
clean code
nicolas-f Oct 21, 2024
688456e
move raylay code from old freefield function
nicolas-f Oct 21, 2024
db4b562
feed points
nicolas-f Oct 21, 2024
eb40997
wrong adding segment position
nicolas-f Oct 22, 2024
6f902d8
fix weird code with all kind of different segments deduces from CutPo…
nicolas-f Oct 22, 2024
f4c00ed
TC07 Ok (now use the real table 33 of unit test TC07)
nicolas-f Oct 23, 2024
e6f8ac7
pts2DGround should not return topographic points under the building p…
nicolas-f Oct 23, 2024
6c0f326
Processing is done two times on post-reflection code. Remove weird ad…
nicolas-f Oct 23, 2024
c7d5cd7
factorize unit test code
nicolas-f Oct 23, 2024
b7c928a
TC14 error in cnossos document for 3 Zs values.
nicolas-f Oct 23, 2024
5edac44
Fix reflection z-profile. TODO TC16 Table 169 and 170 must be added.
nicolas-f Oct 24, 2024
8a8d3cf
TODO TC16 Table 169 and 170 must be added.
nicolas-f Oct 24, 2024
6b9c0aa
fix tc23 and tc24 dem as topographic lines over beam was not parallel…
nicolas-f Oct 29, 2024
8b9be21
remove check face normal as points will be removed later
nicolas-f Oct 29, 2024
b0ed798
add unit test for new coordinate system function
nicolas-f Oct 29, 2024
d4884f9
disable diffraction on unit test, enable reflection
nicolas-f Oct 29, 2024
81a4611
fix ground coeff for overlapping grounds polygons
nicolas-f Oct 30, 2024
0f2ab36
not done. TODO Reflexion code should construct the CutProfile from re…
nicolas-f Oct 30, 2024
4a6f2c6
construct the CutProfile from receiver to source (with all reflexion …
nicolas-f Nov 4, 2024
2db4821
path finder hedge, take account of reflection point
nicolas-f Nov 5, 2024
e56e6d7
Merge pull request #689 from Adrien-lb/5.X_FERV3
nicolas-f Nov 5, 2024
070fc45
clean
nicolas-f Nov 5, 2024
6f6ea3d
keep index to 2d
nicolas-f Nov 6, 2024
ae93869
fix diff rayleigh (wrong 2d source-receiver position)
nicolas-f Nov 6, 2024
6054652
fix h edge diffraction ground point index correspondence.
nicolas-f Nov 6, 2024
0d3c8be
add duplication of reflection cut points as specified in cnossos
nicolas-f Nov 6, 2024
f020508
remove redundant attribute
nicolas-f Nov 6, 2024
21cfce9
check r and s prime in unit test
nicolas-f Nov 6, 2024
6f03868
reflexion height update with diffraction. Path is rejected if the upd…
nicolas-f Nov 6, 2024
131a88d
remove redundant check reflection
nicolas-f Nov 7, 2024
1b4ad47
update obstacleZ
nicolas-f Nov 7, 2024
79addf7
fix order diffvedge
nicolas-f Nov 7, 2024
ec81b7f
Rework diffraction on vertical edge. PointPath and Cnossos Path is no…
nicolas-f Nov 8, 2024
1797d2c
add zprofile test unit
nicolas-f Nov 8, 2024
a276b74
check z profile SO OR
nicolas-f Nov 8, 2024
494c005
fix npe
nicolas-f Nov 8, 2024
bfb1bde
fix wrong fetch of the ground points
nicolas-f Nov 12, 2024
7affb49
fix convexhull, do not add points as input of convex hull that lies o…
nicolas-f Nov 12, 2024
51416bf
fix issue with building creation in unit test (wrong additional point)
nicolas-f Nov 12, 2024
3163c50
forget filtering points in hull. Check all paths and coefficients in …
nicolas-f Nov 12, 2024
5061af7
Path Finder Test PASS
nicolas-f Nov 13, 2024
e444dfd
Fix PointPath was in 3d coordinate
nicolas-f Nov 13, 2024
02ebb28
fix ground index offset condition
nicolas-f Nov 13, 2024
1a22191
Fix source line height -> altitude
nicolas-f Nov 13, 2024
e3878d2
remove test that test nothing
nicolas-f Nov 13, 2024
b60592d
remove duplicate data
nicolas-f Nov 14, 2024
5e87395
forget apply source orientation
nicolas-f Nov 14, 2024
69d10f4
TC8 OK. Forget setting deltaH value
nicolas-f Nov 14, 2024
29745b1
TC9 ok, rayleigh attenuation issue so disabled it on diffraction and …
nicolas-f Nov 18, 2024
28124cd
restore postgis test in github workflow
nicolas-f Nov 19, 2024
91fcb9b
fix npe
nicolas-f Nov 19, 2024
92a95f5
fix compute deltaE ok <= TC11
nicolas-f Nov 19, 2024
974b2cf
recompute Z interpolation in diffraction points between R and S. Mayb…
nicolas-f Nov 20, 2024
0d9d31e
find accurate approximation of the buffer used in unit test
nicolas-f Nov 21, 2024
8392435
resetore assert
nicolas-f Nov 22, 2024
dee8255
remove unused code
nicolas-f Nov 22, 2024
77e9dce
was wrong order of ray and data in unit test (was disabled too) TC18
nicolas-f Nov 22, 2024
bbe51b6
Remove reflexion from e computation. Fix variable for delta H computa…
nicolas-f Nov 22, 2024
af2edc8
TC18 0.5 dB error
nicolas-f Nov 22, 2024
21f7980
remove function argument
nicolas-f Nov 22, 2024
faa636e
d dc ? dunno
nicolas-f Nov 22, 2024
67001bb
found issue with retroDiff Abs
nicolas-f Nov 25, 2024
4f9fa63
Fix retroDiff Abs, wrong distance SR
nicolas-f Nov 25, 2024
e230431
remove reflection absorption class as it is cached but should be stor…
nicolas-f Nov 26, 2024
641b54d
wrong input model
nicolas-f Nov 26, 2024
3524093
fix retrodiff, receiver and source coordinates
nicolas-f Nov 26, 2024
3b9b753
fix retrodiff on favorable condition with horizontal diffraction, TC1…
nicolas-f Nov 27, 2024
13faf8e
TC21 pass with 1 dB error
nicolas-f Nov 27, 2024
aa00e1e
TC25 pass < 0.1 dB
nicolas-f Nov 27, 2024
369994a
TC26 pass < 0.5 dB error due to favorable contribution on reflexion p…
nicolas-f Nov 27, 2024
32dfd18
TC27 aGroundF issues..
nicolas-f Nov 27, 2024
296bb6a
add new tests TC27
nicolas-f Nov 28, 2024
8e51c33
TC27 pass with < 0.5 dB. Issue with aGroundF on reflection path
nicolas-f Nov 28, 2024
d7c1d59
TC28 15 dB error, issue with favorable path
nicolas-f Nov 28, 2024
0a5d05f
Fix source line split when there is no topo
nicolas-f Nov 28, 2024
f6dc5e9
fix sql for postgres
nicolas-f Nov 28, 2024
da402a0
fix sql for postgres, table location issues with postgis connection
nicolas-f Nov 28, 2024
21abe60
fix sql for postgres it is working locally
nicolas-f Nov 29, 2024
89c32cf
github action was not catching wps issues of gradle
nicolas-f Nov 29, 2024
3a6ed54
change threading of noisemodelling to be able to see exception when o…
nicolas-f Nov 29, 2024
37057f3
remove overloaded method with wrong code
nicolas-f Nov 29, 2024
de5680b
update cache version
nicolas-f Nov 29, 2024
cac6c5e
replace deprecated version of junit with latest version of junit. sim…
nicolas-f Dec 2, 2024
ed77ad7
handle issue when converting SRID of a table. Use postgis compatible …
nicolas-f Dec 2, 2024
e9e048b
Merge remote-tracking branch 'origin/5.X' into fixReflection5X
nicolas-f Dec 2, 2024
471e3dc
Add flat geobuffer driver
nicolas-f Dec 3, 2024
2143079
add unit test issue with path state
nicolas-f Dec 3, 2024
4062964
fix issue, boolean wrong
nicolas-f Dec 3, 2024
77ab3c0
Complete unit test for regression
nicolas-f Dec 4, 2024
9ed58d5
move Cnossos attenuation stuff from pathfinder to propagation package
nicolas-f Dec 4, 2024
e3dd0fb
Rework cutpoint to remove attributes on unrelated cutpoints type. Pre…
nicolas-f Dec 5, 2024
76de7d3
Fix code scrambled by refactoring
nicolas-f Dec 6, 2024
095e089
Fix code scrambled by refactoring 2
nicolas-f Dec 9, 2024
ddb47d3
Fix code scrambled by refactoring 3
nicolas-f Dec 9, 2024
f762af1
begining test with reference json documents
nicolas-f Dec 9, 2024
dbc0a30
fix json deserialization
nicolas-f Dec 10, 2024
aad2eb9
move pathfinder test to AttenuationCnossosTest
nicolas-f Dec 10, 2024
d56904a
complete pathfinder test with json
nicolas-f Dec 10, 2024
f170e13
complete pathfinder test with json
nicolas-f Dec 10, 2024
d25636c
fix code, now need to remove duplicate points from CutProfile and mov…
nicolas-f Dec 10, 2024
3e4a506
insert primary key in cut profile for wall and buildings
nicolas-f Dec 10, 2024
1fa1e7f
save wall/building primary key
nicolas-f Dec 11, 2024
dac6271
do not duplicate wall and reflection point anymore
nicolas-f Dec 11, 2024
7506f38
simplify function signature
nicolas-f Dec 11, 2024
2ba6b9b
fix zGround conversion
nicolas-f Dec 12, 2024
b0f1538
fix attenuation
nicolas-f Dec 12, 2024
410f479
fix rayleigh
nicolas-f Dec 13, 2024
acd21c9
attenuation cnossos test ok
nicolas-f Dec 13, 2024
ab7ef91
attenuation cnossos test ok, fix pk and index
nicolas-f Dec 13, 2024
322c927
test default state
nicolas-f Dec 13, 2024
3569a70
Fix failed merge with geometry in output tables
nicolas-f Dec 13, 2024
1ae408e
fix coordinate and srid in output tables
nicolas-f Jan 6, 2025
2b38db9
always fetch srid in NoiseMapMaker
nicolas-f Jan 6, 2025
be6347b
do not look for path in the unit test of attenuation computation, use…
nicolas-f Jan 6, 2025
04005aa
prepare file for deviation computation from cnossos tests
nicolas-f Jan 7, 2025
30c6104
read json and evaluate attenuation
nicolas-f Jan 7, 2025
650b0bf
generate main report table
nicolas-f Jan 8, 2025
baebfce
generate main report table in single file
nicolas-f Jan 8, 2025
f19d000
fix doc gen
nicolas-f Jan 8, 2025
471244e
generate final document, readthedocs can't run the compilation of jav…
nicolas-f Jan 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,19 @@ on: [ push, pull_request, workflow_dispatch ]
jobs:
build:
runs-on: ubuntu-latest
services:
postgres:
image: postgis/postgis:16-3.4
env:
# must specify password for PG Docker container image, see: https://registry.hub.docker.com/_/postgres?tab=description&page=1&name=10
POSTGRES_USER: noisemodelling
POSTGRES_PASSWORD: noisemodelling
POSTGRES_DB: noisemodelling_db
ports:
- 5432:5432
# needed because the postgres container does not provide a healthcheck
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
- uses: SPalominos/[email protected]
with:
psql_version: '9.6'
pgis_version: '2.5'
docker_image: 'postgis/postgis'
db_password: 'orbisgis'
db_user: 'orbisgis'
db_name: 'orbisgis_db'
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v1
Expand All @@ -23,9 +27,12 @@ jobs:
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
- name: Building
run: |
mvn test install -B
cd wps_scripts && ./gradlew test --info --stacktrace
run: mvn test install -B
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Build and test WPS with Gradle
run: ./gradlew build --info --stacktrace
working-directory: ./wps_scripts
- name: Deploy
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
Expand All @@ -35,7 +42,7 @@ jobs:
- name: Clean
run: rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- name: Cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
$HOME/.m2/
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ Docs/.build
Docs/venv
profile_*.csv
venv/
.DS_Store
27 changes: 13 additions & 14 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build documentation with MkDocs
#mkdocs:
# configuration: mkdocs.yml
# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"
sphinx:
configuration: Docs/conf.py

# Optionally build your docs in additional formats such as PDF and ePub
formats:
- pdf
- htmlzip
- epub

build:
os: "ubuntu-22.04"
tools:
python: "3.11"
# Optionally declare the Python requirements required to build your docs
python:
install:
- requirements: Docs/requirements.txt


Loading
Loading