Skip to content

Commit

Permalink
rename class
Browse files Browse the repository at this point in the history
  • Loading branch information
aboudev committed Jul 2, 2017
1 parent 9a049a6 commit 95c8bb6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
Expand Up @@ -12,7 +12,7 @@
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/centroid.h>

#include <CGAL/internal/Surface_mesh_approximation/VSA_segmentation.h>
#include <CGAL/internal/Surface_mesh_approximation/VSA.h>

#include "ColorCheatSheet.h"

Expand Down Expand Up @@ -146,7 +146,7 @@ void Scene::VSA_incremental(const std::size_t num_proxies, const std::size_t num
typedef boost::property_map<Polyhedron, boost::vertex_point_t>::type PointPropertyMap;
PointPropertyMap ppmap = get(boost::vertex_point, const_cast<Polyhedron &>(*m_pPolyhedron));

CGAL::internal::VSA_segmentation<Polyhedron, Kernel, PointPropertyMap> vsa_seg(*m_pPolyhedron, ppmap, Kernel());
CGAL::internal::VSA<Polyhedron, Kernel, PointPropertyMap> vsa_seg(*m_pPolyhedron, ppmap, Kernel());
vsa_seg.partition_incre(num_proxies, num_iterations, m_fidx_pmap);

m_px_num = num_proxies;
Expand Down
Expand Up @@ -7,7 +7,7 @@

#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/property_map.h>
#include <CGAL/internal/Surface_mesh_approximation/VSA_segmentation.h>
#include <CGAL/internal/Surface_mesh_approximation/VSA.h>
#include "types.h"

class Scene
Expand All @@ -16,7 +16,7 @@ class Scene
// types
typedef CGAL::Bbox_3 Bbox;
typedef boost::property_map<Polyhedron, boost::vertex_point_t>::type PointPropertyMap;
typedef CGAL::internal::VSA_segmentation<Polyhedron, Kernel, PointPropertyMap> VSA;
typedef CGAL::internal::VSA<Polyhedron, Kernel, PointPropertyMap> VSA;
typedef VSA::Anchor Anchor;

public:
Expand Down
@@ -1,5 +1,5 @@
#ifndef CGAL_VSA_SEGMENTATION_H
#define CGAL_VSA_SEGMENTATION_H
#ifndef CGAL_VSA_H
#define CGAL_VSA_H

#include <CGAL/boost/graph/helpers.h>
#include <CGAL/Kernel/global_functions.h>
Expand All @@ -26,18 +26,18 @@ namespace CGAL
namespace internal
{
/**
* @brief Main entry point for VSA mesh segmentation algorithm.
* @brief Main entry point for VSA mesh approximation algorithm.
*
* blah blah...
*
* @tparam Polyhedron a CGAL polyhedron
* @tparam GeomTraits a model of SegmentationGeomTraits
* @tparam GeomTraits a model of ApproximationGeomTraits
*/
template <typename Polyhedron,
typename GeomTraits,
//typename FacetSegmentMap,
typename VertexPointPmap>
class VSA_segmentation
class VSA
{
private:
typedef typename GeomTraits::FT FT;
Expand Down Expand Up @@ -190,7 +190,7 @@ template <typename Polyhedron,
* @pre @a polyhedron.is_pure_triangle()
* @param mesh `CGAL Polyhedron` on which other functions operate.
*/
VSA_segmentation(const Polyhedron &_mesh,
VSA(const Polyhedron &_mesh,
VertexPointPmap _vertex_point_map,
GeomTraits _traits)
: mesh(_mesh),
Expand Down Expand Up @@ -918,10 +918,10 @@ template <typename Polyhedron,
vertex_descriptor vtx = target(he, mesh);
attach_anchor(vtx, px_set);
}
}; // end class VSA_segmentation
}; // end class VSA
} // end namespace internal
} // end namespace CGAL

#undef CGAL_NOT_TAGGED_ID

#endif // CGAL_VSA_SEGMENTATION_H
#endif // CGAL_VSA_H

0 comments on commit 95c8bb6

Please sign in to comment.