Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-lib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-lib
Commits
e15996a4
Commit
e15996a4
authored
3 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
exposed disagg export options
parent
c10d4289
No related branches found
No related tags found
1 merge request
!234
App edits
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregation.java
+20
-6
20 additions, 6 deletions
...n/java/gov/usgs/earthquake/nshmp/calc/Disaggregation.java
src/main/java/gov/usgs/earthquake/nshmp/model/RuptureSet.java
+2
-0
2 additions, 0 deletions
...main/java/gov/usgs/earthquake/nshmp/model/RuptureSet.java
with
22 additions
and
6 deletions
src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregation.java
+
20
−
6
View file @
e15996a4
...
...
@@ -264,8 +264,8 @@ public final class Disaggregation {
}
/**
* Returns an object containing disaggregation results that is suitable
for
* JSON serialization.
* Returns an object containing
all
disaggregation results that is suitable
*
for
JSON serialization.
*
* @param imt of the disaggregation to retrieve.
*/
...
...
@@ -273,10 +273,24 @@ public final class Disaggregation {
return
disaggs
.
get
(
imt
).
toJson
(
true
,
true
,
true
,
true
);
}
/** Experimental */
@Deprecated
public
Object
toJsonCompact
(
Imt
imt
)
{
return
disaggs
.
get
(
imt
).
toJson
(
false
,
false
,
false
,
false
);
/**
* Returns an object containing custom disaggregation results that is suitable
* for JSON serialization.
*
* @param imt of the disaggregation to retrieve.
* @param summary include summary information, or not
* @param gmms include results decomposed by GMM (values are scaled by GMM
* logic tree weight)
* @param types include results decomposed by source type
* @param epsilons include distance-magnitude-epsilon data that can be used to
* build a 3D stem plot
*/
public
Object
toJson
(
Imt
imt
,
boolean
summary
,
boolean
gmms
,
boolean
types
,
boolean
epsilons
)
{
return
disaggs
.
get
(
imt
).
toJson
(
summary
,
gmms
,
types
,
epsilons
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/gov/usgs/earthquake/nshmp/model/RuptureSet.java
+
2
−
0
View file @
e15996a4
...
...
@@ -105,4 +105,6 @@ public interface RuptureSet<T extends Source> extends Iterable<T> {
// instead of Source
// interface .Model
// where possible get id and name from feature?
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment