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

- switch to boost::shared_array

Browse Source
This commit is contained in:
Paolo Tosco
2016-04-25 21:53:04 +01:00
parent 605ff9264c
commit 3f4c6ec9ff
5 changed files with 22 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
#include <cstring>
#include <vector>
#include <algorithm>
#include <boost/shared_ptr.hpp>
#include <boost/shared_array.hpp>
namespace BFGSOpt {
const double FUNCTOL =
@@ -246,7 +246,7 @@ int minimize(unsigned int dim, double *pos, double gradTol,
// "<<TOLX<<std::endl;
if (test < TOLX) {
if (traj && trajEverySteps) {
RDGeom::Snapshot *s = new RDGeom::Snapshot(newPos, fp);
RDGeom::Snapshot *s = new RDGeom::Snapshot(boost::shared_array<double>(newPos), fp);
traj->addSnapshot(s);
newPos = NULL;
}
@@ -270,7 +270,7 @@ int minimize(unsigned int dim, double *pos, double gradTol,
// "<<gradTol<<std::endl;
if (test < gradTol) {
if (traj && trajEverySteps) {
RDGeom::Snapshot *s = new RDGeom::Snapshot(newPos, fp);
RDGeom::Snapshot *s = new RDGeom::Snapshot(boost::shared_array<double>(newPos), fp);
traj->addSnapshot(s);
newPos = NULL;
}
@@ -349,7 +349,7 @@ int minimize(unsigned int dim, double *pos, double gradTol,
#endif
}
if (traj && trajEverySteps && !(iter % trajEverySteps)) {
RDGeom::Snapshot *s = new RDGeom::Snapshot(newPos, fp);
RDGeom::Snapshot *s = new RDGeom::Snapshot(boost::shared_array<double>(newPos), fp);
traj->addSnapshot(s);
newPos = new double[dim];
}