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

update some tests to ensure success on 32bit systems

Browse Source
This commit is contained in:
Greg Landrum
2015-05-01 16:04:17 +02:00
parent 3e1b3b8a31
commit 7e5c37e685
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Code/Numerics/Optimizer/BFGSOpt.h
View File

@@ -89,7 +89,7 @@ namespace BFGSOpt {
lambda = 1.0;
unsigned int it = 0;
while(it < MAX_ITER_LINEAR_SEARCH){
//std::cout << "\t" << lambda << " " << lambdaMin << std::endl;
//std::cerr << "\t" << it<<" : "<<lambda << " " << lambdaMin << std::endl;
if(lambda<lambdaMin){
// the position change is too small
resCode=1;
@@ -138,6 +138,7 @@ namespace BFGSOpt {
++it;
}
// nothing was done
//std::cerr<<" RETURN AT END: "<<it<<" "<<resCode<<std::endl;
for(unsigned int i=0;i<dim;i++){
newPt[i]=oldPt[i];
}
@@ -226,6 +227,7 @@ namespace BFGSOpt {
if(temp>test) test=temp;
dGrad[i] = grad[i];
}
//std::cerr<<" iter: "<<iter<<" "<<fp<<" "<<test<<" "<<TOLX<<std::endl;
if(test<TOLX) {
CLEANUP();
return 0;
@@ -243,6 +245,7 @@ namespace BFGSOpt {
dGrad[i] = grad[i]-dGrad[i];
}
test /= term;
//std::cerr<<" "<<gradScale<<" "<<test<<" "<<gradTol<<std::endl;
if(test<gradTol){
CLEANUP();
return 0;