diff --git a/Code/GraphMol/FileParsers/testGeneralFileReader.cpp b/Code/GraphMol/FileParsers/testGeneralFileReader.cpp index 225b91627..cfe299373 100644 --- a/Code/GraphMol/FileParsers/testGeneralFileReader.cpp +++ b/Code/GraphMol/FileParsers/testGeneralFileReader.cpp @@ -182,7 +182,7 @@ void testMae() { TEST_ASSERT(nmol->hasProp("s_m_entry_name")); TEST_ASSERT(nmol->getProp("s_m_entry_name") == "NCI_aids_few.1"); TEST_ASSERT(nmol->hasProp("r_f3d_dummy")); - TEST_ASSERT(abs(nmol->getProp("r_f3d_dummy") - 42.123) < 0.0001); + TEST_ASSERT(std::abs(nmol->getProp("r_f3d_dummy") - 42.123) < 0.0001); //! Test atom properties TEST_ASSERT(nmol->getNumAtoms() == 19); @@ -204,7 +204,7 @@ void testMae() { //! The real property is only defined for i >= 10 if (i >= 10) { TEST_ASSERT(atom->hasProp("r_f3d_dummy")); - TEST_ASSERT(abs(atom->getProp("r_f3d_dummy") - (19.1 - i)) < + TEST_ASSERT(std::abs(atom->getProp("r_f3d_dummy") - (19.1 - i)) < 0.0001); } else { TEST_ASSERT(!atom->hasProp("r_f3d_dummy")); diff --git a/External/GA/ga/LinkedPopLinearSel.h b/External/GA/ga/LinkedPopLinearSel.h index 6c938bc75..1aeb8da98 100644 --- a/External/GA/ga/LinkedPopLinearSel.h +++ b/External/GA/ga/LinkedPopLinearSel.h @@ -138,7 +138,7 @@ LinkedPopLinearSel::LinkedPopLinearSel( << " predictTotalScaledFitness " << predictTotalScaledFitness; #endif - assert(abs(totalScaledFitness - predictTotalScaledFitness) < 1.0e-5); + assert(std::abs(totalScaledFitness - predictTotalScaledFitness) < 1.0e-5); double predictEndFitness = SELECT_START + (popsize - 1.0) * scaledFitnessStep; (void)predictEndFitness; // suppress warnings when building with @@ -147,7 +147,7 @@ LinkedPopLinearSel::LinkedPopLinearSel( REPORT(Reporter::TRACE) << "endFitness " << endFitness << " predictEndFitness " << predictEndFitness; #endif - assert(abs(endFitness - predictEndFitness) < 1.0e-10); + assert(std::abs(endFitness - predictEndFitness) < 1.0e-10); freeChromosomes.reserve(10); } @@ -206,7 +206,7 @@ LinkedPopLinearSel::selectParent() { ++iterator; } // may get here because of numeric errors - assert(abs(sum - totalScaledFitness) < (0.000001 * scaledFitnessStep)); + assert(std::abs(sum - totalScaledFitness) < (0.000001 * scaledFitnessStep)); iterator = population.end(); --iterator; return iterator->second;