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 1374 by chuckv, Tue Oct 20 20:05:28 2009 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 2006 The University of Notre Dame. All Rights Reserved.
1 > /* Copyright (c) 2008, 2009 The University of Notre Dame. All Rights Reserved.
2   *
3   * The University of Notre Dame grants you ("Licensee") a
4   * non-exclusive, royalty free, license to use, modify and
# 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.1 2006-12-14 19:32:32 chuckv Exp $
47 > *  @version $Id: ConvexHull.hpp,v 1.18 2009-10-20 20:05:28 chuckv Exp $
48   *
49   */
50  
# Line 53 | Line 52
52   #define MATH_CONVEXHULL_HPP_
53  
54   #include "math/Vector3.hpp"
55 < #include <CGAL/Homogeneous.h>
56 < #include <CGAL/Convex_hull_traits_3.h>
57 < #include <CGAL/Convex_hull_3.h>
55 > #include "config.h"
56 > #include "math/Hull.hpp"
57 > #include "math/Triangle.hpp"
58  
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>
59   #include <cassert>
60   #include <vector>
61 + #include <string>
62  
63  
64 + namespace oopse {
65 +  class ConvexHull : public Hull {
66 +  public:
67  
68 < typedef CGAL::MP_Float RT;
69 < typedef CGAL::Homogeneous<RT>                     K;
71 < typedef CGAL::Convex_hull_traits_3<K>             Traits;
72 < typedef Traits::Polyhedron_3                      Polyhedron_3;
73 < typedef K::Point_3                                Point_3;
74 < typedef K::Segment_3                              Segment_3;
75 < typedef Polyhedron_3::Facet_iterator                   Facet_iterator;
76 < typedef Polyhedron_3::Halfedge_around_facet_circulator Halfedge_facet_circulator;
68 >    ConvexHull();    
69 >    virtual ~ConvexHull(){};
70  
71 +    void computeHull( std::vector<StuntDouble*> bodydoubles );
72  
73 < namespace oopse
74 <  {
73 >    /* Total area of Hull*/
74 >    RealType getArea(){return area_;}
75  
76 <  class ConvexHull
77 <    {
76 >    /* Total Volume enclosed by Hull */
77 >    RealType getVolume(){ return volume_; }
78  
79 <    public:
80 <      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:
79 >    std::vector<Triangle> getMesh(){return Triangles_;}
80 >    void printHull(const std::string& geomFileName);
81  
82 <      CGAL::Object  ch_object;
83 <      Polyhedron_3  ch_polyhedron;
84 <
85 <    }
86 <  ;
87 <
88 <
82 >  protected:
83 >    RealType volume_;
84 >    RealType area_;
85 >    int dim_;
86 >    const std::string options_;
87 >    
88 >  private:
89 >    std::vector<Triangle> Triangles_;
90 >  };
91   }
104
105
92   #endif /*MATH_CONVEXHULL_HPP_*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines