diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20c692d7..40f4dae7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,7 +188,7 @@ jobs: env: CC: clang-8 CXX: clang++-8 - SKBUILD_CMAKE_ARGS: "-DCMAKE_CXX_STANDARD=11;-DEXTRA_WARNINGS=ON;-DSTANDALONE_PYTHON_MODULE=OFF" + SKBUILD_CMAKE_ARGS: "-DEXTRA_WARNINGS=ON;-DSTANDALONE_PYTHON_MODULE=OFF" SKBUILD_CMAKE_TARGETS: "all;check" steps: - uses: actions/checkout@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index c1c72d79..e7e45d02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,7 +208,7 @@ add_library(gemmi::headers ALIAS gemmi_headers) target_include_directories(gemmi_headers INTERFACE "$" "$") -target_compile_features(gemmi_headers INTERFACE cxx_std_11) +target_compile_features(gemmi_headers INTERFACE cxx_std_14) set_target_properties(gemmi_headers PROPERTIES EXPORT_NAME headers) add_library(gemmi_cpp diff --git a/include/gemmi/seqalign.hpp b/include/gemmi/seqalign.hpp index 5f0ee698..c33d7582 100644 --- a/include/gemmi/seqalign.hpp +++ b/include/gemmi/seqalign.hpp @@ -18,18 +18,18 @@ namespace gemmi { struct AlignmentScoring { - int match; - int mismatch; - int gapo; // gap opening penalty - int gape; // gap extension penalty + int match = 1; + int mismatch = -1; + int gapo = -1; // gap opening penalty + int gape = -1; // gap extension penalty // In a polymer in model, coordinates are used to determine expected gaps. - int good_gapo; // gap opening in expected place in a polymer - int bad_gapo; // gap opening that was not predicted + int good_gapo = 0; // gap opening in expected place in a polymer + int bad_gapo = -2; // gap opening that was not predicted std::vector score_matrix; std::vector matrix_encoding; static const AlignmentScoring* simple() { - static const AlignmentScoring s = { 1, -1, -1, -1, 0, -2, {}, {} }; + static const AlignmentScoring s; return &s; } // Scoring for alignment of partially-modelled polymer to its full sequence