pub_soft/rdkit
3
0
Fork 0
mirror of https://github.com/rdkit/rdkit.git synced 2026-06-04 21:54:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix sf.net bug 2071168

Browse Source
This commit is contained in:
Greg Landrum
2008-08-24 09:24:44 +00:00
parent 4b25ac1cef
commit 0aa4cbbe10
2 changed files with 137 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
Code/Geometry/point.cpp
View File

@@ -7,120 +7,9 @@
#include "point.h"
//#include <Numerics/Vector.h>
std::ostream & operator<<(std::ostream& target, const RDGeom::Point &pt){
for (unsigned int di = 0; di < pt.dimension(); ++di) {
target << pt[di] << " ";
}
return target;
}
RDGeom::Point3D operator+ (const RDGeom::Point3D& p1, const RDGeom::Point3D& p2) {
RDGeom::Point3D res;
res.x = p1.x + p2.x;
res.y = p1.y + p2.y;
res.z = p1.z + p2.z;
return res;
}
RDGeom::Point3D operator- (const RDGeom::Point3D& p1, const RDGeom::Point3D& p2) {
RDGeom::Point3D res;
res.x = p1.x - p2.x;
res.y = p1.y - p2.y;
res.z = p1.z - p2.z;
return res;
}
RDGeom::Point3D operator* (const RDGeom::Point3D& p1, const double v) {
RDGeom::Point3D res;
res.x = p1.x * v;
res.y = p1.y * v;
res.z = p1.z * v;
return res;
}
RDGeom::Point3D operator/ (const RDGeom::Point3D& p1, const double v) {
RDGeom::Point3D res;
res.x = p1.x / v;
res.y = p1.y / v;
res.z = p1.z / v;
return res;
}
RDGeom::Point2D operator+ (const RDGeom::Point2D& p1, const RDGeom::Point2D& p2) {
RDGeom::Point2D res;
res.x = p1.x + p2.x;
res.y = p1.y + p2.y;
return res;
}
RDGeom::Point2D operator- (const RDGeom::Point2D& p1, const RDGeom::Point2D& p2) {
RDGeom::Point2D res;
res.x = p1.x - p2.x;
res.y = p1.y - p2.y;
return res;
}
RDGeom::Point2D operator* (const RDGeom::Point2D& p1, const double v) {
RDGeom::Point2D res;
res.x = p1.x * v;
res.y = p1.y * v;
return res;
}
RDGeom::Point2D operator/ (const RDGeom::Point2D& p1, const double v) {
RDGeom::Point2D res;
res.x = p1.x / v;
res.y = p1.y / v;
return res;
}
RDGeom::PointND operator+ (const RDGeom::PointND& p1, const RDGeom::PointND& p2) {
unsigned int dim;
if(p1.dimension()<p2.dimension()) {
dim=p1.dimension();
} else {
dim=p1.dimension();
}
RDGeom::PointND res(dim);
for(unsigned int i=0;i<dim;++i){
res[i] = p1[i]+p2[i];
}
return res;
}
RDGeom::PointND operator- (const RDGeom::PointND& p1, const RDGeom::PointND& p2) {
unsigned int dim;
if(p1.dimension()<p2.dimension()) {
dim=p1.dimension();
} else {
dim=p1.dimension();
}
RDGeom::PointND res(dim);
for(unsigned int i=0;i<dim;++i){
res[i] = p1[i]-p2[i];
}
return res;
}
RDGeom::PointND operator* (const RDGeom::PointND& p1, const double v) {
RDGeom::PointND res(p1.dimension());
for(unsigned int i=0;i<p1.dimension();++i){
res[i] = p1[i]*v;
}
return res;
}
RDGeom::PointND operator/ (const RDGeom::PointND& p1, const double v) {
RDGeom::PointND res(p1.dimension());
for(unsigned int i=0;i<p1.dimension();++i){
res[i] = p1[i]/v;
}
return res;
}
namespace RDGeom {
double computeDihedralAngle(Point3D pt1, Point3D pt2, Point3D pt3, Point3D pt4) {
double computeDihedralAngle(const Point3D &pt1, const Point3D &pt2,
const Point3D &pt3, const Point3D &pt4) {
Point3D begEndVec = pt3 - pt2;
Point3D begNbrVec = pt1 - pt2;
Point3D crs1 = begNbrVec.crossProduct(begEndVec);
@@ -132,5 +21,121 @@ namespace RDGeom {
double ang = crs1.angleTo(crs2);
return ang;
}
std::ostream & operator<<(std::ostream& target, const Point &pt){
for (unsigned int di = 0; di < pt.dimension(); ++di) {
target << pt[di] << " ";
}
return target;
}
Point3D operator+ (const Point3D& p1, const Point3D& p2) {
Point3D res;
res.x = p1.x + p2.x;
res.y = p1.y + p2.y;
res.z = p1.z + p2.z;
return res;
}
Point3D operator- (const Point3D& p1, const Point3D& p2) {
Point3D res;
res.x = p1.x - p2.x;
res.y = p1.y - p2.y;
res.z = p1.z - p2.z;
return res;
}
Point3D operator* (const Point3D& p1, double v) {
Point3D res;
res.x = p1.x * v;
res.y = p1.y * v;
res.z = p1.z * v;
return res;
}
Point3D operator/ (const Point3D& p1, double v) {
Point3D res;
res.x = p1.x / v;
res.y = p1.y / v;
res.z = p1.z / v;
return res;
}
Point2D operator+ (const Point2D& p1, const Point2D& p2) {
Point2D res;
res.x = p1.x + p2.x;
res.y = p1.y + p2.y;
return res;
}
Point2D operator- (const Point2D& p1, const Point2D& p2) {
Point2D res;
res.x = p1.x - p2.x;
res.y = p1.y - p2.y;
return res;
}
Point2D operator* (const Point2D& p1, double v) {
Point2D res;
res.x = p1.x * v;
res.y = p1.y * v;
return res;
}
Point2D operator/ (const Point2D& p1, double v) {
Point2D res;
res.x = p1.x / v;
res.y = p1.y / v;
return res;
}
PointND operator+ (const PointND& p1, const PointND& p2) {
unsigned int dim;
if(p1.dimension()<p2.dimension()) {
dim=p1.dimension();
} else {
dim=p1.dimension();
}
PointND res(dim);
for(unsigned int i=0;i<dim;++i){
res[i] = p1[i]+p2[i];
}
return res;
}
PointND operator- (const PointND& p1, const PointND& p2) {
unsigned int dim;
if(p1.dimension()<p2.dimension()) {
dim=p1.dimension();
} else {
dim=p1.dimension();
}
PointND res(dim);
for(unsigned int i=0;i<dim;++i){
res[i] = p1[i]-p2[i];
}
return res;
}
PointND operator* (const PointND& p1, double v) {
PointND res(p1.dimension());
for(unsigned int i=0;i<p1.dimension();++i){
res[i] = p1[i]*v;
}
return res;
}
PointND operator/ (const PointND& p1, double v) {
PointND res(p1.dimension());
for(unsigned int i=0;i<p1.dimension();++i){
res[i] = p1[i]/v;
}
return res;
}
}

49
Code/Geometry/point.h
View File

@@ -21,31 +21,6 @@
#include <Numerics/Vector.h>
#include <boost/smart_ptr.hpp>
namespace RDGeom {
class Point3D;
class Point2D;
class Point;
class PointND;
}
std::ostream & operator<<(std::ostream& target, const RDGeom::Point &pt);
RDGeom::Point3D operator+ (const RDGeom::Point3D& p1, const RDGeom::Point3D& p2);
RDGeom::Point3D operator- (const RDGeom::Point3D& p1, const RDGeom::Point3D& p2);
RDGeom::Point3D operator* (const RDGeom::Point3D& p1, const double v);
RDGeom::Point3D operator/ (const RDGeom::Point3D& p1, const double v);
RDGeom::Point2D operator+ (const RDGeom::Point2D& p1, const RDGeom::Point2D& p2);
RDGeom::Point2D operator- (const RDGeom::Point2D& p1, const RDGeom::Point2D& p2);
RDGeom::Point2D operator* (const RDGeom::Point2D& p1, const double v);
RDGeom::Point2D operator/ (const RDGeom::Point2D& p1, const double v);
RDGeom::PointND operator+ (const RDGeom::PointND& p1, const RDGeom::PointND& p2);
RDGeom::PointND operator- (const RDGeom::PointND& p1, const RDGeom::PointND& p2);
RDGeom::PointND operator* (const RDGeom::PointND& p1, const double v);
RDGeom::PointND operator/ (const RDGeom::PointND& p1, const double v);
namespace RDGeom {
@@ -255,7 +230,7 @@ namespace RDGeom {
}
double l=res.length();
POSTCONDITION(l>0.0,"zero perpendicular");
res = res/l;
res /= l;
return res;
}
};
@@ -264,7 +239,8 @@ namespace RDGeom {
// plane of the first three points (pt1, pt2, pt3) and the plane of the
// last three points (pt2, pt3, pt4)
// the computed angle is between 0 and PI
double computeDihedralAngle(Point3D pt1, Point3D pt2, Point3D pt3, Point3D pt4);
double computeDihedralAngle(const Point3D &pt1, const Point3D &pt2,
const Point3D &pt3, const Point3D &pt4);
class Point2D : public Point {
public:
@@ -531,9 +507,22 @@ namespace RDGeom {
typedef INT_POINT2D_MAP::iterator INT_POINT2D_MAP_I;
typedef INT_POINT2D_MAP::const_iterator INT_POINT2D_MAP_CI;
std::ostream & operator<<(std::ostream& target, const RDGeom::Point &pt);
RDGeom::Point3D operator+ (const RDGeom::Point3D& p1, const RDGeom::Point3D& p2);
RDGeom::Point3D operator- (const RDGeom::Point3D& p1, const RDGeom::Point3D& p2);
RDGeom::Point3D operator* (const RDGeom::Point3D& p1, double v);
RDGeom::Point3D operator/ (const RDGeom::Point3D& p1, double v);
RDGeom::Point2D operator+ (const RDGeom::Point2D& p1, const RDGeom::Point2D& p2);
RDGeom::Point2D operator- (const RDGeom::Point2D& p1, const RDGeom::Point2D& p2);
RDGeom::Point2D operator* (const RDGeom::Point2D& p1, double v);
RDGeom::Point2D operator/ (const RDGeom::Point2D& p1, double v);
RDGeom::PointND operator+ (const RDGeom::PointND& p1, const RDGeom::PointND& p2);
RDGeom::PointND operator- (const RDGeom::PointND& p1, const RDGeom::PointND& p2);
RDGeom::PointND operator* (const RDGeom::PointND& p1, double v);
RDGeom::PointND operator/ (const RDGeom::PointND& p1, double v);
}
#endif