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

initial version of Tversky similarity (feature request 2015633) along with a bit of refactoring

Browse Source 
http://sourceforge.net/tracker/index.php?func=detail&aid=2015633&group_id=160139&atid=814653
This commit is contained in:
Greg Landrum
2008-07-11 11:13:03 +00:00
parent 34e773367e
commit ba8454586b
5 changed files with 178 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Code/DataStructs/BitOps.cpp
View File

@@ -1,6 +1,6 @@
// $Id$
//
// Copyright (C) 2003-2006 greg Landrum and Rational Discovery LLC
// Copyright (C) 2003-2008 greg Landrum and Rational Discovery LLC
//
// @@ All Rights Reserved @@
//
@@ -213,6 +213,25 @@ TanimotoSimilarity(const T1& bv1,
}
template <typename T1, typename T2>
const double
TverskySimilarity(const T1& bv1,
const T2& bv2,
double a,
double b)
{
RANGE_CHECK(0,a,1);
RANGE_CHECK(0,b,1);
if(bv1.GetNumBits()!=bv2.GetNumBits())
throw ValueErrorException("BitVects must be same length");
double x = NumOnBitsInCommon(bv1,bv2);
double y = bv1.GetNumOnBits();
double z = bv2.GetNumOnBits();
double denom = a*y + b*z + (1-a-b)*x;
if(denom==0.0) return 1.0;
else return x / denom;
}
template <typename T1, typename T2>
const double
CosineSimilarity(const T1& bv1,
@@ -615,6 +634,7 @@ BitVectToText(const T1& bv1){
template const double TanimotoSimilarity(const SparseBitVect& bv1,const SparseBitVect& bv2);
template const double TverskySimilarity(const SparseBitVect& bv1,const SparseBitVect& bv2,double a, double b);
template const double CosineSimilarity(const SparseBitVect& bv1,const SparseBitVect& bv2);
template const double KulczynskiSimilarity(const SparseBitVect& bv1,const SparseBitVect& bv2);
template const double DiceSimilarity(const SparseBitVect& bv1,const SparseBitVect& bv2);
@@ -633,6 +653,7 @@ template DoubleVect OnBitProjSimilarity(const SparseBitVect& bv1,const SparseBit
template DoubleVect OffBitProjSimilarity(const SparseBitVect& bv1,const SparseBitVect& bv2);
template const double TanimotoSimilarity(const ExplicitBitVect& bv1,const ExplicitBitVect& bv2);
template const double TverskySimilarity(const ExplicitBitVect& bv1,const ExplicitBitVect& bv2,double a, double b);
template const double CosineSimilarity(const ExplicitBitVect& bv1,const ExplicitBitVect& bv2);
template const double KulczynskiSimilarity(const ExplicitBitVect& bv1,const ExplicitBitVect& bv2);
template const double DiceSimilarity(const ExplicitBitVect& bv1,const ExplicitBitVect& bv2);