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.

Sign up for GitHub

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

Jump to bottom

#155 258 145 issues with main #215

Merged
merged 28 commits into from
Dec 7, 2023
Merged

#155 258 145 issues with main #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
aa3ab3a
Update settings file and git ignore file
Mares2022 Oct 30, 2023
aec5a91
Update gitignore
Mares2022 Oct 30, 2023
d496995
Changing .gpkg files
Mares2022 Oct 30, 2023
6692b53
Fixing integration hazard test, removing use on data catalog
Mares2022 Oct 30, 2023
d84429d
Remove path to area of interest and define it as geojson in the test …
Mares2022 Oct 30, 2023
1dd5aa9
Implementation of setup ground elevation function including test
Mares2022 Oct 31, 2023
95779a6
Data produced in the runs
Mares2022 Oct 31, 2023
85cfd61
Change gitignore to avoid conflicts
Mares2022 Oct 31, 2023
def37bd
Update gitignore
Mares2022 Oct 31, 2023
663b2b0
update gitignore
Mares2022 Oct 31, 2023
e4cfee6
Update git ignore
Mares2022 Oct 31, 2023
43b4c3b
Merge pull request #199 from Deltares/#155-Add-function-to-assign-the…
Mares2022 Oct 31, 2023
6f31614
Adding changes to update maximum potential damage and ground elevatio…
Mares2022 Nov 3, 2023
cf1a290
Changes to merges branch with #145
Mares2022 Nov 3, 2023
43f7f46
Update gitignore to merge branch with #145
Mares2022 Nov 3, 2023
3c29aec
Merge pull request #206 from Deltares/#258-Elevation-of-new-developme…
Mares2022 Nov 3, 2023
86d0e0a
Change ground elevation test data
Mares2022 Nov 5, 2023
b32f1f0
Data required for tests
Mares2022 Nov 5, 2023
3339254
Update test data
Mares2022 Nov 5, 2023
f38e1e1
Merge pull request #209 from Deltares/#145-Update-maximum-potential-d…
Mares2022 Nov 5, 2023
b96ae39
Integrate ground elevation from a digital elevation model into the wr…
Mares2022 Nov 13, 2023
2d02af5
Update xarray-spatial in environment and project .toml
Mares2022 Nov 28, 2023
337cffb
Improvement of tests for assigning ground elevation and maximun poten…
Mares2022 Nov 28, 2023
924d101
Updating ground elevation test, and updating maximum potential damage…
Mares2022 Nov 28, 2023
a5c477c
Update test vulnerability exposure with dem data
Mares2022 Nov 28, 2023
ba415ef
remove comented lines that were remplazed with ground_elevation_from_…
Mares2022 Nov 28, 2023
4c9047c
Update tests/test_setup_new_composite_areas_ground_elevation.py
frederique-hub Dec 7, 2023
a86edb2
Update hydromt_fiat/workflows/exposure_vector.py
frederique-hub Dec 7, 2023
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
1 change: 1 addition & 0 deletions Shapefiles/45019/2021/tl_2021_45019_faces.cpg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTF-8
Binary file added Shapefiles/45019/2021/tl_2021_45019_faces.dbf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions Shapefiles/45019/2021/tl_2021_45019_faces.prj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
Binary file added Shapefiles/45019/2021/tl_2021_45019_faces.shp
View file
Open in desktop
Binary file not shown.
1,567 changes: 1,567 additions & 0 deletions Shapefiles/45019/2021/tl_2021_45019_faces.shp.ea.iso.xml
View file
Open in desktop

Large diffs are not rendered by default.

640 changes: 640 additions & 0 deletions Shapefiles/45019/2021/tl_2021_45019_faces.shp.iso.xml
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Shapefiles/45019/2021/tl_2021_45019_faces.shx
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion envs/hydromt-fiat-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ dependencies:
- pip:
- census
- us
- xarray-spatial
- click
- black
- gdal>=3.1
- geopandas
- hydromt
- hydromt=0.8.0
- hydromt_sfincs
- numpy
- osmnx
Expand Down
Binary file modified examples/data/aggregation_zones/fiat_model_aggregation1/exposure/buildings.gpkg
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion examples/data/aggregation_zones/fiat_model_aggregation1/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ file = "./vulnerability/vulnerability_curves.csv"
unit = "feet"
step_size = 0.1

[exposure.csv]
file = "./exposure/exposure.csv"

[exposure.geom]
csv = "./exposure/exposure.csv"
crs = "EPSG:4326"
unit = "ft"
file1 = "./exposure/buildings.gpkg"
Binary file modified examples/data/aggregation_zones/fiat_model_aggregation2/exposure/buildings.gpkg
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion examples/data/aggregation_zones/fiat_model_aggregation2/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ file = "./vulnerability/vulnerability_curves.csv"
unit = "feet"
step_size = 0.1

[exposure.csv]
file = "./exposure/exposure.csv"

[exposure.geom]
csv = "./exposure/exposure.csv"
crs = "EPSG:4326"
unit = "ft"
file1 = "./exposure/buildings.gpkg"
Binary file added ...data/setup_exposure_buildings/test_vulnerability_and_exposure_NSI/exposure/buildings.gpkg
View file
Open in desktop
Binary file not shown.
1,995 changes: 1,995 additions & 0 deletions ...s/data/setup_exposure_buildings/test_vulnerability_and_exposure_NSI/exposure/exposure.csv
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added ...es/data/setup_exposure_buildings/test_vulnerability_and_exposure_NSI/exposure/region.gpkg
View file
Open in desktop
Binary file not shown.
24 changes: 24 additions & 0 deletions examples/data/setup_exposure_buildings/test_vulnerability_and_exposure_NSI/settings.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[global]
crs = "epsg:4326"

[output]
path = "output"

[output.csv]
name = "output.csv"

[output.geom]
name1 = "spatial.gpkg"

[vulnerability]
file = "./vulnerability/vulnerability_curves.csv"
unit = "feet"
step_size = 0.1

[exposure.csv]
file = "./exposure/exposure.csv"

[exposure.geom]
crs = "EPSG:4326"
unit = "ft"
file1 = "./exposure/buildings.gpkg"
37 changes: 37 additions & 0 deletions ...sure_buildings/test_vulnerability_and_exposure_NSI/vulnerability/vulnerability_curves.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#UNIT=feet
#METHOD,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean,mean
water depth [feet],AGR1_structure,COM1_structure,COM10_structure,COM2_structure,COM3_structure,COM4_structure,COM5_structure,COM6_structure,COM7_structure,COM8_structure,COM9_structure,EDU1_structure,EDU2_structure,GOV1_structure,GOV2_structure,IND1_structure,IND2_structure,IND3_structure,IND4_structure,IND5_structure,IND6_structure,REL1_structure,RES1-1SNB_structure,RES1-1SWB_structure,RES1-2SNB_structure,RES1-2SWB_structure,RES1-3SNB_structure,RES1-3SWB_structure,RES2_structure,RES3A_structure,RES3B_structure,RES3C_structure,RES3D_structure,RES3E_structure,RES3F_structure,RES4_structure,RES5_structure,RES6_structure,AGR1_content,COM1_content,COM10_content,COM2_content,COM3_content,COM4_content,COM5_content,COM6_content,COM7_content,COM8_content,COM9_content,EDU1_content,EDU2_content,GOV1_content,GOV2_content,IND1_content,IND2_content,IND3_content,IND4_content,IND5_content,IND6_content,REL1_content,RES1-1SNB_content,RES1-1SWB_content,RES1-2SNB_content,RES1-2SWB_content,RES1-3SNB_content,RES1-3SWB_content,RES2_content,RES3A_content,RES3B_content,RES3C_content,RES3D_content,RES3E_content,RES3F_content,RES4_content,RES5_content,RES6_content
-9.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-8.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.017,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1e-06,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-7.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.007,0.0,0.017,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.008,0.0,0.01,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-6.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.008,0.0,0.019,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.021,0.0,0.023,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-5.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.024,0.0,0.029,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.037,0.0,0.037,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-4.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.052,0.0,0.047,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.057,0.0,0.052,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-3.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.09,0.0,0.072,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.08,0.0,0.068,0.0,0.05,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-2.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.138,0.0,0.102,0.0,0.03,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.105,0.0,0.084,0.0,0.07,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
-1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.025,0.194,0.03,0.139,0.0,0.05,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.024,0.132,0.01,0.101,0.0,0.08,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
0.0,0.0,0.01,0.0,0.0,0.0,0.0,0.0,0.0,0.02,0.01,0.0,0.0,0.0,0.0,0.0,0.01,0.0,0.0,0.0,0.0,0.0,0.0,0.134,0.255,0.093,0.179,0.04,0.06,0.08,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.06,0.02,0.0,0.03,0.004,0.0,0.0,0.0,0.0,0.13,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.02,0.15,0.02,0.0,0.0,0.081,0.16,0.05,0.119,0.06,0.14,0.03,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0
1.0,0.06,0.09,0.03,0.05,0.113,0.128,0.11,0.141,0.11,0.09,0.02,0.136,0.05,0.05,0.07,0.1,0.115,0.13,0.1,0.13,0.22,0.15,0.233,0.32,0.152,0.223,0.08,0.09,0.44,0.12,0.12,0.12,0.12,0.12,0.12,0.113,0.11,0.07,0.2,0.26,0.11,0.16,0.164,0.2,0.5,0.146,0.28,0.45,0.04,0.217,0.27,0.3,0.08,0.15,0.193,0.2,0.2,0.2,0.2,0.293,0.133,0.189,0.087,0.138,0.11,0.18,0.27,0.217,0.217,0.217,0.217,0.217,0.217,0.161,0.15,0.38
2.0,0.11,0.14,0.05,0.08,0.175,0.184,0.11,0.242,0.12,0.11,0.04,0.24,0.07,0.08,0.1,0.12,0.179,0.14,0.14,0.14,0.31,0.25,0.321,0.387,0.209,0.27,0.12,0.15,0.63,0.2,0.2,0.2,0.2,0.2,0.2,0.175,0.17,0.1,0.43,0.42,0.17,0.27,0.289,0.3,0.74,0.27,0.51,0.55,0.06,0.304,0.38,0.59,0.2,0.24,0.31,0.41,0.26,0.41,0.35,0.484,0.179,0.218,0.122,0.157,0.15,0.22,0.49,0.304,0.304,0.304,0.304,0.304,0.304,0.263,0.25,0.6
3.0,0.15,0.16,0.06,0.11,0.225,0.256,0.12,0.311,0.13,0.12,0.05,0.32,0.09,0.13,0.11,0.15,0.244,0.19,0.18,0.19,0.37,0.325,0.401,0.455,0.263,0.319,0.17,0.2,0.73,0.267,0.267,0.267,0.267,0.267,0.267,0.225,0.22,0.14,0.58,0.56,0.2,0.36,0.409,0.4,0.83,0.37,0.6,0.64,0.08,0.39,0.53,0.74,0.38,0.34,0.423,0.51,0.31,0.51,0.47,0.6,0.22,0.247,0.155,0.177,0.19,0.25,0.64,0.39,0.39,0.39,0.39,0.39,0.39,0.341,0.4,0.73
4.0,0.19,0.18,0.07,0.13,0.25,0.256,0.13,0.422,0.14,0.14,0.05,0.35,0.09,0.14,0.12,0.19,0.265,0.22,0.22,0.22,0.43,0.4,0.471,0.522,0.314,0.369,0.19,0.26,0.78,0.283,0.283,0.283,0.283,0.283,0.283,0.25,0.26,0.15,0.65,0.68,0.23,0.49,0.577,0.575,1.0,0.534,0.63,0.73,0.09,0.45,0.64,0.83,0.55,0.41,0.523,0.62,0.37,0.62,0.56,0.693,0.257,0.274,0.185,0.198,0.23,0.29,0.7,0.45,0.45,0.45,0.45,0.45,0.45,0.397,0.5,0.81
5.0,0.25,0.2,0.08,0.16,0.288,0.306,0.15,0.52,0.16,0.16,0.05,0.4,0.1,0.14,0.15,0.22,0.324,0.25,0.26,0.25,0.47,0.475,0.532,0.586,0.362,0.419,0.22,0.31,0.8,0.333,0.333,0.333,0.333,0.333,0.333,0.313,0.3,0.15,0.66,0.78,0.25,0.57,0.633,0.7,1.0,0.7,0.67,0.77,0.1,0.479,0.68,0.9,0.7,0.47,0.607,0.67,0.4,0.67,0.59,0.764,0.288,0.3,0.213,0.22,0.26,0.31,0.76,0.479,0.479,0.479,0.479,0.479,0.479,0.487,0.58,0.88
6.0,0.3,0.23,0.1,0.19,0.363,0.367,0.17,0.633,0.17,0.18,0.06,0.42,0.11,0.15,0.17,0.26,0.388,0.28,0.34,0.28,0.5,0.55,0.586,0.645,0.407,0.469,0.24,0.33,0.81,0.367,0.367,0.367,0.367,0.367,0.367,0.35,0.35,0.16,0.66,0.83,0.29,0.63,0.707,0.8,1.0,0.791,0.71,0.8,0.12,0.519,0.7,1.0,0.81,0.52,0.72,0.71,0.44,0.71,0.66,0.814,0.315,0.324,0.239,0.243,0.29,0.34,0.78,0.519,0.519,0.519,0.519,0.519,0.519,0.524,0.65,0.94
7.0,0.35,0.26,0.13,0.22,0.413,0.453,0.19,0.714,0.18,0.2,0.08,0.432,0.13,0.17,0.2,0.3,0.409,0.3,0.41,0.3,0.54,0.615,0.632,0.698,0.449,0.518,0.25,0.36,0.82,0.387,0.387,0.387,0.387,0.387,0.387,0.385,0.416,0.18,0.67,0.85,0.35,0.69,0.793,0.838,1.0,0.856,0.72,0.82,0.17,0.557,0.72,1.0,0.89,0.57,0.821,0.73,0.48,0.73,0.69,0.884,0.338,0.345,0.263,0.267,0.32,0.36,0.79,0.557,0.557,0.557,0.557,0.557,0.557,0.584,0.78,1.0
8.0,0.41,0.3,0.17,0.25,0.485,0.568,0.22,0.77,0.2,0.22,0.1,0.52,0.15,0.19,0.23,0.35,0.518,0.33,0.42,0.33,0.57,0.675,0.672,0.742,0.488,0.564,0.3,0.39,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.438,0.488,0.2,0.7,0.87,0.42,0.72,0.843,1.0,1.0,0.925,0.74,0.83,0.22,0.593,0.75,1.0,0.98,0.6,0.907,0.76,0.53,0.76,0.71,0.943,0.357,0.363,0.284,0.291,0.35,0.39,0.81,0.593,0.593,0.593,0.593,0.593,0.593,0.613,0.9,1.0
9.0,0.46,0.34,0.21,0.29,0.5,0.624,0.24,0.843,0.22,0.26,0.12,0.52,0.17,0.22,0.27,0.39,0.562,0.34,0.42,0.34,0.61,0.7,0.705,0.777,0.524,0.608,0.35,0.42,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.463,0.488,0.23,0.75,0.88,0.51,0.76,0.871,1.0,1.0,0.956,0.77,0.85,0.3,0.606,0.79,1.0,1.0,0.63,0.943,0.78,0.56,0.78,0.72,0.971,0.372,0.377,0.303,0.317,0.41,0.44,0.83,0.606,0.606,0.606,0.606,0.606,0.606,0.631,0.9,1.0
10.0,0.51,0.38,0.25,0.32,0.525,0.624,0.28,0.843,0.24,0.29,0.15,0.52,0.2,0.26,0.31,0.42,0.562,0.36,0.45,0.36,0.63,0.7,0.732,0.801,0.557,0.648,0.38,0.45,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.26,0.76,0.89,0.63,0.8,0.871,1.0,1.0,0.963,0.81,0.87,0.41,0.634,0.83,1.0,1.0,0.64,0.95,0.79,0.57,0.79,0.78,0.971,0.384,0.386,0.32,0.344,0.43,0.46,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
11.0,0.57,0.42,0.3,0.37,0.525,0.624,0.31,0.843,0.27,0.33,0.2,0.52,0.24,0.31,0.35,0.48,0.562,0.39,0.47,0.39,0.64,0.7,0.754,0.811,0.587,0.684,0.4,0.46,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.3,0.76,0.9,0.77,0.82,0.871,1.0,1.0,0.963,0.86,0.89,0.57,0.634,0.88,1.0,1.0,0.66,0.95,0.82,0.6,0.82,0.79,0.971,0.392,0.391,0.334,0.372,0.45,0.47,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
12.0,0.63,0.47,0.35,0.41,0.525,0.624,0.34,0.843,0.3,0.37,0.24,0.52,0.28,0.37,0.4,0.5,0.562,0.4,0.49,0.4,0.65,0.7,0.772,0.811,0.614,0.714,0.42,0.47,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.34,0.76,0.91,0.93,0.84,0.871,1.0,1.0,0.963,0.92,0.9,0.66,0.634,0.94,1.0,1.0,0.68,0.95,0.83,0.62,0.83,0.8,0.971,0.397,0.391,0.347,0.4,0.48,0.5,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
13.0,0.7,0.51,0.41,0.45,0.525,0.624,0.37,0.843,0.34,0.41,0.29,0.52,0.33,0.44,0.44,0.51,0.562,0.42,0.5,0.42,0.67,0.7,0.785,0.811,0.638,0.737,0.44,0.48,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.38,0.77,0.92,1.0,0.86,0.871,1.0,1.0,0.963,0.94,0.91,0.73,0.634,1.0,1.0,1.0,0.69,0.95,0.84,0.63,0.84,0.8,0.971,0.4,0.391,0.356,0.43,0.5,0.52,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
14.0,0.75,0.55,0.47,0.49,0.525,0.624,0.4,0.843,0.37,0.45,0.35,0.52,0.39,0.51,0.48,0.53,0.562,0.42,0.5,0.42,0.68,0.7,0.795,0.811,0.659,0.754,0.46,0.49,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.42,0.77,0.92,1.0,0.87,0.871,1.0,1.0,0.963,0.97,0.92,0.79,0.634,1.0,1.0,1.0,0.72,0.95,0.86,0.63,0.86,0.81,0.971,0.4,0.391,0.364,0.461,0.52,0.53,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
15.0,0.79,0.58,0.52,0.52,0.525,0.624,0.44,0.843,0.41,0.5,0.42,0.52,0.45,0.59,0.52,0.54,0.562,0.43,0.5,0.43,0.69,0.7,0.802,0.811,0.677,0.764,0.48,0.5,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.47,0.77,0.92,1.0,0.87,0.871,1.0,1.0,0.963,0.99,0.93,0.84,0.634,1.0,1.0,1.0,0.73,0.95,0.87,0.63,0.87,0.81,0.971,0.4,0.391,0.369,0.493,0.54,0.55,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
16.0,0.82,0.61,0.58,0.55,0.525,0.624,0.48,0.843,0.44,0.53,0.49,0.52,0.52,0.65,0.56,0.55,0.562,0.43,0.5,0.43,0.7,0.7,0.807,0.811,0.692,0.764,0.5,0.51,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.52,0.78,0.93,1.0,0.88,0.871,1.0,1.0,0.963,1.0,0.94,0.9,0.634,1.0,1.0,1.0,0.73,0.95,0.87,0.64,0.87,0.81,0.971,0.4,0.391,0.372,0.526,0.56,0.57,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
17.0,0.84,0.64,0.65,0.58,0.525,0.624,0.51,0.843,0.48,0.57,0.56,0.52,0.59,0.7,0.6,0.55,0.562,0.44,0.5,0.44,0.71,0.7,0.807,0.811,0.692,0.764,0.52,0.52,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.57,0.78,0.93,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.95,0.97,0.634,1.0,1.0,1.0,0.73,0.95,0.88,0.65,0.88,0.82,0.971,0.4,0.391,0.372,0.526,0.58,0.58,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
18.0,0.87,0.67,0.71,0.61,0.525,0.624,0.55,0.843,0.51,0.6,0.62,0.52,0.64,0.74,0.64,0.56,0.562,0.44,0.5,0.44,0.72,0.7,0.807,0.811,0.692,0.764,0.54,0.53,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.62,0.78,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,0.98,0.634,1.0,1.0,1.0,0.74,0.95,0.88,0.65,0.88,0.82,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
19.0,0.89,0.69,0.76,0.63,0.525,0.624,0.59,0.843,0.54,0.63,0.68,0.52,0.69,0.79,0.68,0.56,0.562,0.44,0.5,0.44,0.73,0.7,0.807,0.811,0.692,0.764,0.56,0.54,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.67,0.79,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,1.0,0.634,1.0,1.0,1.0,0.74,0.95,0.88,0.65,0.88,0.82,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
20.0,0.9,0.71,0.81,0.66,0.525,0.624,0.63,0.843,0.56,0.66,0.74,0.52,0.74,0.83,0.72,0.57,0.562,0.44,0.5,0.44,0.74,0.7,0.807,0.811,0.692,0.764,0.58,0.55,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.72,0.79,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,1.0,0.634,1.0,1.0,1.0,0.74,0.95,0.88,0.65,0.88,0.83,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
21.0,0.92,0.74,0.86,0.68,0.525,0.624,0.67,0.843,0.59,0.69,0.8,0.52,0.79,0.87,0.76,0.57,0.562,0.44,0.5,0.44,0.75,0.7,0.807,0.811,0.692,0.764,0.6,0.56,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.77,0.79,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,1.0,0.634,1.0,1.0,1.0,0.74,0.95,0.88,0.65,0.88,0.83,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
22.0,0.93,0.76,0.91,0.7,0.525,0.624,0.71,0.843,0.61,0.73,0.86,0.52,0.84,0.91,0.8,0.57,0.562,0.45,0.5,0.45,0.76,0.7,0.807,0.811,0.692,0.764,0.62,0.57,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.82,0.79,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,1.0,0.634,1.0,1.0,1.0,0.75,0.95,0.88,0.65,0.88,0.83,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
23.0,0.95,0.78,0.96,0.71,0.525,0.624,0.75,0.843,0.64,0.76,0.92,0.52,0.89,0.95,0.84,0.58,0.562,0.45,0.5,0.45,0.76,0.7,0.807,0.811,0.692,0.764,0.64,0.58,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.87,0.8,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,1.0,0.634,1.0,1.0,1.0,0.75,0.95,0.88,0.65,0.88,0.83,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
24.0,0.96,0.8,1.0,0.73,0.525,0.624,0.79,0.843,0.66,0.78,0.98,0.52,0.94,0.98,0.88,0.58,0.562,0.45,0.5,0.45,0.77,0.7,0.807,0.811,0.692,0.764,0.66,0.59,0.82,0.467,0.467,0.467,0.467,0.467,0.467,0.475,0.508,0.92,0.8,0.94,1.0,0.89,0.871,1.0,1.0,0.963,1.0,0.96,1.0,0.634,1.0,1.0,1.0,0.75,0.95,0.88,0.65,0.88,0.83,0.971,0.4,0.391,0.372,0.526,0.6,0.6,0.83,0.634,0.634,0.634,0.634,0.634,0.634,0.649,0.92,1.0
Loading
Loading