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 1140 by chuckv, Tue May 29 22:50:14 2007 UTC vs.
Revision 1141 by chuckv, Wed May 30 18:47:04 2007 UTC

# Line 45 | Line 45
45   *
46   *  Created by Charles F. Vardeman II on 11 Dec 2006.
47   *  @author  Charles F. Vardeman II
48 < *  @version $Id: ConvexHull.hpp,v 1.2 2007-05-29 22:50:14 chuckv Exp $
48 > *  @version $Id: ConvexHull.hpp,v 1.3 2007-05-30 18:47:04 chuckv Exp $
49   *
50   */
51  
# Line 59 | Line 59 | extern "C"
59   #include <string>
60   extern "C"
61   {
62 < #include <qhull/qhull.h>
63 < #include <qhull/mem.h>
64 < #include <qhull/qset.h>
65 < #include <qhull/geom.h>
66 < #include <qhull/merge.h>
67 < #include <qhull/poly.h>
68 < #include <qhull/io.h>
69 < #include <qhull/stat.h>
62 > #include "QuickHull/qhull.h"
63 > #include "QuickHull/mem.h"
64 > #include "QuickHull/qset.h"
65 > #include "QuickHull/geom.h"
66 > #include "QuickHull/merge.h"
67 > #include "QuickHull/poly.h"
68 > #include "QuickHull/io.h"
69 > #include "QuickHull/stat.h"
70   }
71  
72  
73  
74 < namespace oopse
75 <  {
76 <
77 <  class ConvexHull
78 <    {
79 <
80 <    public:
81 <      ConvexHull();
82 <      ~ConvexHull();
83 <      bool genHull(std::vector<Vector3d> pos);
84 <      std::vector<Vector3d> getHull();
85 <      RealType getVolume();
86 <      RealType getRadius();
87 <      RealType getInscribedRadius();
88 <      void geomviewHull(const std::string& geomFileName);
89 <    private:
90 <                
91 <                double volume_;
92 <
93 <    }
94 <  ;
95 <
96 <
74 > namespace oopse {
75 >  class ConvexHull {
76 >  public:
77 >    ConvexHull();
78 >    virtual ~ConvexHull() {}
79 >    bool genHull(std::vector<Vector3d> pos);
80 >    //std::vector<Vector3d> getHull();
81 >    RealType getVolume();
82 >    //RealType getRadius();
83 >    // RealType getInscribedRadius();
84 >    void geomviewHull(const std::string& geomFileName);
85 >  protected:
86 >    double volume_;
87 >    double area_;
88 >    int dim_;
89 >    const std::string options_;
90 >    
91 >  };
92   }
93  
99
94   #endif /*MATH_CONVEXHULL_HPP_*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines