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

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

View File

@@ -151,10 +151,16 @@ template<typename T> void TaniTest(T &arg){
FromDaylightString(v2,fps[j]);
double tani=TanimotoSimilarity(v1,v2);
TEST_ASSERT(feq(tani,dists[idx]));
tani = TverskySimilarity(v1,v2,1.,1.);
TEST_ASSERT(feq(tani,dists[idx]));
tani = SimilarityWrapper(v1,v2,TanimotoSimilarity<T,T>);
TEST_ASSERT(feq(tani,dists[idx]));
tani = SimilarityWrapper(v1,v2,1.,1.,TverskySimilarity<T,T>);
TEST_ASSERT(feq(tani,dists[idx]));
tani = SimilarityWrapper(v1,v2,TanimotoSimilarity<T,T>,true);
TEST_ASSERT(feq(tani,1.-dists[idx]));
tani = SimilarityWrapper(v1,v2,1.,1.,TverskySimilarity<T,T>,true);
TEST_ASSERT(feq(tani,1.-dists[idx]));
idx++;
}
}