pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-03 21:44:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switches to URANGE_CHECK when appropriate

Browse Source
This commit is contained in:
Brian Kelley
2015-10-18 21:14:02 -04:00
parent cb25da4384
commit fb84c9f0b7
36 changed files with 162 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Code/Catalogs/Catalog.h
View File

@@ -338,8 +338,8 @@ namespace RDCatalog {
*/
void addEdge(unsigned int id1, unsigned int id2) {
unsigned int nents = getNumEntries();
RANGE_CHECK(0, id1, nents-1);
RANGE_CHECK(0, id2, nents-1);
URANGE_CHECK(id1, nents-1);
URANGE_CHECK(id2, nents-1);
// FIX: if we boost::setS for the edgeList BGL will
// do the checking for duplicity (parallel edges)
// But for reasons unknown setS results in compile
@@ -357,7 +357,7 @@ namespace RDCatalog {
//------------------------------------
//! returns a pointer to our entry with a particular index
const entryType *getEntryWithIdx(unsigned int idx) const {
RANGE_CHECK(0,idx,getNumEntries()-1);
URANGE_CHECK(idx,getNumEntries()-1);
int vd = boost::vertex(idx, d_graph);
typename boost::property_map < CatalogGraph, vertex_entry_t>::const_type
pMap = boost::get(vertex_entry_t(), d_graph);
@@ -367,7 +367,7 @@ namespace RDCatalog {
//------------------------------------
//! returns a pointer to our entry with a particular bit ID
const entryType *getEntryWithBitId(unsigned int idx) const {
RANGE_CHECK(0,idx,this->getFPLength()-1);
URANGE_CHECK(idx,this->getFPLength()-1);
typename boost::property_map < CatalogGraph, vertex_entry_t>::const_type
pMap = boost::get(vertex_entry_t(), d_graph);
const entryType *res=NULL;
@@ -384,7 +384,7 @@ namespace RDCatalog {
//------------------------------------
//! returns the index of the entry with a particular bit ID
int getIdOfEntryWithBitId(unsigned int idx) const {
RANGE_CHECK(0,idx,this->getFPLength()-1);
URANGE_CHECK(idx,this->getFPLength()-1);
typename boost::property_map < CatalogGraph, vertex_entry_t>::const_type
pMap = boost::get(vertex_entry_t(), d_graph);
int res=-1;