[scram] 01/02: Merge tag 'upstream/0.15.0'

[Olzhas Rakhimov]

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

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

commit 555d3c9f1bd634bbdf6467afc9035a0558890db7
Merge: 97dd05f 3df3369
Author: rakhimov <ol.rakhimov at gmail.com>
Date:   Mon Aug 14 22:05:46 2017 -0700

    Merge tag 'upstream/0.15.0'
    
    Upstream version 0.15.0

 .appveyor.yml                                      |   7 +-
 CMakeLists.txt                                     |  26 +--
 cmake/ScramBundle.cmake                            |  13 ++
 doc/installation.rst                               |   4 +
 doc/opsa_support.rst                               |   1 +
 doc/release/v0.15.0.md                             |  33 +++
 gui/CMakeLists.txt                                 |  79 +++----
 gui/diagram.cpp                                    |  30 +--
 gui/diagram.h                                      |   6 +-
 gui/elementcontainermodel.cpp                      |  25 ++-
 gui/elementcontainermodel.h                        |  14 ++
 gui/main.cpp                                       | 213 +++++++++++++++++-
 gui/mainwindow.cpp                                 |   4 +-
 gui/scram-gui.desktop                              |   2 +
 gui/scramgui.cpp                                   | 240 ---------------------
 input/EventTrees/attack_alignment.xml              |   6 +
 input/TwoTrain/two_train_alignment.xml             |  76 +++++++
 scripts/{scram.sh => scram}                        |   2 +-
 share/input.rng                                    |  32 +++
 share/report.rng                                   |  12 ++
 src/CMakeLists.txt                                 |   1 +
 src/alignment.cc                                   |  50 +++++
 src/alignment.h                                    |  95 ++++++++
 src/analysis.cc                                    |   6 +-
 src/analysis.h                                     |  11 +-
 src/ccf_group.cc                                   |   9 +-
 src/cycle.h                                        |   1 +
 src/event_tree.h                                   | 201 +----------------
 src/event_tree_analysis.cc                         |   1 +
 src/ext/float_compare.h                            |  46 ++++
 src/initializer.cc                                 |  51 +++++
 src/initializer.h                                  |   6 +-
 src/{event_tree.h => instruction.h}                | 220 +------------------
 src/model.cc                                       |   5 +
 src/model.h                                        |   5 +
 src/reporter.cc                                    |  25 ++-
 src/reporter.h                                     |   4 +-
 src/risk_analysis.cc                               |  55 ++++-
 src/risk_analysis.h                                |  44 +++-
 tests/CMakeLists.txt                               |   1 +
 tests/alignment_tests.cc                           |  78 +++++++
 tests/bench_200_event_tests.cc                     |   2 +-
 tests/bench_attack.cc                              |   2 +-
 tests/bench_bscu_tests.cc                          |   2 +-
 tests/bench_core_tests.cc                          |  66 +++---
 tests/bench_gas_leak.cc                            |   2 +-
 tests/bench_lift_tests.cc                          |   2 +-
 tests/bench_ne574_tests.cc                         |   2 +-
 tests/bench_small_tree_tests.cc                    |   2 +-
 tests/bench_theatre_tests.cc                       |   2 +-
 tests/bench_three_motor_tests.cc                   |   2 +-
 tests/bench_two_train_tests.cc                     |   2 +-
 tests/initializer_tests.cc                         |  33 +++
 tests/input/model/duplicate_alignment.xml          |   9 +
 tests/input/model/duplicate_phases.xml             |   7 +
 tests/input/model/empty_alignment.xml              |   4 +
 tests/input/model/excess_alignment.xml             |   7 +
 tests/input/model/incomplete_alignment.xml         |   6 +
 tests/input/model/invalid_phase_fraction.xml       |   6 +
 tests/input/model/negative_phase_fraction.xml      |   6 +
 tests/input/model/private_phases.xml               |   9 +
 .../model/undefined_target_set_house_event.xml     |  10 +
 tests/input/model/valid_alignment.xml              |   6 +
 tests/input/model/valid_sum_alignment.xml          |   9 +
 tests/input/model/zero_phase_fraction.xml          |   6 +
 tests/risk_analysis_tests.cc                       | 103 +++++----
 tests/risk_analysis_tests.h                        |   7 +-
 67 files changed, 1188 insertions(+), 866 deletions(-)

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