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
c4a5c24c
Commit
c4a5c24c
authored
2 months ago
by
Clayton, Brandon Scott
Browse files
Options
Downloads
Patches
Plain Diff
change class name for lambda
parent
c00e6d9c
No related branches found
No related tags found
1 merge request
!440
Class Name
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java
+7
-7
7 additions, 7 deletions
...ain/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java
src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java
+10
-10
10 additions, 10 deletions
...ain/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java
with
17 additions
and
17 deletions
src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java
+
7
−
7
View file @
c4a5c24c
...
@@ -6,7 +6,7 @@ import java.util.ArrayList;
...
@@ -6,7 +6,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.List
;
import
gov.usgs.earthquake.nshmp.calc.CalcConfig.Disagg.Bins
;
import
gov.usgs.earthquake.nshmp.calc.CalcConfig.Disagg.Bins
;
import
gov.usgs.earthquake.nshmp.calc.DisaggExport.
ε
Bin
;
import
gov.usgs.earthquake.nshmp.calc.DisaggExport.
epsilon
Bin
;
import
gov.usgs.earthquake.nshmp.gmm.Imt
;
import
gov.usgs.earthquake.nshmp.gmm.Imt
;
/**
/**
...
@@ -24,7 +24,7 @@ import gov.usgs.earthquake.nshmp.gmm.Imt;
...
@@ -24,7 +24,7 @@ import gov.usgs.earthquake.nshmp.gmm.Imt;
final
class
DisaggConfig
{
final
class
DisaggConfig
{
final
Bins
bins
;
final
Bins
bins
;
final
List
<
ε
Bin
>
εBins
;
final
List
<
epsilon
Bin
>
εBins
;
final
double
contributorLimit
;
final
double
contributorLimit
;
final
Imt
imt
;
final
Imt
imt
;
...
@@ -37,7 +37,7 @@ final class DisaggConfig {
...
@@ -37,7 +37,7 @@ final class DisaggConfig {
private
DisaggConfig
(
private
DisaggConfig
(
Bins
bins
,
Bins
bins
,
List
<
ε
Bin
>
εBins
,
List
<
epsilon
Bin
>
εBins
,
double
contributorLimit
,
double
contributorLimit
,
Imt
imt
,
Imt
imt
,
DisaggDataset
model
,
DisaggDataset
model
,
...
@@ -90,7 +90,7 @@ final class DisaggConfig {
...
@@ -90,7 +90,7 @@ final class DisaggConfig {
static
class
Builder
{
static
class
Builder
{
private
Bins
bins
;
private
Bins
bins
;
private
List
<
ε
Bin
>
εBins
;
private
List
<
epsilon
Bin
>
εBins
;
private
Double
contributorLimit
;
private
Double
contributorLimit
;
private
Imt
imt
;
private
Imt
imt
;
...
@@ -158,13 +158,13 @@ final class DisaggConfig {
...
@@ -158,13 +158,13 @@ final class DisaggConfig {
}
}
}
}
static
List
<
ε
Bin
>
createEpsilonBins
(
List
<
Double
>
εLevels
,
double
εDelta
)
{
static
List
<
epsilon
Bin
>
createEpsilonBins
(
List
<
Double
>
εLevels
,
double
εDelta
)
{
double
εDeltaBy2
=
εDelta
/
2.0
;
double
εDeltaBy2
=
εDelta
/
2.0
;
List
<
ε
Bin
>
bins
=
new
ArrayList
<>();
List
<
epsilon
Bin
>
bins
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
εLevels
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
εLevels
.
size
();
i
++)
{
Double
min
=
(
i
==
0
)
?
null
:
εLevels
.
get
(
i
)
-
εDeltaBy2
;
Double
min
=
(
i
==
0
)
?
null
:
εLevels
.
get
(
i
)
-
εDeltaBy2
;
Double
max
=
(
i
==
εLevels
.
size
()
-
1
)
?
null
:
εLevels
.
get
(
i
)
+
εDeltaBy2
;
Double
max
=
(
i
==
εLevels
.
size
()
-
1
)
?
null
:
εLevels
.
get
(
i
)
+
εDeltaBy2
;
bins
.
add
(
new
ε
Bin
(
i
,
min
,
max
));
bins
.
add
(
new
epsilon
Bin
(
i
,
min
,
max
));
}
}
return
List
.
copyOf
(
bins
);
return
List
.
copyOf
(
bins
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java
+
10
−
10
View file @
c4a5c24c
...
@@ -91,13 +91,13 @@ final class DisaggExport {
...
@@ -91,13 +91,13 @@ final class DisaggExport {
double
εBar
=
dd
.
rmεScaled
.
get
(
ri
,
mi
)
/
rmBinWeight
;
double
εBar
=
dd
.
rmεScaled
.
get
(
ri
,
mi
)
/
rmBinWeight
;
double
[]
εValues
=
dd
.
rmε
.
column
(
ri
,
mi
).
yValues
().
toArray
();
double
[]
εValues
=
dd
.
rmε
.
column
(
ri
,
mi
).
yValues
().
toArray
();
DoubleData
.
multiply
(
toPercent
,
εValues
);
DoubleData
.
multiply
(
toPercent
,
εValues
);
List
<
ε
Data
>
εDataList
=
new
ArrayList
<>();
List
<
epsilon
Data
>
εDataList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
εValues
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
εValues
.
length
;
i
++)
{
double
εValue
=
εValues
[
i
];
double
εValue
=
εValues
[
i
];
if
(
εValue
<=
0.0
)
{
if
(
εValue
<=
0.0
)
{
continue
;
continue
;
}
}
εDataList
.
add
(
new
ε
Data
(
i
,
εValue
));
εDataList
.
add
(
new
epsilon
Data
(
i
,
εValue
));
}
}
RmBin
rmBin
=
new
RmBin
(
RmBin
rmBin
=
new
RmBin
(
r
,
m
,
r
,
m
,
...
@@ -122,7 +122,7 @@ final class DisaggExport {
...
@@ -122,7 +122,7 @@ final class DisaggExport {
final
double
rBar
;
final
double
rBar
;
final
double
mBar
;
final
double
mBar
;
final
double
εBar
;
final
double
εBar
;
final
List
<
ε
Data
>
εdata
;
final
List
<
epsilon
Data
>
εdata
;
private
RmBin
(
private
RmBin
(
double
r
,
double
r
,
...
@@ -130,7 +130,7 @@ final class DisaggExport {
...
@@ -130,7 +130,7 @@ final class DisaggExport {
double
rBar
,
double
rBar
,
double
mBar
,
double
mBar
,
double
εBar
,
double
εBar
,
List
<
ε
Data
>
εdata
)
{
List
<
epsilon
Data
>
εdata
)
{
this
.
r
=
r
;
this
.
r
=
r
;
this
.
m
=
m
;
this
.
m
=
m
;
...
@@ -145,12 +145,12 @@ final class DisaggExport {
...
@@ -145,12 +145,12 @@ final class DisaggExport {
* Single ε value bin.
* Single ε value bin.
*/
*/
@SuppressWarnings
(
"unused"
)
@SuppressWarnings
(
"unused"
)
private
static
final
class
ε
Data
{
private
static
final
class
epsilon
Data
{
final
int
εbin
;
final
int
εbin
;
final
double
value
;
final
double
value
;
private
ε
Data
(
int
εbin
,
double
value
)
{
private
epsilon
Data
(
int
εbin
,
double
value
)
{
this
.
εbin
=
εbin
;
this
.
εbin
=
εbin
;
this
.
value
=
value
;
this
.
value
=
value
;
}
}
...
@@ -358,23 +358,23 @@ final class DisaggExport {
...
@@ -358,23 +358,23 @@ final class DisaggExport {
return
List
.
copyOf
(
jsonContributors
);
return
List
.
copyOf
(
jsonContributors
);
}
}
private
static
List
<
SummaryItem
>
toSummaryItems
(
List
<
ε
Bin
>
εBins
)
{
private
static
List
<
SummaryItem
>
toSummaryItems
(
List
<
epsilon
Bin
>
εBins
)
{
return
εBins
.
stream
()
return
εBins
.
stream
()
.
map
(
DisaggExport:
:
εBinToSummary
)
.
map
(
DisaggExport:
:
εBinToSummary
)
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
}
}
private
static
SummaryItem
εBinToSummary
(
ε
Bin
bin
)
{
private
static
SummaryItem
εBinToSummary
(
epsilon
Bin
bin
)
{
return
new
SummaryItem
(
"ε"
+
bin
.
id
,
bin
.
toString
(),
null
);
return
new
SummaryItem
(
"ε"
+
bin
.
id
,
bin
.
toString
(),
null
);
}
}
static
final
class
ε
Bin
{
static
final
class
epsilon
Bin
{
final
int
id
;
final
int
id
;
final
Double
min
;
final
Double
min
;
final
Double
max
;
final
Double
max
;
ε
Bin
(
int
id
,
Double
min
,
Double
max
)
{
epsilon
Bin
(
int
id
,
Double
min
,
Double
max
)
{
this
.
id
=
id
;
this
.
id
=
id
;
this
.
min
=
min
;
this
.
min
=
min
;
this
.
max
=
max
;
this
.
max
=
max
;
...
...
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