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 1097 by chuckv, Thu Dec 14 19:32:32 2006 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.1 2006-12-14 19:32:32 chuckv Exp $
48 > *  @version $Id: ConvexHull.hpp,v 1.3 2007-05-30 18:47:04 chuckv Exp $
49   *
50   */
51  
# Line 53 | Line 53
53   #define MATH_CONVEXHULL_HPP_
54  
55   #include "math/Vector3.hpp"
56 – #include <CGAL/Homogeneous.h>
57 – #include <CGAL/Convex_hull_traits_3.h>
58 – #include <CGAL/Convex_hull_3.h>
56  
60 – #include <CGAL/Polyhedron_3.h>
61 – #include <CGAL/copy_n.h>
62 – #include <CGAL/IO/Geomview_stream.h>
63 – #include <CGAL/IO/Polyhedron_geomview_ostream.h>
57   #include <cassert>
58   #include <vector>
59 + #include <string>
60 + extern "C"
61 + {
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 < typedef CGAL::MP_Float RT;
75 < typedef CGAL::Homogeneous<RT>                     K;
76 < typedef CGAL::Convex_hull_traits_3<K>             Traits;
77 < typedef Traits::Polyhedron_3                      Polyhedron_3;
78 < typedef K::Point_3                                Point_3;
79 < typedef K::Segment_3                              Segment_3;
80 < typedef Polyhedron_3::Facet_iterator                   Facet_iterator;
81 < typedef Polyhedron_3::Halfedge_around_facet_circulator Halfedge_facet_circulator;
82 <
83 <
84 < namespace oopse
85 <  {
86 <
87 <  class ConvexHull
88 <    {
89 <
90 <    public:
91 <      ConvexHull();
87 <      ~ConvexHull();
88 <      bool genHull(std::vector<Vector3d> pos);
89 <      std::vector<Vector3d> getHull();
90 <      RealType getVolume();
91 <      RealType getRadius();
92 <      RealType getInscribedRadius();
93 <      void geomviewHull(const std::string& geomFileName);
94 <    private:
95 <
96 <      CGAL::Object  ch_object;
97 <      Polyhedron_3  ch_polyhedron;
98 <
99 <    }
100 <  ;
101 <
102 <
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  
105 –
94   #endif /*MATH_CONVEXHULL_HPP_*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines