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

merge changes from QuerySerialization_6March2008 branch, revs 555:563, into the trunk;

Browse Source
This commit is contained in:
Greg Landrum
2008-03-12 06:11:39 +00:00
parent 84eac2ec33
commit 9c7f33a5c8
16 changed files with 978 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Query/EqualityQuery.h
View File

@@ -75,8 +75,6 @@ namespace Queries {
};
protected:
MatchFuncArgType d_val;
MatchFuncArgType d_tol;
};

18
Code/Query/RangeQuery.h
View File

@@ -27,18 +27,18 @@ namespace Queries {
this->df_negate = false;
};
//! construct and set the lower and upper bounds
RangeQuery(DataFuncArgType lower,DataFuncArgType upper) : d_upper(upper), d_lower(lower), d_tol(0), df_upperOpen(true), df_lowerOpen(true){
RangeQuery(MatchFuncArgType lower,MatchFuncArgType upper) : d_upper(upper), d_lower(lower), d_tol(0), df_upperOpen(true), df_lowerOpen(true){
this->df_negate = false;
};
//! sets our upper bound
void setUpper (DataFuncArgType what) { this->d_upper = what; };
void setUpper (MatchFuncArgType what) { this->d_upper = what; };
//! returns our upper bound
const DataFuncArgType getUpper() const { return this->d_upper; };
const MatchFuncArgType getUpper() const { return this->d_upper; };
//! sets our lower bound
void setLower (DataFuncArgType what) { this->d_lower = what; };
void setLower (MatchFuncArgType what) { this->d_lower = what; };
//! returns our lower bound
const DataFuncArgType getLower() const { return this->d_lower; };
const MatchFuncArgType getLower() const { return this->d_lower; };
//! sets whether or not the ends of the range are open
void setEndsOpen(bool lower, bool upper) {
@@ -51,9 +51,9 @@ namespace Queries {
};
//! sets our tolerance
void setTol(DataFuncArgType what) { this->d_tol = what; };
void setTol(MatchFuncArgType what) { this->d_tol = what; };
//! returns our tolerance
const DataFuncArgType getTol() const { return this->d_tol; };
const MatchFuncArgType getTol() const { return this->d_tol; };
bool Match(const DataFuncArgType what) const {
MatchFuncArgType mfArg = TypeConvert(what,Int2Type<needsConversion>());
@@ -85,8 +85,8 @@ namespace Queries {
};
protected:
DataFuncArgType d_upper,d_lower;
DataFuncArgType d_tol;
MatchFuncArgType d_upper,d_lower;
MatchFuncArgType d_tol;
bool df_upperOpen,df_lowerOpen;
};