From 8e2365e9ad89276938cfa88008bf4bd09c4ba0ba Mon Sep 17 00:00:00 2001
From: Gareth Tribello <gt@eider.phy.qub.ac.uk>
Date: Thu, 23 Feb 2017 10:15:34 +0000
Subject: [PATCH] Fixed travis.ci errors
---
src/analysis/ReadAnalysisFrames.cpp | 3 ++-
src/dimred/SketchMapRead.cpp | 6 +++---
src/mapping/Mapping.cpp | 2 +-
src/mapping/PropertyMap.cpp | 2 +-
src/tools/PDB.cpp | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/analysis/ReadAnalysisFrames.cpp b/src/analysis/ReadAnalysisFrames.cpp
index f747dfcc1..43ea1d855 100644
--- a/src/analysis/ReadAnalysisFrames.cpp
+++ b/src/analysis/ReadAnalysisFrames.cpp
@@ -50,7 +50,8 @@ void ReadAnalysisFrames::registerKeywords( Keywords& keys ){
ReadAnalysisFrames::ReadAnalysisFrames( const ActionOptions& ao ):
Action(ao),
AnalysisBase(ao),
-clearonnextstep(false)
+clearonnextstep(false),
+weights_calculated(false)
{
parse("CLEAR",clearstride);
if( clearstride!=0 ) log.printf(" clearing stored data every %d steps\n");
diff --git a/src/dimred/SketchMapRead.cpp b/src/dimred/SketchMapRead.cpp
index d049075a2..57c3a2e47 100644
--- a/src/dimred/SketchMapRead.cpp
+++ b/src/dimred/SketchMapRead.cpp
@@ -106,7 +106,7 @@ SketchMapBase(ao)
// Break if we are done
if( !do_read ) break ;
// Check for required properties
- for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();it++){
+ for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();++it){
if( !inpdb.getArgumentValue( it->first, prop ) ) error("pdb input does not have contain property named " + it->first );
it->second.push_back(prop);
}
@@ -131,7 +131,7 @@ SketchMapBase(ao)
requestAtoms( atoms ); std::vector<Value*> req_args; std::vector<std::string> fargs;
for(unsigned i=0;i<args.size();++i){
bool found=false;
- for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();it++){
+ for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();++it){
if( args[i]==it->first ){ found=true; break; }
}
if( !found ){ fargs.push_back( args[i] ); }
@@ -144,7 +144,7 @@ SketchMapBase(ao)
void SketchMapRead::minimise( Matrix<double>& projections ){
unsigned j=0;
- for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();it++){
+ for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();++it){
for(unsigned i=0;i<myframes.size();++i) projections(i,j) = it->second[i];
j++;
}
diff --git a/src/mapping/Mapping.cpp b/src/mapping/Mapping.cpp
index b3e89a364..93e9d5f95 100644
--- a/src/mapping/Mapping.cpp
+++ b/src/mapping/Mapping.cpp
@@ -81,7 +81,7 @@ ActionWithVessel(ao)
// Check for required properties
if( !ispath ){
double prop;
- for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();it++){
+ for(std::map<std::string,std::vector<double> >::iterator it=property.begin(); it!=property.end();++it){
if( !mypdb.getArgumentValue( it->first, prop ) ) error("pdb input does not have contain property named " + it->first );
it->second.push_back(prop);
}
diff --git a/src/mapping/PropertyMap.cpp b/src/mapping/PropertyMap.cpp
index a805865c3..de22d4739 100644
--- a/src/mapping/PropertyMap.cpp
+++ b/src/mapping/PropertyMap.cpp
@@ -70,7 +70,7 @@ PathBase(ao)
std::string empty;
if(!nos){
- for(std::map<std::string,std::vector<double> >::iterator it=property.begin();it!=property.end();it++){
+ for(std::map<std::string,std::vector<double> >::iterator it=property.begin();it!=property.end();++it){
empty="LABEL="+it->first; addVessel( "SPATH", empty, 0 );
}
}
diff --git a/src/tools/PDB.cpp b/src/tools/PDB.cpp
index f1bbee649..1855a23fa 100644
--- a/src/tools/PDB.cpp
+++ b/src/tools/PDB.cpp
@@ -388,7 +388,7 @@ void PDB::print( const double& lunits, SetupMolInfo* mymoldat, OFile& ofile, con
plumed_assert( psign!=std::string::npos );
descr2="%s=%-" + fmt.substr(psign+1) + " ";
}
- for(std::map<std::string,double>::iterator it=arg_data.begin(); it!=arg_data.end();it++) ofile.printf( descr2.c_str(),it->first.c_str(), it->second );
+ for(std::map<std::string,double>::iterator it=arg_data.begin(); it!=arg_data.end();++it) ofile.printf( descr2.c_str(),it->first.c_str(), it->second );
if( argnames.size()>0 ) ofile.printf("\n");
if( !mymoldat ){
for(unsigned i=0;i<positions.size();++i){
--
GitLab