[scram] branch master updated (db23f43 -> 917a582)

Olzhas Rakhimov rakhimov-guest at moszumanska.debian.org
Fri May 12 05:59:00 UTC 2017


This is an automated email from the git hooks/post-receive script.

rakhimov-guest pushed a change to branch master
in repository scram.

      from  db23f43   Update the changelog for new upstream 0.12.0
      adds  9e017cd   Imported Upstream version 0.13.0
       new  917a582   Merge tag 'upstream/0.13.0'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml                                        |    3 +
 .travis/doxygen.conf                               |    2 +-
 .travis/install.sh                                 |   15 +-
 .travis/script.sh                                  |    6 +-
 CMakeLists.txt                                     |   36 +-
 CONTRIBUTING.md                                    |   20 +-
 Dockerfile                                         |   10 +
 README.rst                                         |   30 +-
 doc/bugs.rst                                       |    2 +
 doc/coding_standards.rst                           |    6 +-
 doc/common_cause_analysis.rst                      |    2 +
 doc/description.rst                                |   91 +-
 doc/event_tree_analysis.rst                        |   39 +
 doc/example/report.xml                             |   38 +-
 doc/fault_tree_analysis.rst                        |   64 +-
 doc/fta_algorithms.rst                             |    2 +-
 doc/gui.rst                                        |   13 +-
 doc/input_file.rst                                 |   30 +-
 doc/installation.rst                               |   44 +-
 doc/opsa_support.rst                               |   51 +-
 doc/performance.rst                                |   16 +-
 doc/probability_analysis.rst                       |    4 +-
 doc/references.rst                                 |    2 +-
 doc/release/release_checklist.rst                  |   13 +-
 doc/release/v0.13.0.md                             |   62 +
 doc/report_file.rst                                |   53 +-
 doc/scram-gui.h2m                                  |    5 +
 doc/scram.1                                        |   97 --
 doc/scram.h2m                                      |   17 +
 doc/todo.rst                                       |   20 +-
 doc/uncertainty_analysis.rst                       |   44 +-
 gui/main.cpp                                       |   96 +-
 gui/mainwindow.h                                   |   21 +-
 input/CMakeLists.txt                               |    1 +
 input/EventTrees/attack.xml                        |   79 ++
 input/EventTrees/bcd.xml                           |   97 ++
 input/EventTrees/gas_leak/gas_leak.xml             |   65 +
 input/EventTrees/gas_leak/gas_leak_reactive.xml    |  215 +++
 .../event_tree.xml => EventTrees/mef_example.xml}  |    0
 input/ThreeMotor/event_tree.xml                    |  124 ++
 input/TransTest/trans_one.xml                      |    4 +-
 input/TwoTrain/event_tree.xml                      |   27 +
 scripts/scram.sh                                   |   32 +-
 share/CMakeLists.txt                               |    8 +
 share/{input.rng => gui.rng}                       |  175 +--
 share/input.rng                                    |  413 +++++-
 share/report.rng                                   |  287 ++--
 src/CMakeLists.txt                                 |    7 +-
 src/analysis.h                                     |    2 +-
 src/bdd.cc                                         |    5 +-
 src/ccf_group.cc                                   |  194 ++-
 src/ccf_group.h                                    |  177 ++-
 src/config.cc                                      |   56 +-
 src/config.h                                       |   21 +-
 src/cycle.cc                                       |   42 -
 src/cycle.h                                        |  250 +++-
 src/element.cc                                     |   26 +-
 src/element.h                                      |   66 +-
 src/env.h                                          |    5 +-
 src/event.cc                                       |   49 +-
 src/event.h                                        |  198 +--
 src/event_tree.cc                                  |   70 +
 src/event_tree.h                                   |  446 ++++++
 src/event_tree_analysis.cc                         |  239 ++++
 src/event_tree_analysis.h                          |  110 ++
 src/expression.cc                                  |    7 +-
 src/expression.h                                   |  307 +++-
 src/expression/arithmetic.cc                       |  114 --
 src/expression/arithmetic.h                        |  192 ---
 src/expression/boolean.h                           |   44 +
 src/expression/conditional.cc                      |   60 +
 src/expression/conditional.h                       |   83 ++
 src/expression/constant.cc                         |   18 +-
 src/expression/constant.h                          |   25 +-
 src/expression/exponential.cc                      |  185 +--
 src/expression/exponential.h                       |  135 +-
 src/expression/numerical.cc                        |   71 +
 src/expression/numerical.h                         |  199 +++
 src/expression/random_deviate.cc                   |  109 +-
 src/expression/random_deviate.h                    |   91 +-
 src/{error.cc => expression/test_event.cc}         |   26 +-
 src/expression/test_event.h                        |   91 ++
 src/ext/variant.h                                  |   44 +
 src/fault_tree.cc                                  |   29 +-
 src/fault_tree.h                                   |   52 +-
 src/fault_tree_analysis.cc                         |   49 +-
 src/fault_tree_analysis.h                          |   85 +-
 src/importance_analysis.cc                         |   14 +-
 src/initializer.cc                                 | 1468 ++++++++++++--------
 src/initializer.h                                  |  268 ++--
 src/logger.cc                                      |   15 +-
 src/logger.h                                       |   27 +-
 src/mocus.cc                                       |    8 +-
 src/model.cc                                       |  136 +-
 src/model.h                                        |  135 +-
 src/parameter.cc                                   |   17 +-
 src/parameter.h                                    |   43 +-
 src/pdag.cc                                        |  124 +-
 src/pdag.h                                         |   27 +-
 src/preprocessor.cc                                |  342 ++---
 src/preprocessor.h                                 |   93 +-
 src/probability_analysis.cc                        |    4 +-
 src/random.h                                       |    2 +-
 src/reporter.cc                                    |  249 ++--
 src/reporter.h                                     |   47 +-
 src/risk_analysis.cc                               |   75 +-
 src/risk_analysis.h                                |   83 +-
 src/scram.cc                                       |   43 +-
 src/uncertainty_analysis.cc                        |    9 +-
 src/version.cc.in                                  |    5 +-
 src/version.h                                      |    7 +-
 src/xml.h                                          |   31 +-
 tests/CMakeLists.txt                               |    2 +
 .../{bench_200_event_tests.cc => bench_attack.cc}  |   21 +-
 tests/bench_chinese_tree_tests.cc                  |    6 +-
 tests/bench_core_tests.cc                          |   39 +-
 tests/bench_gas_leak.cc                            |   56 +
 tests/bench_hipps_tests.cc                         |    3 +-
 tests/bench_three_motor_tests.cc                   |   19 +
 tests/bench_two_train_tests.cc                     |   12 +
 tests/ccf_group_tests.cc                           |   14 +-
 tests/config_tests.cc                              |   51 +-
 tests/element_tests.cc                             |   30 +-
 tests/event_tests.cc                               |  129 +-
 tests/expression_tests.cc                          | 1129 ++++++++++-----
 tests/fault_tree_tests.cc                          |   30 +-
 tests/initializer_tests.cc                         |  123 +-
 tests/input/core/mgl_ccf.xml                       |    8 +-
 tests/input/core/null_a.xml                        |    4 +-
 tests/input/core/{null_a.xml => one_prob.xml}      |    8 +-
 tests/input/core/{not_a.xml => zero_prob.xml}      |   10 +-
 tests/input/empty_model.xml                        |    2 +
 tests/input/eta/block_instruction.xml              |   26 +
 tests/input/eta/collect_formula.xml                |   23 +
 tests/input/eta/cyclic_branches_fork.xml           |   18 +
 tests/input/eta/cyclic_branches_self.xml           |   13 +
 tests/input/eta/cyclic_branches_transitive.xml     |   19 +
 tests/input/eta/cyclic_link_self.xml               |   13 +
 tests/input/eta/cyclic_link_transitive.xml         |   21 +
 tests/input/eta/cyclic_rule_block.xml              |    9 +
 tests/input/eta/cyclic_rule_self.xml               |    6 +
 tests/input/eta/cyclic_rule_transitive.xml         |   12 +
 tests/input/eta/doubly_defined_branch.xml          |   21 +
 tests/input/eta/doubly_defined_event_tree.xml      |   24 +
 .../input/eta/doubly_defined_functional_event.xml  |   16 +
 .../input/eta/doubly_defined_initiating_event.xml  |    5 +
 tests/input/eta/doubly_defined_path_state.xml      |   18 +
 tests/input/eta/doubly_defined_rule.xml            |   13 +
 tests/input/eta/doubly_defined_sequence.xml        |   24 +
 tests/input/eta/empty.xml                          |   11 +
 tests/input/eta/if_then_else_instruction.xml       |   29 +
 tests/input/eta/initiating_event.xml               |    4 +
 tests/input/eta/invalid_collect_formula.xml        |   25 +
 .../input/eta/invalid_duplicate_event_in_forks.xml |   22 +
 tests/input/eta/invalid_event_order_in_branch.xml  |   23 +
 .../eta/invalid_event_order_in_initial_state.xml   |   20 +
 tests/input/eta/invalid_event_order_in_link.xml    |   31 +
 .../eta/invalid_event_order_in_ref_branch.xml      |   23 +
 tests/input/eta/invalid_link_in_branch.xml         |   26 +
 tests/input/eta/invalid_link_in_rule.xml           |   30 +
 tests/input/eta/invalid_link_instruction.xml       |   27 +
 .../eta/invalid_link_undefined_event_tree.xml      |   13 +
 tests/input/eta/link_in_rule.xml                   |   32 +
 tests/input/eta/link_instruction.xml               |   24 +
 tests/input/eta/mixing_collect_instructions.xml    |   27 +
 .../input/eta/mixing_collect_instructions_fork.xml |   32 +
 .../input/eta/mixing_collect_instructions_link.xml |   40 +
 tests/input/eta/nested_formula.xml                 |   64 +
 tests/input/eta/private_branch.xml                 |   18 +
 tests/input/eta/private_functional_event.xml       |   21 +
 tests/input/eta/public_sequence.xml                |   19 +
 tests/input/eta/rule_instruction.xml               |   16 +
 tests/input/eta/set_house_event.xml                |   25 +
 tests/input/eta/simplest_correct.xml               |   14 +
 tests/input/eta/single_expression.xml              |   14 +
 tests/input/eta/test_event_default.xml             |   37 +
 tests/input/eta/test_functional_event.xml          |   27 +
 tests/input/eta/test_functional_event_link.xml     |   46 +
 tests/input/eta/test_initiating_event.xml          |   27 +
 tests/input/eta/undefined_arg_collect_formula.xml  |   18 +
 tests/input/eta/undefined_branch.xml               |    9 +
 tests/input/eta/undefined_event_tree.xml           |    4 +
 tests/input/eta/undefined_functional_event.xml     |   14 +
 tests/input/eta/undefined_house_in_set_house.xml   |   21 +
 tests/input/eta/undefined_rule.xml                 |   11 +
 tests/input/eta/undefined_sequence.xml             |    9 +
 tests/input/eta/unused_elements.xml                |   21 +
 tests/input/fta/alpha_ccf_level_error.xml          |    4 +-
 ...s_than_needed.xml => ccf_unordered_factors.xml} |   16 +-
 tests/input/fta/constant_in_formulas.xml           |   21 +
 tests/input/fta/correct_expressions.xml            |  192 +++
 tests/input/fta/full_configuration.xml             |    4 +-
 tests/input/fta/labels_and_attributes.xml          |   10 +-
 ...tors_than_needed.xml => missing_ccf_factor.xml} |   13 +-
 tests/input/fta/null_gate_with_label.xml           |   15 +
 tests/input/fta/pi_configuration.xml               |    2 +-
 tests/input/fta/run_inputs.py                      |    5 +-
 tests/input/fta/weibull_lnorm_deviate_2p.xml       |   29 +
 tests/input/fta/weibull_lnorm_deviate_3p.xml       |   30 +
 tests/input/unsupported_expression.xml             |    2 +-
 tests/input/win_path_in_config.xml                 |    7 +
 tests/input/xinclude.xml                           |    4 +
 tests/input/xinclude_cycle.xml                     |    4 +
 tests/input/xinclude_no_file.xml                   |    4 +
 tests/input/xinclude_transitive.xml                |    4 +
 tests/performance_tests.cc                         |   50 +-
 tests/performance_tests.h                          |   20 +-
 tests/risk_analysis_tests.cc                       |  156 ++-
 tests/risk_analysis_tests.h                        |   29 +-
 209 files changed, 9072 insertions(+), 4132 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 doc/event_tree_analysis.rst
 create mode 100644 doc/release/v0.13.0.md
 create mode 100644 doc/scram-gui.h2m
 delete mode 100644 doc/scram.1
 create mode 100644 doc/scram.h2m
 create mode 100644 input/EventTrees/attack.xml
 create mode 100644 input/EventTrees/bcd.xml
 create mode 100644 input/EventTrees/gas_leak/gas_leak.xml
 create mode 100644 input/EventTrees/gas_leak/gas_leak_reactive.xml
 rename input/{EventTreeExample/event_tree.xml => EventTrees/mef_example.xml} (100%)
 create mode 100644 input/ThreeMotor/event_tree.xml
 create mode 100644 input/TwoTrain/event_tree.xml
 copy share/{input.rng => gui.rng} (77%)
 delete mode 100644 src/cycle.cc
 create mode 100644 src/event_tree.cc
 create mode 100644 src/event_tree.h
 create mode 100644 src/event_tree_analysis.cc
 create mode 100644 src/event_tree_analysis.h
 delete mode 100644 src/expression/arithmetic.cc
 delete mode 100644 src/expression/arithmetic.h
 create mode 100644 src/expression/boolean.h
 create mode 100644 src/expression/conditional.cc
 create mode 100644 src/expression/conditional.h
 create mode 100644 src/expression/numerical.cc
 create mode 100644 src/expression/numerical.h
 copy src/{error.cc => expression/test_event.cc} (60%)
 create mode 100644 src/expression/test_event.h
 create mode 100644 src/ext/variant.h
 copy tests/{bench_200_event_tests.cc => bench_attack.cc} (65%)
 create mode 100644 tests/bench_gas_leak.cc
 copy tests/input/core/{null_a.xml => one_prob.xml} (53%)
 copy tests/input/core/{not_a.xml => zero_prob.xml} (52%)
 create mode 100644 tests/input/empty_model.xml
 create mode 100644 tests/input/eta/block_instruction.xml
 create mode 100644 tests/input/eta/collect_formula.xml
 create mode 100644 tests/input/eta/cyclic_branches_fork.xml
 create mode 100644 tests/input/eta/cyclic_branches_self.xml
 create mode 100644 tests/input/eta/cyclic_branches_transitive.xml
 create mode 100644 tests/input/eta/cyclic_link_self.xml
 create mode 100644 tests/input/eta/cyclic_link_transitive.xml
 create mode 100644 tests/input/eta/cyclic_rule_block.xml
 create mode 100644 tests/input/eta/cyclic_rule_self.xml
 create mode 100644 tests/input/eta/cyclic_rule_transitive.xml
 create mode 100644 tests/input/eta/doubly_defined_branch.xml
 create mode 100644 tests/input/eta/doubly_defined_event_tree.xml
 create mode 100644 tests/input/eta/doubly_defined_functional_event.xml
 create mode 100644 tests/input/eta/doubly_defined_initiating_event.xml
 create mode 100644 tests/input/eta/doubly_defined_path_state.xml
 create mode 100644 tests/input/eta/doubly_defined_rule.xml
 create mode 100644 tests/input/eta/doubly_defined_sequence.xml
 create mode 100644 tests/input/eta/empty.xml
 create mode 100644 tests/input/eta/if_then_else_instruction.xml
 create mode 100644 tests/input/eta/initiating_event.xml
 create mode 100644 tests/input/eta/invalid_collect_formula.xml
 create mode 100644 tests/input/eta/invalid_duplicate_event_in_forks.xml
 create mode 100644 tests/input/eta/invalid_event_order_in_branch.xml
 create mode 100644 tests/input/eta/invalid_event_order_in_initial_state.xml
 create mode 100644 tests/input/eta/invalid_event_order_in_link.xml
 create mode 100644 tests/input/eta/invalid_event_order_in_ref_branch.xml
 create mode 100644 tests/input/eta/invalid_link_in_branch.xml
 create mode 100644 tests/input/eta/invalid_link_in_rule.xml
 create mode 100644 tests/input/eta/invalid_link_instruction.xml
 create mode 100644 tests/input/eta/invalid_link_undefined_event_tree.xml
 create mode 100644 tests/input/eta/link_in_rule.xml
 create mode 100644 tests/input/eta/link_instruction.xml
 create mode 100644 tests/input/eta/mixing_collect_instructions.xml
 create mode 100644 tests/input/eta/mixing_collect_instructions_fork.xml
 create mode 100644 tests/input/eta/mixing_collect_instructions_link.xml
 create mode 100644 tests/input/eta/nested_formula.xml
 create mode 100644 tests/input/eta/private_branch.xml
 create mode 100644 tests/input/eta/private_functional_event.xml
 create mode 100644 tests/input/eta/public_sequence.xml
 create mode 100644 tests/input/eta/rule_instruction.xml
 create mode 100644 tests/input/eta/set_house_event.xml
 create mode 100644 tests/input/eta/simplest_correct.xml
 create mode 100644 tests/input/eta/single_expression.xml
 create mode 100644 tests/input/eta/test_event_default.xml
 create mode 100644 tests/input/eta/test_functional_event.xml
 create mode 100644 tests/input/eta/test_functional_event_link.xml
 create mode 100644 tests/input/eta/test_initiating_event.xml
 create mode 100644 tests/input/eta/undefined_arg_collect_formula.xml
 create mode 100644 tests/input/eta/undefined_branch.xml
 create mode 100644 tests/input/eta/undefined_event_tree.xml
 create mode 100644 tests/input/eta/undefined_functional_event.xml
 create mode 100644 tests/input/eta/undefined_house_in_set_house.xml
 create mode 100644 tests/input/eta/undefined_rule.xml
 create mode 100644 tests/input/eta/undefined_sequence.xml
 create mode 100644 tests/input/eta/unused_elements.xml
 copy tests/input/fta/{ccf_more_factors_than_needed.xml => ccf_unordered_factors.xml} (75%)
 create mode 100644 tests/input/fta/constant_in_formulas.xml
 copy tests/input/fta/{ccf_more_factors_than_needed.xml => missing_ccf_factor.xml} (73%)
 create mode 100644 tests/input/fta/null_gate_with_label.xml
 create mode 100644 tests/input/fta/weibull_lnorm_deviate_2p.xml
 create mode 100644 tests/input/fta/weibull_lnorm_deviate_3p.xml
 create mode 100644 tests/input/win_path_in_config.xml
 create mode 100644 tests/input/xinclude.xml
 create mode 100644 tests/input/xinclude_cycle.xml
 create mode 100644 tests/input/xinclude_no_file.xml
 create mode 100644 tests/input/xinclude_transitive.xml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scram.git



More information about the debian-science-commits mailing list