Skip to content

Commit

Permalink
Deprecate Statistics VPP
Browse files Browse the repository at this point in the history
  • Loading branch information
aeslaughter authored and jain651 committed Apr 19, 2021
1 parent bf6a291 commit 731badc
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 123 deletions.
Expand Up @@ -18,7 +18,7 @@

#include <numeric>

registerMooseObject("StochasticToolsApp", Statistics);
registerADMooseObjectDeprecated("StochasticToolsApp", Statistics, "07/01/2021 12:00");

InputParameters
Statistics::validParams()
Expand Down
@@ -1,41 +1,25 @@
[Tests]
design = Statistics.md
issues = '#14409'
[basic]
type = CSVDiff
input = bca.i
csvdiff = bca_out_stats_0001.csv

[bca]
requirement = "The system shall support computing bias corrected and accelerated confidence level intervals of statics"

[basic]
type = CSVDiff
input = bca.i
csvdiff = bca_out_stats_0001.csv

detail = "of a vector of data"
[]

[replicated]
type = CSVDiff
input = bca_distributed.i
csvdiff = bca_distributed_out_stats_0001.csv
cli_args = "VectorPostprocessors/data/parallel_type=replicated"
min_parallel = 3
max_parallel = 3
allow_test_objects = true

detail = "using data that is replicated or"
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]

[distributed]
type = CSVDiff
input = bca_distributed.i
csvdiff = bca_distributed_out_stats_0001.csv
prereq = bca/replicated
min_parallel = 3
max_parallel = 3
allow_test_objects = true
[replicated]
type = CSVDiff
input = bca_distributed.i
csvdiff = bca_distributed_out_stats_0001.csv
cli_args = "VectorPostprocessors/data/parallel_type=replicated"
min_parallel = 3
max_parallel = 3
allow_test_objects = true

skip = "WIP #14409"
detail = "distributed across processors."
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]
[]
@@ -1,35 +1,35 @@
[Tests]
design = Statistics.md
issues = '#14409'
[no_ci_levels]
type = RunException
input = error.i
cli_args = "VectorPostprocessors/stats/ci_levels=''"
expect_err = "If the 'ci_method' parameter is supplied then the 'ci_levels' must also be "
"supplied with values in \(0, 0.5\]"

[errors]
requirement = "The system shall error when computing confidence level intervals when"

[no_ci_levels]
type = RunException
input = error.i
cli_args = "VectorPostprocessors/stats/ci_levels=''"
expect_err = "If the 'ci_method' parameter is supplied then the 'ci_levels' must also be supplied with values in \(0, 0.5\]"

detail = "the confidence level intervals are omitted;"
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]

[ci_levels_zero]
type = RunException
input = error.i
cli_args = "VectorPostprocessors/stats/ci_levels='0'"
expect_err = "The supplied levels must be greater than zero"
[ci_levels_zero]
type = RunException
input = error.i
cli_args = "VectorPostprocessors/stats/ci_levels='0'"
expect_err = "The supplied levels must be greater than zero"

detail = "the confidence level intervals are omitted;"
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]

[ci_levels_one]
type = RunException
input = error.i
cli_args = "VectorPostprocessors/stats/ci_levels='1'"
expect_err = "The supplied levels must be less than or equal to 0\.5"
[ci_levels_one]
type = RunException
input = error.i
cli_args = "VectorPostprocessors/stats/ci_levels='1'"
expect_err = "The supplied levels must be less than or equal to 0\.5"

detail = "the confidence level intervals are out of range."
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]
[]
@@ -1,42 +1,41 @@
[Tests]
design = Statistics.md
issues = '#14409'
[basic]
type = CSVDiff
input = percentile.i
csvdiff = percentile_out_stats_0001.csv

[percentile]
requirement = "The system shall support computing percentile confidence level intervals of statics"

[basic]
type = CSVDiff
input = percentile.i
csvdiff = percentile_out_stats_0001.csv

detail = "of a vector of data"
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]

# These two tests are restricted to 3 processors because the Test VPP creates unique data
# depending on the number of cores used
[replicated]
type = CSVDiff
input = percentile_distributed.i
csvdiff = percentile_distributed_out_stats_0001.csv
cli_args = "VectorPostprocessors/data/parallel_type=replicated"
min_parallel = 3
max_parallel = 3
allow_test_objects = true
# These two tests are restricted to 3 processors because the Test VPP creates unique data
# depending on the number of cores used
[replicated]
type = CSVDiff
input = percentile_distributed.i
csvdiff = percentile_distributed_out_stats_0001.csv
cli_args = "VectorPostprocessors/data/parallel_type=replicated"
min_parallel = 3
max_parallel = 3
allow_test_objects = true

detail = "using data that is replicated or"
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]

[distributed]
type = CSVDiff
input = percentile_distributed.i
csvdiff = percentile_distributed_out_stats_0001.csv
prereq = percentile/replicated
min_parallel = 3
max_parallel = 3
allow_test_objects = true
[distributed]
type = CSVDiff
input = percentile_distributed.i
csvdiff = percentile_distributed_out_stats_0001.csv
prereq = replicated
min_parallel = 3
max_parallel = 3
allow_test_objects = true

detail = "distributed across processors."
[]
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]
[]
@@ -1,28 +1,23 @@
[Tests]
issues = '#11217'
design = 'Statistics.md'

[tests]
requirement = 'The system shall be capable of computing the statics of a data vector of that'

[replicated]
type = 'CSVDiff'
input = 'statistics.i'
csvdiff = 'statistics_out_stats_0001.csv'
allow_test_objects = true

detail = 'is replicated and'
[]

[distributed]
type = 'CSVDiff'
input = 'statistics_distributed.i'
csvdiff = 'statistics_distributed_out_stats_0001.csv'
min_parallel = 3
max_parallel = 3
allow_test_objects = true
[replicated]
type = 'CSVDiff'
input = 'statistics.i'
csvdiff = 'statistics_out_stats_0001.csv'
allow_test_objects = true
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]

detail = 'distributed.'
[]
[distributed]
type = 'CSVDiff'
input = 'statistics_distributed.i'
csvdiff = 'statistics_distributed_out_stats_0001.csv'
min_parallel = 3
max_parallel = 3
allow_test_objects = true
allow_deprecated = true
no_error_deprecated = true
deprecated = true # SQA
[]
[]
3 changes: 1 addition & 2 deletions python/moosesqa/check_requirements.py
Expand Up @@ -60,7 +60,6 @@ def check_requirements(requirements, file_list=None, color_text=True, allowed_co
kwargs.setdefault('log_top_level_detail', log_default)
kwargs.setdefault('log_missing_detail', log_default)
kwargs.setdefault('log_empty_detail', log_default)
kwargs.setdefault('log_deprecated_detail', log_default)
kwargs.setdefault('log_extra_requirement', log_default)
kwargs.setdefault('log_extra_design', log_default)
kwargs.setdefault('log_extra_issues', log_default)
Expand Down Expand Up @@ -203,7 +202,7 @@ def _check_requirement(req, logger, file_list, allowed_collections):
logger.log('log_extra_collections', detail, "Extra 'collections' supplied", line=detail.collections_line)

if hasattr(detail, 'deprecated') and detail.deprecated:
logger.log('log_detail_deprecated', detail, "Sub-block with 'deprecated' supplied", line=detail.issues_line)
logger.log('log_deprecated_detail', detail, "Sub-block with 'deprecated' supplied", line=detail.issues_line)

# Test format of 'issues'
if req.issues is not None:
Expand Down

0 comments on commit 731badc

Please sign in to comment.