Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
929a160e
Commit
929a160e
authored
2 years ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rm fct arg
parent
7d8b9d52
No related branches found
No related tags found
1 merge request
!1303
simplifications of resolution handling; resolve warnings
Pipeline
#86766
passed
2 years ago
Stage: build
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Param/Distrib/RangedDistributions.cpp
+3
-3
3 additions, 3 deletions
Param/Distrib/RangedDistributions.cpp
Param/Distrib/RangedDistributions.h
+1
-1
1 addition, 1 deletion
Param/Distrib/RangedDistributions.h
Sim/Scan/ScanResolution.cpp
+1
-1
1 addition, 1 deletion
Sim/Scan/ScanResolution.cpp
with
5 additions
and
5 deletions
Param/Distrib/RangedDistributions.cpp
+
3
−
3
View file @
929a160e
...
...
@@ -44,13 +44,13 @@ IRangedDistribution::IRangedDistribution(size_t n_samples, double sigma_factor)
IRangedDistribution
::~
IRangedDistribution
()
=
default
;
std
::
vector
<
ParameterSample
>
IRangedDistribution
::
generateSamples
(
double
mean
,
double
stddev
)
const
std
::
vector
<
ParameterSample
>
IRangedDistribution
::
generateSamples
(
double
stddev
)
const
{
if
(
stddev
==
0
)
// it's a delta distribution
return
{{
mean
,
1.0
}};
return
{{
0.
,
1.0
}};
ASSERT
(
stddev
>
0
);
auto
generator
=
distribution
(
mean
,
stddev
);
auto
generator
=
distribution
(
0.
,
stddev
);
return
generator
->
equidistantSamples
(
m_n_samples
,
m_sigma_factor
);
}
...
...
This diff is collapsed.
Click to expand it.
Param/Distrib/RangedDistributions.h
+
1
−
1
View file @
929a160e
...
...
@@ -41,7 +41,7 @@ public:
IRangedDistribution
*
clone
()
const
override
=
0
;
#ifndef SWIG
std
::
vector
<
ParameterSample
>
generateSamples
(
double
mean
,
double
stddev
)
const
;
std
::
vector
<
ParameterSample
>
generateSamples
(
double
stddev
)
const
;
//! Public interface function to underlying IDistribution1D object
IDistribution1D
*
distribution
(
double
mean
,
double
stddev
)
const
;
...
...
This diff is collapsed.
Click to expand it.
Sim/Scan/ScanResolution.cpp
+
1
−
1
View file @
929a160e
...
...
@@ -32,7 +32,7 @@ ScanResolution* ScanResolution::clone() const
std
::
vector
<
ParameterSample
>
ScanResolution
::
resolutionSamples
()
const
{
return
rdistribution
()
->
generateSamples
(
0.
,
m_stddev
);
return
rdistribution
()
->
generateSamples
(
m_stddev
);
}
size_t
ScanResolution
::
nSamples
()
const
...
...
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