ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/math/ConvexHull.hpp
(Generate patch)

Comparing trunk/src/math/ConvexHull.hpp (file contents):
Revision 1137 by chuckv, Tue May 29 22:50:14 2007 UTC vs.
Revision 1277 by gezelter, Mon Jul 14 12:35:58 2008 UTC

# Line 40 | Line 40
40   *
41   *  ConvexHull.hpp
42   *
43 < *  Purpose: To calculate convexhull, hull volume and radius
44 < *  using the CGAL library.
43 > *  Purpose: To calculate convexhull, hull volume using the QuickHull algorithm provided by QHull.
44   *
45   *  Created by Charles F. Vardeman II on 11 Dec 2006.
46   *  @author  Charles F. Vardeman II
47 < *  @version $Id: ConvexHull.hpp,v 1.2 2007-05-29 22:50:14 chuckv Exp $
47 > *  @version $Id: ConvexHull.hpp,v 1.9 2008-07-14 12:35:57 gezelter Exp $
48   *
49   */
50  
# Line 53 | Line 52
52   #define MATH_CONVEXHULL_HPP_
53  
54   #include "math/Vector3.hpp"
55 + #include "config.h"
56  
57   #include <cassert>
58   #include <vector>
59   #include <string>
60   extern "C"
61   {
62 + #if defined(HAVE_QHULL)
63   #include <qhull/qhull.h>
64   #include <qhull/mem.h>
65   #include <qhull/qset.h>
# Line 67 | Line 68 | extern "C"
68   #include <qhull/poly.h>
69   #include <qhull/io.h>
70   #include <qhull/stat.h>
71 + #endif
72   }
73  
74  
75  
76 < namespace oopse
77 <  {
78 <
79 <  class ConvexHull
80 <    {
81 <
82 <    public:
83 <      ConvexHull();
84 <      ~ConvexHull();
85 <      bool genHull(std::vector<Vector3d> pos);
86 <      std::vector<Vector3d> getHull();
87 <      RealType getVolume();
88 <      RealType getRadius();
89 <      RealType getInscribedRadius();
90 <      void geomviewHull(const std::string& geomFileName);
91 <    private:
92 <                
93 <                double volume_;
92 <
93 <    }
94 <  ;
95 <
96 <
76 > namespace oopse {
77 >  class ConvexHull {
78 >  public:
79 >    ConvexHull();
80 >    virtual ~ConvexHull() {}
81 >    bool genHull(std::vector<Vector3d> pos);
82 >    //std::vector<Vector3d> getHull();
83 >    RealType getVolume();
84 >    //RealType getRadius();
85 >    // RealType getInscribedRadius();
86 >    void geomviewHull(const std::string& geomFileName);
87 >  protected:
88 >    double volume_;
89 >    double area_;
90 >    int dim_;
91 >    const std::string options_;
92 >    
93 >  };
94   }
95  
99
96   #endif /*MATH_CONVEXHULL_HPP_*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines