Skip to content

D
dssp
Commit 8ec1983b by Maarten L. Hekkelman
Options

Updated for new libcifpp v5

parent 122d7b02
Showing with 82 additions and 96 deletions
CMakeLists.txt
...@@ -132,7 +132,7 @@ target_include_directories(mkdssp PRIVATE cifpp::cifpp ${CMAKE_SOURCE_DIR}/inclu ...@@ -132,7 +132,7 @@ target_include_directories(mkdssp PRIVATE cifpp::cifpp ${CMAKE_SOURCE_DIR}/inclu
target_link_libraries(mkdssp PRIVATE cifpp::cifpp Boost::date_time Boost::program_options) target_link_libraries(mkdssp PRIVATE cifpp::cifpp Boost::date_time Boost::program_options)
if(USE_RSRC) if(USE_RSRC)
mrc_target_resources(mkdssp ${CIFPP_SHARE_DIR}/mmcif_pdbx_v50.dic) mrc_target_resources(mkdssp ${CIFPP_SHARE_DIR}/mmcif_pdbx.dic)
endif() endif()
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
...@@ -156,7 +156,7 @@ endif() ...@@ -156,7 +156,7 @@ endif()
add_executable(unit-test ${PROJECT_SOURCE_DIR}/test/unit-test.cpp ${PROJECT_SOURCE_DIR}/src/dssp.cpp) add_executable(unit-test ${PROJECT_SOURCE_DIR}/test/unit-test.cpp ${PROJECT_SOURCE_DIR}/src/dssp.cpp)
if(USE_RSRC) if(USE_RSRC)
mrc_target_resources(unit-test ${CIFPP_SHARE_DIR}/mmcif_pdbx_v50.dic) mrc_target_resources(unit-test ${CIFPP_SHARE_DIR}/mmcif_pdbx.dic)
endif() endif()
target_include_directories(unit-test PRIVATE target_include_directories(unit-test PRIVATE
......
src/dssp.cpp
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// -------------------------------------------------------------------- // --------------------------------------------------------------------
std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info) std::string ResidueToDSSPLine(const dssp::DSSP::residue_info &info)
{ {
/* /*
This is the header line for the residue lines in a DSSP file: This is the header line for the residue lines in a DSSP file:
...@@ -72,29 +72,29 @@ std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info) ...@@ -72,29 +72,29 @@ std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info)
} }
char ss; char ss;
switch (info.ss()) switch (info.type())
{ {
case mmcif::ssAlphahelix: ss = 'H'; break; case dssp::structure_type::Alphahelix: ss = 'H'; break;
case mmcif::ssBetabridge: ss = 'B'; break; case dssp::structure_type::Betabridge: ss = 'B'; break;
case mmcif::ssStrand: ss = 'E'; break; case dssp::structure_type::Strand: ss = 'E'; break;
case mmcif::ssHelix_3: ss = 'G'; break; case dssp::structure_type::Helix_3: ss = 'G'; break;
case mmcif::ssHelix_5: ss = 'I'; break; case dssp::structure_type::Helix_5: ss = 'I'; break;
case mmcif::ssHelix_PPII: ss = 'P'; break; case dssp::structure_type::Helix_PPII: ss = 'P'; break;
case mmcif::ssTurn: ss = 'T'; break; case dssp::structure_type::Turn: ss = 'T'; break;
case mmcif::ssBend: ss = 'S'; break; case dssp::structure_type::Bend: ss = 'S'; break;
case mmcif::ssLoop: ss = ' '; break; case dssp::structure_type::Loop: ss = ' '; break;
} }
char helix[4] = {' ', ' ', ' ', ' '}; char helix[4] = {' ', ' ', ' ', ' '};
for (mmcif::HelixType helixType : {mmcif::HelixType::rh_3_10, mmcif::HelixType::rh_alpha, mmcif::HelixType::rh_pi, mmcif::HelixType::rh_pp}) for (dssp::helix_type helixType : {dssp::helix_type::_3_10, dssp::helix_type::alpha, dssp::helix_type::pi, dssp::helix_type::pp})
{ {
switch (info.helix(helixType)) switch (info.helix(helixType))
{ {
case mmcif::Helix::None: helix[static_cast<int>(helixType)] = ' '; break; case dssp::helix_position_type::None: helix[static_cast<int>(helixType)] = ' '; break;
case mmcif::Helix::Start: helix[static_cast<int>(helixType)] = '>'; break; case dssp::helix_position_type::Start: helix[static_cast<int>(helixType)] = '>'; break;
case mmcif::Helix::End: helix[static_cast<int>(helixType)] = '<'; break; case dssp::helix_position_type::End: helix[static_cast<int>(helixType)] = '<'; break;
case mmcif::Helix::StartAndEnd: helix[static_cast<int>(helixType)] = 'X'; break; case dssp::helix_position_type::StartAndEnd: helix[static_cast<int>(helixType)] = 'X'; break;
case mmcif::Helix::Middle: helix[static_cast<int>(helixType)] = (helixType == mmcif::HelixType::rh_pp ? 'P' : static_cast<char>('3' + static_cast<int>(helixType))); break; case dssp::helix_position_type::Middle: helix[static_cast<int>(helixType)] = (helixType == dssp::helix_type::pp ? 'P' : static_cast<char>('3' + static_cast<int>(helixType))); break;
} }
} }
...@@ -109,7 +109,7 @@ std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info) ...@@ -109,7 +109,7 @@ std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info)
char bridgelabel[2] = {' ', ' '}; char bridgelabel[2] = {' ', ' '};
for (uint32_t i : {0, 1}) for (uint32_t i : {0, 1})
{ {
const auto &[p, ladder, parallel] = info.bridgePartner(i); const auto &[p, ladder, parallel] = info.bridge_partner(i);
if (not p) if (not p)
continue; continue;
...@@ -154,59 +154,57 @@ std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info) ...@@ -154,59 +154,57 @@ std::string ResidueToDSSPLine(const mmcif::DSSP::ResidueInfo &info)
.str(); .str();
} }
void writeDSSP(const cif::datablock &db, const mmcif::DSSP &dssp, std::ostream &os) void writeDSSP(const dssp::DSSP &dssp, std::ostream &os)
{ {
const std::string kFirstLine("==== Secondary Structure Definition by the program DSSP, NKI version 4.0 ==== "); const std::string kFirstLine("==== Secondary Structure Definition by the program DSSP, NKI version 4.0 ==== ");
boost::format kHeaderLine("%1% %|127t|%2%"); boost::format kHeaderLine("%1% %|127t|%2%");
using namespace boost::gregorian; using namespace boost::gregorian;
auto stats = dssp.GetStatistics(); auto stats = dssp.get_statistics();
date today = day_clock::local_day(); date today = day_clock::local_day();
// auto& cf = structure.file();
os << kHeaderLine % (kFirstLine + "DATE=" + to_iso_extended_string(today)) % '.' << std::endl os << kHeaderLine % (kFirstLine + "DATE=" + to_iso_extended_string(today)) % '.' << std::endl
<< kHeaderLine % "REFERENCE W. KABSCH AND C.SANDER, BIOPOLYMERS 22 (1983) 2577-2637" % '.' << std::endl << kHeaderLine % "REFERENCE W. KABSCH AND C.SANDER, BIOPOLYMERS 22 (1983) 2577-2637" % '.' << std::endl
<< /*GetPDBHEADERLine(db, 127) << */ '.' << std::endl << dssp.get_pdb_header_line(dssp::DSSP::pdb_record_type::HEADER) << '.' << std::endl
<< /*GetPDBCOMPNDLine(db, 127) << */ '.' << std::endl << dssp.get_pdb_header_line(dssp::DSSP::pdb_record_type::COMPND) << '.' << std::endl
<< /*GetPDBSOURCELine(db, 127) << */ '.' << std::endl << dssp.get_pdb_header_line(dssp::DSSP::pdb_record_type::SOURCE) << '.' << std::endl
<< /*GetPDBAUTHORLine(db, 127) << */ '.' << std::endl; << dssp.get_pdb_header_line(dssp::DSSP::pdb_record_type::AUTHOR) << '.' << std::endl;
os << boost::format("%5.5d%3.3d%3.3d%3.3d%3.3d TOTAL NUMBER OF RESIDUES, NUMBER OF CHAINS, NUMBER OF SS-BRIDGES(TOTAL,INTRACHAIN,INTERCHAIN) %|127t|%c") % os << boost::format("%5.5d%3.3d%3.3d%3.3d%3.3d TOTAL NUMBER OF RESIDUES, NUMBER OF CHAINS, NUMBER OF SS-BRIDGES(TOTAL,INTRACHAIN,INTERCHAIN) %|127t|%c") %
stats.nrOfResidues % stats.nrOfChains % stats.nrOfSSBridges % stats.nrOfIntraChainSSBridges % (stats.nrOfSSBridges - stats.nrOfIntraChainSSBridges) % '.' stats.count.residues % stats.count.chains % stats.count.SS_bridges % stats.count.intra_chain_SS_bridges % (stats.count.SS_bridges - stats.count.intra_chain_SS_bridges) % '.'
<< std::endl; << std::endl;
os << kHeaderLine % (boost::format("%8.1f ACCESSIBLE SURFACE OF PROTEIN (ANGSTROM**2)") % stats.accessibleSurface) % '.' << std::endl; os << kHeaderLine % (boost::format("%8.1f ACCESSIBLE SURFACE OF PROTEIN (ANGSTROM**2)") % stats.accessible_surface) % '.' << std::endl;
// hydrogenbond summary // hydrogenbond summary
os << kHeaderLine % (boost::format("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS OF TYPE O(I)-->H-N(J) , SAME NUMBER PER 100 RESIDUES") % stats.nrOfHBonds % (stats.nrOfHBonds * 100.0 / stats.nrOfResidues)) % '.' << std::endl; os << kHeaderLine % (boost::format("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS OF TYPE O(I)-->H-N(J) , SAME NUMBER PER 100 RESIDUES") % stats.count.H_bonds % (stats.count.H_bonds * 100.0 / stats.count.residues)) % '.' << std::endl;
os << kHeaderLine % (boost::format("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS IN PARALLEL BRIDGES, SAME NUMBER PER 100 RESIDUES") % stats.nrOfHBondsInParallelBridges % (stats.nrOfHBondsInParallelBridges * 100.0 / stats.nrOfResidues)) % '.' << std::endl; os << kHeaderLine % (boost::format("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS IN PARALLEL BRIDGES, SAME NUMBER PER 100 RESIDUES") % stats.count.H_bonds_in_parallel_bridges % (stats.count.H_bonds_in_parallel_bridges * 100.0 / stats.count.residues)) % '.' << std::endl;
os << kHeaderLine % (boost::format("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS IN ANTIPARALLEL BRIDGES, SAME NUMBER PER 100 RESIDUES") % stats.nrOfHBondsInAntiparallelBridges % (stats.nrOfHBondsInAntiparallelBridges * 100.0 / stats.nrOfResidues)) % '.' << std::endl; os << kHeaderLine % (boost::format("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS IN ANTIPARALLEL BRIDGES, SAME NUMBER PER 100 RESIDUES") % stats.count.H_bonds_in_antiparallel_bridges % (stats.count.H_bonds_in_antiparallel_bridges * 100.0 / stats.count.residues)) % '.' << std::endl;
boost::format kHBondsLine("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS OF TYPE O(I)-->H-N(I%c%1.1d), SAME NUMBER PER 100 RESIDUES"); boost::format kHBondsLine("%5.5d%5.1f TOTAL NUMBER OF HYDROGEN BONDS OF TYPE O(I)-->H-N(I%c%1.1d), SAME NUMBER PER 100 RESIDUES");
for (int k = 0; k < 11; ++k) for (int k = 0; k < 11; ++k)
os << kHeaderLine % (kHBondsLine % stats.nrOfHBondsPerDistance[k] % (stats.nrOfHBondsPerDistance[k] * 100.0 / stats.nrOfResidues) % (k - 5 < 0 ? '-' : '+') % abs(k - 5)) % '.' << std::endl; os << kHeaderLine % (kHBondsLine % stats.count.H_Bonds_per_distance[k] % (stats.count.H_Bonds_per_distance[k] * 100.0 / stats.count.residues) % (k - 5 < 0 ? '-' : '+') % abs(k - 5)) % '.' << std::endl;
// histograms... // histograms...
os << " 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 *** HISTOGRAMS OF *** ." << std::endl; os << " 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 *** HISTOGRAMS OF *** ." << std::endl;
for (auto hi : stats.residuesPerAlphaHelixHistogram) for (auto hi : stats.histogram.residues_per_alpha_helix)
os << boost::format("%3.3d") % hi; os << boost::format("%3.3d") % hi;
os << " RESIDUES PER ALPHA HELIX ." << std::endl; os << " RESIDUES PER ALPHA HELIX ." << std::endl;
for (auto hi : stats.parallelBridgesPerLadderHistogram) for (auto hi : stats.histogram.parallel_bridges_per_ladder)
os << boost::format("%3.3d") % hi; os << boost::format("%3.3d") % hi;
os << " PARALLEL BRIDGES PER LADDER ." << std::endl; os << " PARALLEL BRIDGES PER LADDER ." << std::endl;
for (auto hi : stats.antiparallelBridgesPerLadderHistogram) for (auto hi : stats.histogram.antiparallel_bridges_per_ladder)
os << boost::format("%3.3d") % hi; os << boost::format("%3.3d") % hi;
os << " ANTIPARALLEL BRIDGES PER LADDER ." << std::endl; os << " ANTIPARALLEL BRIDGES PER LADDER ." << std::endl;
for (auto hi : stats.laddersPerSheetHistogram) for (auto hi : stats.histogram.ladders_per_sheet)
os << boost::format("%3.3d") % hi; os << boost::format("%3.3d") % hi;
os << " LADDERS PER SHEET ." << std::endl; os << " LADDERS PER SHEET ." << std::endl;
...@@ -223,14 +221,14 @@ void writeDSSP(const cif::datablock &db, const mmcif::DSSP &dssp, std::ostream & ...@@ -223,14 +221,14 @@ void writeDSSP(const cif::datablock &db, const mmcif::DSSP &dssp, std::ostream &
// can be the transition to a different chain, or missing residues in the current chain // can be the transition to a different chain, or missing residues in the current chain
if (ri.nr() != last + 1) if (ri.nr() != last + 1)
os << (kDSSPResidueLine % (last + 1) % (ri.chainBreak() == mmcif::ChainBreak::NewChain ? '*' : ' ')) << std::endl; os << (kDSSPResidueLine % (last + 1) % (ri.chain_break() == dssp::chain_break_type::NewChain ? '*' : ' ')) << std::endl;
os << ResidueToDSSPLine(ri) << std::endl; os << ResidueToDSSPLine(ri) << std::endl;
last = ri.nr(); last = ri.nr();
} }
} }
void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther, std::ostream &os) void annotateDSSP(cif::datablock &db, const dssp::DSSP &dssp, bool writeOther, std::ostream &os)
{ {
if (dssp.empty()) if (dssp.empty())
{ {
...@@ -249,15 +247,15 @@ void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther, ...@@ -249,15 +247,15 @@ void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther,
std::map<std::string, int> foundTypes; std::map<std::string, int> foundTypes;
auto st = dssp.begin(), lt = st; auto st = dssp.begin(), lt = st;
auto lastSS = st->ss(); auto lastSS = st->type();
for (auto t = dssp.begin();; lt = t, ++t) for (auto t = dssp.begin();; lt = t, ++t)
{ {
bool stop = t == dssp.end(); bool stop = t == dssp.end();
bool flush = (stop or t->ss() != lastSS); bool flush = (stop or t->type() != lastSS);
if (flush and (writeOther or lastSS != mmcif::SecondaryStructureType::ssLoop)) if (flush and (writeOther or lastSS != dssp::structure_type::Loop))
{ {
auto &rb = *st; auto &rb = *st;
auto &re = *lt; auto &re = *lt;
...@@ -265,36 +263,36 @@ void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther, ...@@ -265,36 +263,36 @@ void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther,
std::string id; std::string id;
switch (lastSS) switch (lastSS)
{ {
case mmcif::SecondaryStructureType::ssHelix_3: case dssp::structure_type::Helix_3:
id = "HELX_RH_3T_P"; id = "HELX_RH_3T_P";
break; break;
case mmcif::SecondaryStructureType::ssAlphahelix: case dssp::structure_type::Alphahelix:
id = "HELX_RH_AL_P"; id = "HELX_RH_AL_P";
break; break;
case mmcif::SecondaryStructureType::ssHelix_5: case dssp::structure_type::Helix_5:
id = "HELX_RH_PI_P"; id = "HELX_RH_PI_P";
break; break;
case mmcif::SecondaryStructureType::ssHelix_PPII: case dssp::structure_type::Helix_PPII:
id = "HELX_LH_PP_P"; id = "HELX_LH_PP_P";
break; break;
case mmcif::SecondaryStructureType::ssTurn: case dssp::structure_type::Turn:
id = "TURN_TY1_P"; id = "TURN_TY1_P";
break; break;
case mmcif::SecondaryStructureType::ssBend: case dssp::structure_type::Bend:
id = "BEND"; id = "BEND";
break; break;
case mmcif::SecondaryStructureType::ssBetabridge: case dssp::structure_type::Betabridge:
case mmcif::SecondaryStructureType::ssStrand: case dssp::structure_type::Strand:
id = "STRN"; id = "STRN";
break; break;
case mmcif::SecondaryStructureType::ssLoop: case dssp::structure_type::Loop:
id = "OTHER"; id = "OTHER";
break; break;
} }
...@@ -337,10 +335,10 @@ void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther, ...@@ -337,10 +335,10 @@ void annotateDSSP(cif::datablock &db, const mmcif::DSSP &dssp, bool writeOther,
if (stop) if (stop)
break; break;
if (lastSS != t->ss()) if (lastSS != t->type())
{ {
st = t; st = t;
lastSS = t->ss(); lastSS = t->type();
} }
} }
} }
......
src/dssp.hpp
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#pragma once #pragma once
#include <cif++/structure/DSSP.hpp> #include <cif++/dssp/DSSP.hpp>
void writeDSSP(const cif::datablock &db, const mmcif::DSSP& dssp, std::ostream& os); void writeDSSP(const dssp::DSSP& dssp, std::ostream& os);
void annotateDSSP(cif::datablock &db, const mmcif::DSSP& dssp, bool writeOther, std::ostream& os); void annotateDSSP(cif::datablock &db, const dssp::DSSP& dssp, bool writeOther, std::ostream& os);
src/mkdssp.cpp
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/date_time/gregorian/formatters.hpp> #include <boost/date_time/gregorian/formatters.hpp>
#include <cif++/structure/DSSP.hpp> #include <cif++/dssp/DSSP.hpp>
#include <cif++/structure/Compound.hpp> // #include <cif++/structure/Compound.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
...@@ -80,8 +80,8 @@ int d_main(int argc, const char* argv[]) ...@@ -80,8 +80,8 @@ int d_main(int argc, const char* argv[])
("min-pp-stretch", po::value<short>(), "Minimal number of residues having PSI/PHI in range for a PP helix, default is 3") ("min-pp-stretch", po::value<short>(), "Minimal number of residues having PSI/PHI in range for a PP helix, default is 3")
("write-other", "If set, write the type OTHER for loops, default is to leave this out") ("write-other", "If set, write the type OTHER for loops, default is to leave this out")
("components", po::value<std::string>(), "Location of the components.cif file from CCD") // ("components", po::value<std::string>(), "Location of the components.cif file from CCD")
("extra-compounds", po::value<std::string>(), "File containing residue information for extra compounds in this specific target, should be either in CCD format or a CCP4 restraints file") // ("extra-compounds", po::value<std::string>(), "File containing residue information for extra compounds in this specific target, should be either in CCD format or a CCP4 restraints file")
("mmcif-dictionary", po::value<std::string>(), "Path to the mmcif_pdbx.dic file to use instead of default") ("mmcif-dictionary", po::value<std::string>(), "Path to the mmcif_pdbx.dic file to use instead of default")
("help,h", "Display help message") ("help,h", "Display help message")
...@@ -95,7 +95,7 @@ int d_main(int argc, const char* argv[]) ...@@ -95,7 +95,7 @@ int d_main(int argc, const char* argv[])
("output,o", po::value<std::string>(), "Output to this file") ("output,o", po::value<std::string>(), "Output to this file")
("debug,d", po::value<int>(), "Debug level (for even more verbose output)") ("debug,d", po::value<int>(), "Debug level (for even more verbose output)")
("compounds", po::value<std::string>(), "Location of the components.cif file from CCD, alias") // ("compounds", po::value<std::string>(), "Location of the components.cif file from CCD, alias")
; ;
po::options_description cmdline_options; po::options_description cmdline_options;
...@@ -144,37 +144,32 @@ int d_main(int argc, const char* argv[]) ...@@ -144,37 +144,32 @@ int d_main(int argc, const char* argv[])
// Load extra CCD definitions, if any // Load extra CCD definitions, if any
if (vm.count("compounds")) // if (vm.count("compounds"))
cif::add_file_resource("components.cif", vm["compounds"].as<std::string>()); // cif::add_file_resource("components.cif", vm["compounds"].as<std::string>());
else if (vm.count("components")) // else if (vm.count("components"))
cif::add_file_resource("components.cif", vm["components"].as<std::string>()); // cif::add_file_resource("components.cif", vm["components"].as<std::string>());
if (vm.count("extra-compounds")) // if (vm.count("extra-compounds"))
mmcif::CompoundFactory::instance().pushDictionary(vm["extra-compounds"].as<std::string>()); // mmcif::CompoundFactory::instance().pushDictionary(vm["extra-compounds"].as<std::string>());
// And perhaps a private mmcif_pdbx dictionary // And perhaps a private mmcif_pdbx dictionary
if (vm.count("mmcif-dictionary")) if (vm.count("mmcif-dictionary"))
cif::add_file_resource("mmcif_pdbx_v50.dic", vm["mmcif-dictionary"].as<std::string>()); cif::add_file_resource("mmcif_pdbx.dic", vm["mmcif-dictionary"].as<std::string>());
if (vm.count("dict")) // if (vm.count("dict"))
{ // {
for (auto dict: vm["dict"].as<std::vector<std::string>>()) // for (auto dict: vm["dict"].as<std::vector<std::string>>())
mmcif::CompoundFactory::instance().pushDictionary(dict); // mmcif::CompoundFactory::instance().pushDictionary(dict);
} // }
cif::file f(vm["xyzin"].as<std::string>()); cif::file f(vm["xyzin"].as<std::string>());
f.load_dictionary("mmcif_pdbx_v50");
if (not f.is_valid()) if (not f.is_valid())
{ {
std::cerr << "File not valid" << std::endl; std::cerr << "Could not validate file" << std::endl;
exit(1); exit(1);
} }
// mmcif::Structure structure(f, 1, mmcif::StructureOpenOptions::SkipHydrogen);
// -------------------------------------------------------------------- // --------------------------------------------------------------------
short pp_stretch = 3; short pp_stretch = 3;
...@@ -200,8 +195,7 @@ int d_main(int argc, const char* argv[]) ...@@ -200,8 +195,7 @@ int d_main(int argc, const char* argv[])
fmt = "cif"; fmt = "cif";
} }
dssp::DSSP dssp(f.front(), 1, pp_stretch, fmt == "dssp");
mmcif::DSSP dssp(f.front(), 1, pp_stretch, fmt == "dssp");
if (vm.count("output")) if (vm.count("output"))
{ {
...@@ -215,14 +209,14 @@ int d_main(int argc, const char* argv[]) ...@@ -215,14 +209,14 @@ int d_main(int argc, const char* argv[])
} }
if (fmt == "dssp") if (fmt == "dssp")
writeDSSP(f.front(), dssp, out); writeDSSP(dssp, out);
else else
annotateDSSP(f.front(), dssp, writeOther, out); annotateDSSP(f.front(), dssp, writeOther, out);
} }
else else
{ {
if (fmt == "dssp") if (fmt == "dssp")
writeDSSP(f.front(), dssp, std::cout); writeDSSP(dssp, std::cout);
else else
annotateDSSP(f.front(), dssp, writeOther, std::cout); annotateDSSP(f.front(), dssp, writeOther, std::cout);
} }
......
test/unit-test.cpp
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <stdexcept> #include <stdexcept>
#include <cif++/structure/DSSP.hpp> #include <cif++/dssp/DSSP.hpp>
#include "dssp.hpp" #include "dssp.hpp"
...@@ -43,15 +43,13 @@ BOOST_AUTO_TEST_CASE(ut_dssp) ...@@ -43,15 +43,13 @@ BOOST_AUTO_TEST_CASE(ut_dssp)
using namespace std::literals; using namespace std::literals;
cif::file f("1cbs.cif.gz"); cif::file f("1cbs.cif.gz");
f.load_dictionary("mmcif_pdbx_v50"); BOOST_ASSERT(f.is_valid());
BOOST_CHECK(f.is_valid());
// mmcif::Structure structure(f, 1, mmcif::StructureOpenOptions::SkipHydrogen);
mmcif::DSSP dssp(f.front(), 1, 3, true); dssp::DSSP dssp(f.front(), 1, 3, true);
std::stringstream test; std::stringstream test;
writeDSSP(f.front(), dssp, test); writeDSSP(dssp, test);
std::ifstream reference("1cbs.dssp"); std::ifstream reference("1cbs.dssp");
...@@ -91,19 +89,15 @@ BOOST_AUTO_TEST_CASE(ut_mmcif_2) ...@@ -91,19 +89,15 @@ BOOST_AUTO_TEST_CASE(ut_mmcif_2)
using namespace cif::literals; using namespace cif::literals;
cif::file f("1cbs.cif.gz"); cif::file f("1cbs.cif.gz");
f.load_dictionary("mmcif_pdbx_v50"); BOOST_ASSERT(f.is_valid());
BOOST_CHECK(f.is_valid());
// mmcif::Structure structure(f, 1, mmcif::StructureOpenOptions::SkipHydrogen); dssp::DSSP dssp(f.front(), 1, 3, true);
mmcif::DSSP dssp(f.front(), 1, 3, true);
std::stringstream test; std::stringstream test;
annotateDSSP(f.front(), dssp, true, test); annotateDSSP(f.front(), dssp, true, test);
cif::file rf("1cbs-dssp.cif"); cif::file rf("1cbs-dssp.cif");
// mmcif::Structure rs(rf, 1, mmcif::StructureOpenOptions::SkipHydrogen);
// structure.datablock()["software"].erase("name"_key == "dssp"); // structure.datablock()["software"].erase("name"_key == "dssp");
// rs.datablock()["software"].erase("name"_key == "dssp"); // rs.datablock()["software"].erase("name"_key == "dssp");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment