diff --git a/gradle.properties b/gradle.properties
index 66974fa877a522d054757f31ac1142848ee26300..da0035a77b912947b07a9d6a145418b9eaf738ed 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.1.10
+nshmpLibVersion = 1.1.14
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 4e5fb88aee8c360e87aad8fc31d0706cac8b2c95..c28d21571745e00278cc65dc94d7e396e7f1f4aa 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -2,8 +2,11 @@
dependencies {
// NSHMP
- // implementation files('../nshmp-lib/build/libs/nshmp-lib.jar')
- implementation "ghsc:nshmp-lib:${nshmpLibVersion}"
+ if (System.getenv("NSHMP_LIB_LOCAL") == "true") {
+ implementation files("../nshmp-lib/build/libs/nshmp-lib.jar")
+ } else {
+ implementation "ghsc:nshmp-lib:${nshmpLibVersion}"
+ }
implementation "ghsc:nshmp-ws-utils:${nshmpWsUtilsVersion}"
// AWS
diff --git a/package-lock.json b/package-lock.json
index dc72624ba1f9b5786382c12356add218736ccc4b..fd03b78e351745759edce1f4fbeb016a832b3d8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
"requires": true,
"packages": {
"": {
- "name": "nshmp-haz",
"version": "2.0.0",
"devDependencies": {
"markdownlint-cli": "^0.31.1",
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c854547bc87a29b1bdbf37b61224db198708ce3
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
@@ -0,0 +1,93 @@
+package gov.usgs.earthquake.nshmp.www.source;
+
+import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
+import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ServletUtil;
+import gov.usgs.earthquake.nshmp.www.source.FeaturesService.Metadata;
+import gov.usgs.earthquake.nshmp.www.source.FeaturesService.RequestData;
+
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import io.micronaut.http.annotation.Controller;
+import io.micronaut.http.annotation.Get;
+import io.micronaut.http.annotation.PathVariable;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.inject.Inject;
+
+/**
+ * Micronaut web service controller for the GeoJSON features in the current
+ * installed model.
+ *
+ * <p>See src/main/resources/application.yml nshmp-haz.model-path for installed
+ * model.
+ *
+ * <p>To run the Micronaut jar file with a model: java -jar
+ * path/to/nshmp-haz.jar --model=<path/to/model>
+ *
+ * @author U.S. Geological Survey
+ */
+@Tag(
+ name = FeaturesService.NAME,
+ description = "USGS NSHM source model features service")
+@Controller("/features")
+public class FeaturesController {
+
+ @Inject
+ private NshmpMicronautServlet servlet;
+
+ @Operation(
+ summary = "Source model logic tree listing",
+ description = "Returns the ID's of logic trees in the model",
+ operationId = "source-feature-metadata")
+ @ApiResponse(
+ description = "Source logic tree metadata",
+ responseCode = "200",
+ content = @Content(
+ schema = @Schema(
+ implementation = MetadataResponse.class)))
+ @Get
+ public HttpResponse<String> doGetMetadata(HttpRequest<?> http) {
+ try {
+ return FeaturesService.getMetadata(http);
+ } catch (Exception e) {
+ return ServletUtil.error(
+ FeaturesService.LOG, e,
+ FeaturesService.NAME,
+ http.getUri().toString());
+ }
+ }
+
+ /**
+ * @param id Source tree id
+ */
+ @Operation(
+ summary = "Get the GeoJSON features in a source tree",
+ description = "Returns the features for the supplied ID",
+ operationId = "source-features")
+ @ApiResponse(
+ description = "NSHM source features",
+ responseCode = "200",
+ content = @Content(
+ schema = @Schema(implementation = TreeResponse.class)))
+ @Get(uri = "/{id}")
+ public HttpResponse<String> doGetTree(HttpRequest<?> http, @PathVariable int id) {
+ try {
+ return FeaturesService.getTree(http, id);
+ } catch (Exception e) {
+ return ServletUtil.error(
+ FeaturesService.LOG, e,
+ FeaturesService.NAME,
+ http.getUri().toString());
+ }
+ }
+
+ // Swagger schema
+ private static class MetadataResponse extends ResponseBody<String, Metadata> {}
+
+ // Swagger schema
+ private static class TreeResponse extends ResponseBody<RequestData, Object> {}
+}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
new file mode 100644
index 0000000000000000000000000000000000000000..786bafca4b3d0f955e91accaf7b6de3baa88d8ad
--- /dev/null
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
@@ -0,0 +1,85 @@
+package gov.usgs.earthquake.nshmp.www.source;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import gov.usgs.earthquake.nshmp.model.HazardModel;
+import gov.usgs.earthquake.nshmp.model.Models;
+import gov.usgs.earthquake.nshmp.www.HazVersion;
+import gov.usgs.earthquake.nshmp.www.ResponseBody;
+import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
+import gov.usgs.earthquake.nshmp.www.ServletUtil;
+import gov.usgs.earthquake.nshmp.www.source.SourceService.SourceModel;
+
+import io.micronaut.http.HttpRequest;
+import io.micronaut.http.HttpResponse;
+import jakarta.inject.Singleton;
+
+/**
+ * Source model tree feature handler for {@link FeaturesController}
+ *
+ * @author U.S. Geological Survey
+ */
+@Singleton
+public class FeaturesService {
+
+ static final String NAME = "Model Features";
+ static final Logger LOG = LoggerFactory.getLogger(FeaturesService.class);
+
+ public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
+ var url = request.getUri().toString();
+ var metadata = new Metadata(ServletUtil.model());
+ var response = ResponseBody.usage()
+ .name(NAME)
+ .url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
+ .request(url)
+ .response(metadata)
+ .build();
+ return HttpResponse.ok(ServletUtil.GSON2.toJson(response));
+ }
+
+ public static HttpResponse<String> getTree(HttpRequest<?> request, Integer id) {
+ var url = request.getUri().toString();
+ var features = Models.features(ServletUtil.model(), id);
+ var requestData = new RequestData(id);
+ var response = ResponseBody.success()
+ .name(NAME)
+ .url(url)
+ .metadata(new ResponseMetadata(HazVersion.appVersions()))
+ .request(requestData)
+ .response(features)
+ .build();
+ return HttpResponse.ok(ServletUtil.GSON2.toJson(response));
+ }
+
+ static class RequestData {
+ final int id;
+
+ RequestData(int id) {
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+ }
+
+ static class Metadata {
+ final SourceModel model;
+ final Object trees;
+
+ Metadata(HazardModel model) {
+ this.model = new SourceModel(model);
+ trees = Models.trees(model);
+ }
+
+ public SourceModel getModel() {
+ return model;
+ }
+
+ public Object getTrees() {
+ return trees;
+ }
+ }
+}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
index 529d2a795f73cdc70c40ca8fecc112bfbf100e6f..d9db18747cbe982cbbfe03e0a2913ee29d815468 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
@@ -79,7 +79,8 @@ class NshmTestsConus {
private static final Set<Imt> IMTS = EnumSet.of(PGA, SA0P2, SA1P0, SA5P0);
- private static final String MODEL_NAME = "nshm-conus";
+ private static final String MODEL_NAME = "nshm-conus-2018-5.1-maint";
+ private static final String MODEL_NAME_OUT = "nshm-conus";
private static final int MODEL_YEAR = 2018;
private static final Path MODEL_PATH = Paths.get("../" + MODEL_NAME);
private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
@@ -187,7 +188,7 @@ class NshmTestsConus {
private static Map<String, XySequence> readExpected(NamedLocation loc) {
- String filename = resultFilename(MODEL_NAME, MODEL_YEAR, loc);
+ String filename = resultFilename(MODEL_NAME_OUT, MODEL_YEAR, loc);
Path resultPath = DATA_PATH.resolve(filename);
JsonObject obj = null;
@@ -246,7 +247,7 @@ class NshmTestsConus {
/* Initialize and shut down executor to generate results. */
setUpBeforeClass();
- writeExpecteds(MODEL_NAME, MODEL_YEAR, SITES);
+ writeExpecteds(MODEL_NAME_OUT, MODEL_YEAR, SITES);
tearDownAfterClass();
}
diff --git a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
index ab9787e649e44f0bc23dceaaba0329c36a9b29c7..36fe54bf81b3a350fef4261c9491036c01f0ee0b 100644
--- a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
@@ -23,21 +23,21 @@
1.7119945007591924
],
"ys": [
- 0.02078455097994013,
+ 0.020784550979940135,
0.013752036153143975,
0.008853912425965714,
0.00550450273759354,
- 0.0032956032209899917,
- 0.0018514963923265222,
- 9.93143597796057E-4,
- 4.956595518220795E-4,
- 2.3401548992797762E-4,
- 1.0471944598011257E-4,
+ 0.0032956032209899913,
+ 0.0018514963923265224,
+ 9.931435977960565E-4,
+ 4.956595518220796E-4,
+ 2.3401548992797768E-4,
+ 1.0471944598011259E-4,
4.508421273772285E-5,
1.8896301560235418E-5,
7.725874681605789E-6,
- 3.0391435785521576E-6,
- 1.11705158113441E-6,
+ 3.039143578552158E-6,
+ 1.1170515811344102E-6,
3.7451324017266463E-7,
1.0752962397804165E-7,
2.596070736658151E-8,
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.0038496686700113577,
- 0.0025078664183317773,
- 0.0015597948853785957,
- 9.157017059864715E-4,
+ 0.0038496686700113573,
+ 0.002507866418331776,
+ 0.0015597948853785955,
+ 9.157017059864716E-4,
5.001931310456336E-4,
2.5472499185031885E-4,
1.194486623970574E-4,
- 5.232735935686702E-5,
- 2.156118337115127E-5,
- 8.400347720866899E-6,
+ 5.232735935686701E-5,
+ 2.1561183371151277E-5,
+ 8.400347720866902E-6,
3.14699581817278E-6,
- 1.142023685405199E-6,
- 3.9303700685767176E-7,
- 1.29477426563478E-7,
- 3.718668812692664E-8,
- 9.324871744942213E-9,
+ 1.1420236854051995E-6,
+ 3.9303700685767165E-7,
+ 1.2947742656347805E-7,
+ 3.718668812692663E-8,
+ 9.324871744942211E-9,
1.877882948712356E-9,
2.8466329320775244E-10,
- 2.69747315108036E-11,
+ 2.6974731510803602E-11,
1.0385526508492285E-12
]
},
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.03915433626110455,
+ 0.039154336261104566,
0.028874987776381138,
0.020883581441243287,
- 0.014675088491569477,
- 0.009966398305490462,
- 0.006525399875535825,
- 0.0041221943891111765,
- 0.0025039012846601928,
- 0.0014759816292745382,
+ 0.014675088491569479,
+ 0.009966398305490464,
+ 0.006525399875535824,
+ 0.004122194389111176,
+ 0.002503901284660192,
+ 0.0014759816292745384,
8.455590549998981E-4,
4.744378692952327E-4,
- 2.561490867328105E-4,
- 1.3579297249796823E-4,
- 6.854218948534536E-5,
+ 2.5614908673281044E-4,
+ 1.357929724979682E-4,
+ 6.854218948534535E-5,
3.2918036847988655E-5,
- 1.4569587193494358E-5,
- 5.782794746110382E-6,
- 1.9737183250309444E-6,
+ 1.456958719349436E-5,
+ 5.782794746110383E-6,
+ 1.973718325030945E-6,
5.657594675445635E-7,
- 1.2462940285422412E-7
+ 1.246294028542241E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,25 +162,25 @@
],
"ys": [
0.06054799387340501,
- 0.04501093716568888,
- 0.032384225534707246,
- 0.02260594710116112,
- 0.015060131175111444,
+ 0.045010937165688894,
+ 0.03238422553470724,
+ 0.022605947101161115,
+ 0.015060131175111442,
0.009690757366506483,
- 0.0059570791993269956,
- 0.00349010751115822,
- 0.001962702434309726,
- 0.0010598138716072616,
- 5.526846406248316E-4,
+ 0.005957079199326997,
+ 0.003490107511158219,
+ 0.0019627024343097264,
+ 0.0010598138716072614,
+ 5.526846406248315E-4,
2.787643997578851E-4,
- 1.3582948573407562E-4,
+ 1.3582948573407556E-4,
6.359388081275608E-5,
2.8287825293638217E-5,
1.170707349148745E-5,
- 4.419923256430149E-6,
- 1.4745471754128641E-6,
- 4.1424535992947296E-7,
- 9.342364439170648E-8
+ 4.419923256430147E-6,
+ 1.4745471754128643E-6,
+ 4.142453599294729E-7,
+ 9.342364439170646E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
index c1efe70bd57cfa950f3500f75259a4db4f597bda..b73992f140f304b5be313059b0cd8dd60fe64f29 100644
--- a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.017675500237871122,
- 0.011804993270225163,
+ 0.017675500237871126,
+ 0.011804993270225167,
0.007916670756587606,
- 0.005349147248044569,
- 0.003631390427708422,
- 0.0023844055384784845,
+ 0.00534914724804457,
+ 0.003631390427708423,
+ 0.002384405538478485,
0.0014870231028831253,
- 8.355484214788527E-4,
+ 8.355484214788524E-4,
4.1460657776932694E-4,
- 1.7579111278565789E-4,
+ 1.7579111278565786E-4,
6.240935342700551E-5,
- 1.824083214413613E-5,
- 4.414927964063777E-6,
- 9.994457044956118E-7,
- 2.485513364750664E-7,
- 7.726459746150789E-8,
- 2.121042318488014E-8,
+ 1.824083214413612E-5,
+ 4.414927964063778E-6,
+ 9.994457044956116E-7,
+ 2.4855133647506633E-7,
+ 7.726459746150788E-8,
+ 2.1210423184880143E-8,
4.860565864414978E-9,
8.641052442615079E-10,
- 1.0633132855584106E-10
+ 1.0633132855584107E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.004904504983066268,
- 0.0037556118245414046,
- 0.0029006854981177585,
+ 0.004904504983066265,
+ 0.003755611824541404,
+ 0.002900685498117759,
0.0021972569063650736,
- 0.0015714972511203782,
- 0.0010317853455482514,
- 5.988137176440333E-4,
- 2.9998980927107937E-4,
- 1.263608775768721E-4,
- 4.334153727062958E-5,
- 1.1727951025836868E-5,
- 2.383247006424206E-6,
- 3.520926494203768E-7,
+ 0.0015714972511203789,
+ 0.001031785345548251,
+ 5.988137176440331E-4,
+ 2.999898092710795E-4,
+ 1.2636087757687215E-4,
+ 4.334153727062956E-5,
+ 1.1727951025836873E-5,
+ 2.3832470064242063E-6,
+ 3.520926494203766E-7,
3.785179659277222E-8,
- 5.963076928168123E-9,
+ 5.963076928168122E-9,
1.4910332126633127E-9,
- 3.14178873723765E-10,
+ 3.1417887372376505E-10,
5.251118966478055E-11,
- 5.968234937924544E-12,
+ 5.968234937924545E-12,
3.1469632224157163E-13
]
},
@@ -116,24 +116,24 @@
],
"ys": [
0.022709150996398572,
- 0.01551640012938908,
- 0.01063565058866354,
- 0.007250987342509734,
- 0.004847475264828743,
- 0.003111424318650424,
- 0.0018782779132334624,
- 0.001050022497993213,
+ 0.015516400129389084,
+ 0.010635650588663541,
+ 0.007250987342509732,
+ 0.00484747526482874,
+ 0.0031114243186504235,
+ 0.0018782779132334622,
+ 0.0010500224979932131,
5.534113089259502E-4,
2.81605357092695E-4,
1.4369489671881903E-4,
7.346403339083293E-5,
- 3.8325297999058965E-5,
- 1.9431569974270378E-5,
- 9.421592539610684E-6,
+ 3.832529799905896E-5,
+ 1.9431569974270375E-5,
+ 9.421592539610682E-6,
4.1976884388553816E-6,
1.6696279770654772E-6,
5.688244700978395E-7,
- 1.6230550529800467E-7,
+ 1.6230550529800464E-7,
3.5499549032952975E-8
]
},
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.04184772415672416,
+ 0.04184772415672415,
0.028519812182555622,
- 0.01902862263652819,
- 0.012597694078764633,
- 0.008183488070776037,
- 0.0052563265681882425,
+ 0.019028622636528186,
+ 0.012597694078764635,
+ 0.008183488070776039,
+ 0.005256326568188245,
0.0032378832457639973,
- 0.0018635316801681953,
- 9.90711951482253E-4,
- 4.8301305512369827E-4,
- 2.193587945069327E-4,
- 9.551470151347579E-5,
- 4.124782682724972E-5,
- 1.7924007974639768E-5,
- 7.691633829460732E-6,
- 3.1292561141859636E-6,
+ 0.001863531680168195,
+ 9.907119514822528E-4,
+ 4.830130551236984E-4,
+ 2.193587945069326E-4,
+ 9.55147015134758E-5,
+ 4.1247826827249706E-5,
+ 1.792400797463977E-5,
+ 7.69163382946073E-6,
+ 3.1292561141859645E-6,
1.1644839692951635E-6,
3.8155425174464243E-7,
- 1.0444941528551557E-7,
- 2.265638077580196E-8
+ 1.0444941528551558E-7,
+ 2.2656380775801956E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
index 6102e18fc3d423b900b435430a656c6e98c26868..98471e4fb87d9a011e19c92bc12532196056b0d5 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
@@ -25,24 +25,24 @@
"ys": [
0.05460474620644813,
0.039322200263679656,
- 0.0277425218885836,
- 0.019256487920663257,
- 0.013309032474447959,
- 0.009158100387208452,
- 0.00646995449267356,
- 0.004711825464791657,
+ 0.027742521888583595,
+ 0.01925648792066326,
+ 0.013309032474447955,
+ 0.009158100387208455,
+ 0.006469954492673559,
+ 0.004711825464791655,
0.0036144199686035917,
- 0.0029237508993505794,
- 0.0024589761818590043,
+ 0.002923750899350579,
+ 0.0024589761818590047,
0.002072470767532479,
- 0.001663505866018176,
- 0.0012069209745320137,
- 7.580051949212136E-4,
- 4.028136886385923E-4,
- 1.747374387292787E-4,
- 6.143664863718952E-5,
+ 0.0016635058660181771,
+ 0.0012069209745320141,
+ 7.580051949212138E-4,
+ 4.028136886385925E-4,
+ 1.747374387292788E-4,
+ 6.143664863718953E-5,
1.660370716466393E-5,
- 3.2819885795529328E-6
+ 3.2819885795529336E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -70,25 +70,25 @@
],
"ys": [
0.01118335095019382,
- 0.00820850133786319,
- 0.0061259943786559495,
- 0.004704029030923133,
- 0.0037445097750955776,
- 0.003113425325927084,
- 0.0026896900327019685,
- 0.0023879637030226153,
+ 0.008208501337863192,
+ 0.006125994378655951,
+ 0.004704029030923135,
+ 0.0037445097750955793,
+ 0.003113425325927083,
+ 0.0026896900327019677,
+ 0.002387963703022616,
0.002117544110718752,
- 0.0018011501748482458,
- 0.0014173471729516552,
+ 0.001801150174848246,
+ 0.001417347172951655,
0.0010068130175955078,
- 6.301951022408454E-4,
- 3.44478169914051E-4,
- 1.5613960834869725E-4,
- 5.887416288449929E-5,
+ 6.301951022408455E-4,
+ 3.444781699140509E-4,
+ 1.5613960834869736E-4,
+ 5.887416288449927E-5,
1.7483012613921882E-5,
- 3.857677678049852E-6,
- 5.776336202494067E-7,
- 3.603564897905062E-8
+ 3.857677678049851E-6,
+ 5.776336202494063E-7,
+ 3.6035648979050635E-8
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.11111072621136199,
+ 0.111110726211362,
0.09432125494016416,
- 0.0782280559960046,
- 0.06292369383675943,
- 0.04897014435727335,
- 0.036942153943163344,
- 0.027163843299139248,
- 0.01953787756874624,
- 0.013915832488455517,
+ 0.07822805599600459,
+ 0.06292369383675941,
+ 0.04897014435727336,
+ 0.03694215394316335,
+ 0.027163843299139255,
+ 0.019537877568746247,
+ 0.013915832488455515,
0.009887221698272164,
0.007094041349666846,
- 0.005146435316179508,
- 0.0038656085903222073,
- 0.00298376664089472,
- 0.0023260711475453035,
- 0.0017237133487967343,
- 0.0011265388791854099,
+ 0.0051464353161795075,
+ 0.003865608590322207,
+ 0.0029837666408947206,
+ 0.002326071147545305,
+ 0.0017237133487967337,
+ 0.0011265388791854103,
6.015982295191785E-4,
- 2.5104779111283416E-4,
- 7.632592705118942E-5
+ 2.510477911128341E-4,
+ 7.632592705118943E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.13557175676510388,
- 0.11487697773688867,
+ 0.13557175676510386,
+ 0.11487697773688868,
0.09473336922159183,
0.0757652391662049,
0.058061656399242906,
- 0.04307702076073272,
- 0.030893330875149033,
- 0.021543361926184883,
- 0.01480267705425384,
- 0.010119114510192404,
- 0.006988258677940675,
+ 0.043077020760732714,
+ 0.030893330875149044,
+ 0.021543361926184886,
+ 0.014802677054253846,
+ 0.01011911451019241,
+ 0.0069882586779406765,
0.00495471722552012,
0.003663126515262555,
0.0028324443965858995,
- 0.002237940845752876,
- 0.0017164930070629654,
- 0.001192618055895077,
+ 0.0022379408457528765,
+ 0.0017164930070629656,
+ 0.0011926180558950762,
6.965535536645009E-4,
- 3.211131756404802E-4,
+ 3.2111317564048023E-4,
1.1269789534198826E-4
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
index ad752c977a18bb3d6d86d98d53ad924cdc93b2d9..444ad5af52d83f518194b94e109b2c124868f4bf 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
@@ -24,23 +24,23 @@
],
"ys": [
0.018666421015364292,
- 0.0122777143821705,
+ 0.012277714382170502,
0.007819753747405416,
0.0047835883866622865,
- 0.0028112191687725903,
- 0.0015540453407317345,
+ 0.0028112191687725907,
+ 0.001554045340731735,
8.285075887238437E-4,
- 4.182733081757243E-4,
+ 4.1827330817572424E-4,
2.0477961806545264E-4,
9.768413828648058E-5,
4.582979651500823E-5,
- 2.110815193458449E-5,
- 9.403078808734168E-6,
+ 2.1108151934584487E-5,
+ 9.40307880873417E-6,
3.952177823009206E-6,
- 1.5239368107090304E-6,
+ 1.52393681070903E-6,
5.283693302216128E-7,
1.5532448868679193E-7,
- 3.807576669004165E-8,
+ 3.8075766690041645E-8,
7.285190754922316E-9,
9.71330593082485E-10
]
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.003683929029161355,
+ 0.0036839290291613568,
0.0023350507514869807,
- 0.0014025796207374247,
- 7.930112908299476E-4,
- 4.180890338299987E-4,
+ 0.0014025796207374252,
+ 7.930112908299474E-4,
+ 4.1808903382999877E-4,
2.0733134457052304E-4,
9.623213274255235E-5,
4.279209350393817E-5,
- 1.848842803384079E-5,
+ 1.8488428033840786E-5,
7.785121676935125E-6,
- 3.20942446688357E-6,
- 1.2788721198896172E-6,
+ 3.2094244668835695E-6,
+ 1.2788721198896174E-6,
4.76403657405383E-7,
1.651037823961913E-7,
- 4.9341854768598423E-8,
+ 4.934185476859843E-8,
1.273898355111994E-8,
- 2.620252585057269E-9,
- 4.048583749596045E-10,
+ 2.6202525850572688E-9,
+ 4.048583749596044E-10,
3.904486628199482E-11,
1.5324451927867105E-12
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.029878942979656185,
- 0.02169931498570595,
- 0.015627345176841462,
- 0.011107491120984699,
- 0.0077765862922841225,
- 0.005349775331002555,
- 0.003606839800316039,
- 0.0023647662125642096,
- 0.0015114836562529481,
- 9.383042482967954E-4,
- 5.672612883032051E-4,
+ 0.029878942979656195,
+ 0.021699314985705948,
+ 0.015627345176841466,
+ 0.011107491120984697,
+ 0.007776586292284122,
+ 0.005349775331002556,
+ 0.003606839800316038,
+ 0.00236476621256421,
+ 0.001511483656252948,
+ 9.383042482967955E-4,
+ 5.672612883032052E-4,
3.2775630190425736E-4,
- 1.8379026685332687E-4,
- 9.707147245294277E-5,
+ 1.8379026685332682E-4,
+ 9.707147245294275E-5,
4.8216709391054424E-5,
- 2.1867540425618328E-5,
- 8.83267345573992E-6,
- 3.054523154324784E-6,
- 8.847978732985681E-7,
- 1.967278678289316E-7
+ 2.186754042561833E-5,
+ 8.832673455739918E-6,
+ 3.054523154324783E-6,
+ 8.847978732985682E-7,
+ 1.9672786782893157E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.0483019839592341,
+ 0.048301983959234095,
0.03504973561764059,
0.024744052454742885,
0.017095234304717735,
0.011415111740065452,
0.007482577963101016,
0.0047698738556462535,
- 0.0029480912847476017,
- 0.0017725798590443335,
+ 0.002948091284747602,
+ 0.0017725798590443342,
0.0010323738247512593,
- 5.82300040838734E-4,
+ 5.823000408387339E-4,
3.1694058457143036E-4,
- 1.6560745740360765E-4,
+ 1.6560745740360768E-4,
8.238484623559819E-5,
3.852324830287548E-5,
- 1.657549901909999E-5,
- 6.439186747078615E-6,
+ 1.6575499019099995E-5,
+ 6.439186747078616E-6,
2.192582065492888E-6,
- 6.249719391706648E-7,
- 1.423888673803234E-7
+ 6.249719391706649E-7,
+ 1.4238886738032342E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
index 820655cd594550a8c7b80aed734e657ae6912180..f629ba624e302c67c3485436f7b6141aecb8b1a0 100644
--- a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
@@ -26,22 +26,22 @@
0.5639424382793681,
0.41970430872703995,
0.2996355631700337,
- 0.2043650649634402,
+ 0.20436506496344023,
0.13386011296908937,
0.08340469061324253,
- 0.05072763584783539,
+ 0.05072763584783538,
0.02970332088645175,
0.016962428614047866,
0.009368748098138393,
- 0.004942501068704084,
- 0.0024201010792144245,
+ 0.004942501068704083,
+ 0.002420101079214425,
0.0010564988095787106,
3.945561117465654E-4,
1.2048922319737728E-4,
2.8266770250121335E-5,
- 4.252380705836177E-6,
+ 4.252380705836178E-6,
4.4029329263288646E-7,
- 2.573585831849357E-8,
+ 2.5735858318493567E-8,
8.240992980384035E-11
]
},
@@ -69,15 +69,15 @@
0.7929925155296614
],
"ys": [
- 0.16195200240025112,
- 0.11197070315750862,
+ 0.1619520024002511,
+ 0.11197070315750861,
0.07461644808670248,
- 0.04806931482649302,
+ 0.04806931482649303,
0.029904421907731293,
0.018097205110430375,
- 0.010526649862628145,
+ 0.010526649862628149,
0.0058497036090659794,
- 0.0030248691579733383,
+ 0.003024869157973338,
0.0013988990917255157,
5.607903420664931E-4,
1.884917390363045E-4,
@@ -117,17 +117,17 @@
"ys": [
0.6547357887817038,
0.5154175476805015,
- 0.3956456162265481,
- 0.29463778537314556,
+ 0.39564561622654804,
+ 0.2946377853731455,
0.21261726439098355,
0.14856083770157558,
0.1002311229879195,
0.06449394268051883,
0.0393892832339914,
0.02264433896405345,
- 0.01232106975342074,
+ 0.012321069753420741,
0.006191664090278571,
- 0.0028672800399024167,
+ 0.0028672800399024163,
0.0011315854751875179,
3.666664317975439E-4,
9.021209601637859E-5,
@@ -166,19 +166,19 @@
0.4943026693905384,
0.3815237316109364,
0.2849928378328236,
- 0.20811270361164624,
- 0.14726293268062962,
+ 0.20811270361164622,
+ 0.14726293268062965,
0.10033741214019079,
0.06562437576887947,
0.04081755703105158,
- 0.02407438562720991,
- 0.013446854247539832,
- 0.007078613802080741,
+ 0.024074385627209906,
+ 0.013446854247539834,
+ 0.0070786138020807405,
0.0034343346589473444,
- 0.0014729955574711105,
+ 0.0014729955574711107,
5.304815215680369E-4,
- 1.5325010460188717E-4,
- 3.2864405116884194E-5,
+ 1.532501046018872E-4,
+ 3.28644051168842E-5,
4.5541957008082325E-6,
3.3625843088903307E-7
]
diff --git a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
index 5cf2e8237254aad406ec27b5b79beac72891ed41..bb4d0841860eeb760318701161150602fe41ce60 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.10141210582180435,
- 0.07447849798602046,
+ 0.10141210582180434,
+ 0.07447849798602045,
0.05330127231316856,
- 0.037102818795138215,
- 0.025232028167263765,
+ 0.03710281879513821,
+ 0.02523202816726377,
0.016610346496346337,
0.010874067593129606,
- 0.00708922479836808,
- 0.004735625457686325,
- 0.0032494647560939514,
- 0.002245495226811023,
- 0.0014914478772558573,
- 8.988552768687257E-4,
+ 0.0070892247983680825,
+ 0.004735625457686324,
+ 0.003249464756093951,
+ 0.0022454952268110224,
+ 0.001491447877255857,
+ 8.988552768687258E-4,
4.656680939512108E-4,
- 1.9882970591587773E-4,
- 6.785029212800548E-5,
- 1.6876651512201575E-5,
+ 1.9882970591587768E-4,
+ 6.785029212800547E-5,
+ 1.6876651512201572E-5,
2.653741741725593E-6,
1.7318139402766213E-7,
- 1.0355704040041718E-10
+ 1.035570404004172E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -70,20 +70,20 @@
],
"ys": [
0.03338701576491687,
- 0.02465096645560166,
- 0.017644230719297157,
- 0.012269680846161648,
- 0.008337057201618094,
- 0.005635024432572456,
- 0.0037891327023550246,
- 0.0025149123784953846,
- 0.001586342905921711,
- 9.014315449747967E-4,
- 4.414029650416536E-4,
- 1.7921117169766217E-4,
+ 0.024650966455601657,
+ 0.01764423071929716,
+ 0.01226968084616165,
+ 0.008337057201618096,
+ 0.005635024432572453,
+ 0.0037891327023550233,
+ 0.002514912378495384,
+ 0.0015863429059217106,
+ 9.014315449747968E-4,
+ 4.414029650416535E-4,
+ 1.792111716976621E-4,
5.7541181003569944E-5,
- 1.4224526877692227E-5,
- 2.2078569144162733E-6,
+ 1.4224526877692225E-5,
+ 2.2078569144162738E-6,
1.888075384391226E-7,
2.916565870061635E-9,
1.353319468129786E-11,
@@ -117,24 +117,24 @@
"ys": [
0.13047100258720737,
0.09849712329595017,
- 0.07246017969843055,
- 0.05191828655903308,
+ 0.07246017969843056,
+ 0.05191828655903307,
0.03636526505318483,
- 0.02499321774137477,
+ 0.024993217741374765,
0.01690096807101634,
- 0.011231650127527283,
+ 0.011231650127527281,
0.007452801108191979,
0.005017181957434343,
- 0.0034705679298442814,
- 0.0024023685398152327,
+ 0.0034705679298442805,
+ 0.0024023685398152335,
0.0016078002266633952,
- 9.514053815001429E-4,
- 4.656644721669268E-4,
- 1.753633004388021E-4,
- 4.811667218966292E-5,
+ 9.514053815001427E-4,
+ 4.656644721669266E-4,
+ 1.7536330043880214E-4,
+ 4.811667218966291E-5,
8.632653500921544E-6,
- 8.008388400062673E-7,
- 2.2680106464068327E-8
+ 8.008388400062675E-7,
+ 2.2680106464068324E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,25 +162,25 @@
],
"ys": [
0.16740950916822125,
- 0.1301827371821187,
+ 0.13018273718211873,
0.09802333688436565,
0.0720099099078939,
0.05129669394322607,
0.03606585232915037,
- 0.024916005816203585,
+ 0.024916005816203582,
0.01691309964162624,
- 0.011363408680915814,
- 0.007619737320678117,
+ 0.011363408680915812,
+ 0.0076197373206781166,
0.00518641999113049,
0.003611556059854821,
0.00253928053666354,
0.0017305585661145017,
0.0010724055561078664,
5.639609734298516E-4,
- 2.3956867451954393E-4,
- 7.882123713799232E-5,
+ 2.39568674519544E-4,
+ 7.88212371379923E-5,
1.8675841989591893E-5,
- 2.7011160805776843E-6
+ 2.701116080577684E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
index 58d03fa6115adc695ef0384b312b3d699b33aa5f..2a1414295b982788fac99e599aa36c4721e02513 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
@@ -25,11 +25,11 @@
"ys": [
0.5831008919911462,
0.42841990907067484,
- 0.3043299517318651,
+ 0.30432995173186517,
0.20991504534178365,
0.14211631298661964,
0.09374868521078619,
- 0.061383844950437326,
+ 0.06138384495043733,
0.039071093308164724,
0.024201671562405724,
0.014386438506911663,
@@ -75,10 +75,10 @@
0.05560574371886311,
0.03824085383493094,
0.02585465059626231,
- 0.017050534628279733,
+ 0.017050534628279736,
0.011010094459237604,
0.006875269673181764,
- 0.004031893488663088,
+ 0.004031893488663087,
0.002153405881721278,
0.0010132607735766973,
4.039256174776689E-4,
diff --git a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
index 41b81561aff8544508dcfd1a4b534b4ad17845ca..93b1b3cab23bd24ac2a30ca79536fa0fb115c3d0 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
@@ -23,22 +23,22 @@
1.7119945007591924
],
"ys": [
- 0.18974076470885134,
- 0.15035830376044865,
+ 0.18974076470885137,
+ 0.15035830376044862,
0.11450746101346057,
0.08372212205176174,
0.059056934947110895,
0.03979043310491079,
0.026081869849010786,
- 0.016390117898980403,
+ 0.016390117898980407,
0.009939769054053986,
- 0.005732292609750041,
- 0.0030911152295593296,
- 0.001523977515088581,
+ 0.005732292609750042,
+ 0.0030911152295593288,
+ 0.0015239775150885813,
6.709168676869215E-4,
- 2.574847007089419E-4,
- 8.378741714505465E-5,
- 2.251661394806186E-5,
+ 2.57484700708942E-4,
+ 8.378741714505467E-5,
+ 2.2516613948061863E-5,
4.500727576177569E-6,
6.144243207535919E-7,
4.524870395276403E-8,
@@ -69,19 +69,19 @@
0.7929925155296614
],
"ys": [
- 0.05798340020697013,
+ 0.057983400206970126,
0.04190422736247452,
- 0.029366243206519944,
+ 0.029366243206519947,
0.019925269776090763,
0.013059136945793099,
- 0.008356470042035316,
+ 0.008356470042035317,
0.005219092927938535,
0.003208797581193821,
- 0.0019199405263871357,
+ 0.0019199405263871355,
0.0010855264302525767,
5.619278902374833E-4,
2.56327084563797E-4,
- 9.795826467321656E-5,
+ 9.795826467321657E-5,
3.093950684856507E-5,
7.164683336505891E-6,
9.927613969917701E-7,
@@ -116,21 +116,21 @@
],
"ys": [
0.24771893073100731,
- 0.21523675831978528,
+ 0.2152367583197853,
0.18161823545206088,
0.14780579912486952,
- 0.11545178046324324,
+ 0.11545178046324323,
0.08622984829356381,
- 0.06143083406558189,
- 0.041478320268564024,
+ 0.061430834065581905,
+ 0.04147832026856402,
0.026613647854233174,
0.016122062113439015,
- 0.00916745923846515,
+ 0.009167459238465148,
0.004722903809421655,
0.002214599541925819,
8.96285507746999E-4,
3.0679993472347236E-4,
- 8.267322515716905E-5,
+ 8.267322515716906E-5,
1.5932119722315774E-5,
1.7946631531444621E-6,
1.06895828117477E-7,
@@ -162,24 +162,24 @@
],
"ys": [
0.2721574775049231,
- 0.24281747770364934,
+ 0.2428174777036493,
0.2111408438434728,
0.17854755388890456,
0.14527845924323876,
- 0.11415150096067693,
- 0.08587864028445241,
- 0.06154846143598557,
+ 0.11415150096067696,
+ 0.08587864028445243,
+ 0.061548461435985566,
0.04205905133610497,
0.02729969817831103,
0.0167806308316971,
- 0.009668716593145835,
- 0.005145168068999916,
- 0.002484010179931396,
- 0.0010642217291543983,
- 3.9103358452733316E-4,
+ 0.009668716593145837,
+ 0.005145168068999917,
+ 0.0024840101799313958,
+ 0.0010642217291543985,
+ 3.910335845273332E-4,
1.1883832643066001E-4,
2.807665802756398E-5,
- 4.561137287716157E-6,
+ 4.5611372877161576E-6,
4.7281340794708457E-7
]
}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
index fdea57eff1b04bda66bf1df78cef4e0ff57d9096..e617904ad424756e56a56eb8471f6cc53934a52f 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
@@ -23,23 +23,23 @@
1.7119945007591924
],
"ys": [
- 1.1394279599298858,
- 0.909645925740205,
- 0.6810439562313704,
- 0.48213438998284386,
+ 1.139427959929886,
+ 0.9096459257402049,
+ 0.6810439562313703,
+ 0.48213438998284375,
0.3270662494936988,
0.2122733790095776,
0.13579352589768764,
- 0.08466990088453302,
- 0.051479667241025914,
- 0.029592215233161495,
+ 0.08466990088453301,
+ 0.0514796672410259,
+ 0.0295922152331615,
0.015605186053687877,
- 0.007369438722986228,
+ 0.007369438722986227,
0.003079134500128523,
0.001133816052813239,
3.683841726832001E-4,
1.0771529770871671E-4,
- 2.7590429340726256E-5,
+ 2.7590429340726252E-5,
6.106383784135074E-6,
9.141545957726994E-7,
4.716658318737339E-8
@@ -74,12 +74,12 @@
0.11286823232748022,
0.08019936527365806,
0.057001082377164766,
- 0.039772310464229216,
+ 0.03977231046422921,
0.026270923994779784,
0.0159300182060438,
0.008586807484419113,
0.0040091692633346795,
- 0.0016237229130359047,
+ 0.0016237229130359049,
5.831580842583807E-4,
1.935491083341371E-4,
6.446411351755592E-5,
@@ -121,7 +121,7 @@
1.0330746473392465,
0.868541087272583,
0.6793538859833672,
- 0.48957767668206337,
+ 0.4895776766820634,
0.32305214036758084,
0.19728774899189122,
0.11230291486323442,
@@ -129,7 +129,7 @@
0.02903842762547559,
0.012752442114810743,
0.004825259624029285,
- 0.0015856433122290359,
+ 0.0015856433122290355,
4.467361996202859E-4,
1.0815891326044897E-4,
2.1501975995084007E-5,
@@ -165,17 +165,17 @@
1.3442294606163505,
1.2504550788598903,
1.145108478540398,
- 1.0076845134906756,
+ 1.0076845134906758,
0.8393355383077514,
0.6496537972367906,
0.4625305796292689,
- 0.30353482643208957,
+ 0.3035348264320895,
0.18409848770017573,
0.10404729414822564,
0.05492082710147257,
0.026929508320917738,
0.012117250742785222,
- 0.0049122319794404614,
+ 0.004912231979440461,
0.0017509584506394304,
5.433850247572385E-4,
1.4341185451814312E-4,
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
index 5e230f1e6f2c42a17bcfbf34e73f4bf455555cbe..2e565934a37eaca8142276ee1d911d6f4ca2c69b 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
@@ -25,7 +25,7 @@
"ys": [
0.1096176362431887,
0.07712267985209978,
- 0.05236216472551226,
+ 0.05236216472551224,
0.03410083982464372,
0.021327885700315224,
0.012597455865731777,
@@ -116,14 +116,14 @@
],
"ys": [
0.16241112120908746,
- 0.1211747452225035,
- 0.08821017091766084,
+ 0.12117474522250349,
+ 0.08821017091766083,
0.062475455947759634,
0.0429411432751231,
0.028525687803782396,
0.018224455950293393,
0.011059987400758736,
- 0.006364262004183083,
+ 0.006364262004183082,
0.0034377054571609225,
0.001738825379832288,
7.965440914871203E-4,
@@ -167,7 +167,7 @@
0.08664281640904029,
0.06035281081025548,
0.04113660286620183,
- 0.02712237329976281,
+ 0.027122373299762817,
0.017158998663766196,
0.010389832056442814,
0.005966842420004629,
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
index cdfb35eec98a6d9a17e868d8d94607d8210e36a7..3196aec256c3ca2aad96fbf09b432d2687c3f3b8 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
@@ -25,8 +25,8 @@
"ys": [
0.9310649618626425,
0.7152683525622628,
- 0.5254960437436178,
- 0.37057192881004797,
+ 0.5254960437436177,
+ 0.37057192881004786,
0.25360306935928917,
0.1673342748557868,
0.10852163641624823,
@@ -40,7 +40,7 @@
4.913127725890904E-4,
1.6916652515186739E-4,
4.608184816695928E-5,
- 9.142956045358946E-6,
+ 9.142956045358948E-6,
1.067682459238504E-6,
4.4135240737735364E-8
]
@@ -79,14 +79,14 @@
0.011639202185119844,
0.0061951399190677625,
0.0030758835356592923,
- 0.0014771509658122373,
+ 0.0014771509658122375,
7.061929082246017E-4,
3.3451441585971104E-4,
- 1.5467986387544447E-4,
+ 1.5467986387544445E-4,
6.363609376236911E-5,
2.247131683032451E-5,
6.219516642047414E-6,
- 1.2615492254822047E-6,
+ 1.2615492254822045E-6,
1.5297532779407637E-7,
7.198489307670766E-9
]
@@ -120,20 +120,20 @@
1.0517265084684115,
0.8707860874217463,
0.6765138623146243,
- 0.49340163862251196,
+ 0.493401638622512,
0.33992289432676787,
0.22192803156480623,
0.13847632521718928,
- 0.0817533386032545,
+ 0.08175333860325448,
0.04511099205028913,
0.022490754664834876,
0.010374939794256521,
- 0.004313773760782856,
- 0.0016216028906538638,
+ 0.004313773760782855,
+ 0.0016216028906538636,
5.238693662990279E-4,
- 1.3772717633153163E-4,
+ 1.377271763315316E-4,
2.6761997339916372E-5,
- 3.5045913382111145E-6,
+ 3.504591338211114E-6,
2.3097496341714198E-7
]
},
@@ -175,10 +175,10 @@
0.04095407995887267,
0.02092944382070038,
0.009967533485864724,
- 0.0044001652566261614,
+ 0.004400165256626161,
0.0017609227596797569,
6.180891817013114E-4,
- 1.8154635267886133E-4,
+ 1.8154635267886136E-4,
4.1290331752591286E-5,
6.280186508295586E-6
]