From 21903277e7656e1b2ce35f702a27304df3f5a630 Mon Sep 17 00:00:00 2001
From: Valerio Mariani <valerio.mariani@unibas.ch>
Date: Tue, 1 May 2012 19:10:11 +0200
Subject: [PATCH] Fixed a couple of bugs in ldt
---
modules/mol/alg/src/ldt.cc | 2 +-
modules/mol/alg/src/local_dist_test.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/mol/alg/src/ldt.cc b/modules/mol/alg/src/ldt.cc
index ace3fca68..822b43898 100644
--- a/modules/mol/alg/src/ldt.cc
+++ b/modules/mol/alg/src/ldt.cc
@@ -234,7 +234,7 @@ int main (int argc, char **argv)
EntityView model2=model.Select("aname!=CEN,NV,OT1,OT,CAY,CY,OXT,1OCT,NT,OT2,2OCT,OVL1,OC1,O1,OC2,O2,OVU1");
EntityView v1=model2.Select("not (rname==GLY and aname==CB)");
boost::filesystem::path pathstring(files[i]);
- String filestring=pathstring.filename();
+ String filestring=pathstring.filename().string();
if (filestring.substr(5,5)=="TS257" || filestring.substr(5,5)=="TS458" ) {
for (AtomHandleIter ait=v1.GetHandle().AtomsBegin();ait!=v1.GetHandle().AtomsEnd();++ait){
AtomHandle aitv = *ait;
diff --git a/modules/mol/alg/src/local_dist_test.cc b/modules/mol/alg/src/local_dist_test.cc
index ecf9a61eb..83d842226 100644
--- a/modules/mol/alg/src/local_dist_test.cc
+++ b/modules/mol/alg/src/local_dist_test.cc
@@ -59,9 +59,9 @@ std::pair<bool,Real> within_tolerance(Real mdl_dist, const ReferenceDistance& re
Real difference = 0;
if (mdl_dist>=min && mdl_dist <=max) {
within_tol=true;
- } else if (mdl_dist < min && abs(min-mdl_dist) < tol) {
+ } else if (mdl_dist < min && std::abs(min-mdl_dist) < tol) {
within_tol = true;
- } else if (mdl_dist > max && abs(mdl_dist-max) < tol) {
+ } else if (mdl_dist > max && std::abs(mdl_dist-max) < tol) {
within_tol = true;
}
if (within_tol == false) {
--
GitLab