mirror of https://github.com/CGAL/cgal
change some internal files names
This commit is contained in:
parent
1d4d6d99ac
commit
c46b43fa08
|
|
@ -3917,8 +3917,8 @@ Triangulation/include/CGAL/Pure_complex_simplex.h -text
|
||||||
Triangulation/include/CGAL/Pure_complex_vertex.h -text
|
Triangulation/include/CGAL/Pure_complex_vertex.h -text
|
||||||
Triangulation/include/CGAL/Regular_complex.h -text
|
Triangulation/include/CGAL/Regular_complex.h -text
|
||||||
Triangulation/include/CGAL/internal/Combination_enumerator.h -text
|
Triangulation/include/CGAL/internal/Combination_enumerator.h -text
|
||||||
Triangulation/include/CGAL/internal/Pure_complex/Dummy_PCDS.h -text
|
Triangulation/include/CGAL/internal/Pure_complex/Dummy_TDS.h -text
|
||||||
Triangulation/include/CGAL/internal/Pure_complex/Pure_complex_ds_iterators.h -text
|
Triangulation/include/CGAL/internal/Pure_complex/Triangulation_ds_iterators.h -text
|
||||||
Triangulation/include/CGAL/internal/Pure_complex/utilities.h -text
|
Triangulation/include/CGAL/internal/Pure_complex/utilities.h -text
|
||||||
Triangulation/include/CGAL/internal/Static_or_dynamic_array.h -text
|
Triangulation/include/CGAL/internal/Static_or_dynamic_array.h -text
|
||||||
Triangulation/package_info/Pure_complex/description.txt -text
|
Triangulation/package_info/Pure_complex/description.txt -text
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
#include <CGAL/Pure_complex_ds_simplex.h>
|
#include <CGAL/Pure_complex_ds_simplex.h>
|
||||||
#include <CGAL/internal/Combination_enumerator.h>
|
#include <CGAL/internal/Combination_enumerator.h>
|
||||||
#include <CGAL/internal/Pure_complex/utilities.h>
|
#include <CGAL/internal/Pure_complex/utilities.h>
|
||||||
#include <CGAL/internal/Pure_complex/Pure_complex_ds_iterators.h>
|
#include <CGAL/internal/Pure_complex/Triangulation_ds_iterators.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include <CGAL/PCDS_simplex_default_storage_policy.h>
|
#include <CGAL/PCDS_simplex_default_storage_policy.h>
|
||||||
#include <CGAL/PCDS_simplex_mirror_storage_policy.h>
|
#include <CGAL/PCDS_simplex_mirror_storage_policy.h>
|
||||||
#include <CGAL/internal/Pure_complex/Dummy_PCDS.h>
|
#include <CGAL/internal/Pure_complex/Dummy_TDS.h>
|
||||||
#include <CGAL/Dimension.h>
|
#include <CGAL/Dimension.h>
|
||||||
#include <CGAL/Default.h>
|
#include <CGAL/Default.h>
|
||||||
#include <CGAL/array.h>
|
#include <CGAL/array.h>
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
//#include <CGAL/basic.h>
|
//#include <CGAL/basic.h>
|
||||||
//#include <CGAL/Iterator_project.h>
|
//#include <CGAL/Iterator_project.h>
|
||||||
#include <CGAL/Compact_container.h>
|
#include <CGAL/Compact_container.h>
|
||||||
#include <CGAL/internal/Pure_complex/Dummy_PCDS.h>
|
#include <CGAL/internal/Pure_complex/Dummy_TDS.h>
|
||||||
|
|
||||||
namespace CGAL {
|
namespace CGAL {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -132,6 +132,6 @@ public:
|
||||||
|
|
||||||
} // end of namespace internal
|
} // end of namespace internal
|
||||||
|
|
||||||
} //namespace CGAL
|
} // end of namespace CGAL
|
||||||
|
|
||||||
#endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H
|
#endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H
|
||||||
|
|
|
||||||
|
|
@ -109,6 +109,6 @@ struct S_or_D_array< Containee, Dynamic_dimension_tag, true >
|
||||||
|
|
||||||
} // end of namespace internal
|
} // end of namespace internal
|
||||||
|
|
||||||
} //namespace CGAL
|
} // end of namespace CGAL
|
||||||
|
|
||||||
#endif // CGAL_INTERNAL_STATIC_OR_DYNAMIC_ARRAY_H
|
#endif // CGAL_INTERNAL_STATIC_OR_DYNAMIC_ARRAY_H
|
||||||
|
|
|
||||||
|
|
@ -6,22 +6,22 @@
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
template<typename PCDS>
|
template<typename TDS>
|
||||||
void test(const int d, const string & type)
|
void test(const int d, const string & type)
|
||||||
{
|
{
|
||||||
// we must write 'typename' below, because we are in a template-function,
|
// we must write 'typename' below, because we are in a template-function,
|
||||||
// so the parser has no way to know that PCDS contains sub-types, before
|
// so the parser has no way to know that TDS contains sub-types, before
|
||||||
// instanciating the function.
|
// instanciating the function.
|
||||||
typedef typename PCDS::Vertex Vertex;
|
typedef typename TDS::Vertex Vertex;
|
||||||
typedef typename PCDS::Vertex_handle Vertex_handle;
|
typedef typename TDS::Vertex_handle Vertex_handle;
|
||||||
typedef typename PCDS::Vertex_iterator Vertex_iterator;
|
typedef typename TDS::Vertex_iterator Vertex_iterator;
|
||||||
typedef typename PCDS::Simplex Simplex;
|
typedef typename TDS::Simplex Simplex;
|
||||||
typedef typename PCDS::Simplex_handle Simplex_handle;
|
typedef typename TDS::Simplex_handle Simplex_handle;
|
||||||
typedef typename PCDS::Face Face;
|
typedef typename TDS::Face Face;
|
||||||
typedef typename PCDS::Facet Facet;
|
typedef typename TDS::Facet Facet;
|
||||||
typedef typename PCDS::Facet_iterator Facet_iterator;
|
typedef typename TDS::Facet_iterator Facet_iterator;
|
||||||
|
|
||||||
PCDS pc(d);
|
TDS pc(d);
|
||||||
cerr << "\nChecking Pure_cds of (" << type << ") dimension "
|
cerr << "\nChecking Pure_cds of (" << type << ") dimension "
|
||||||
<< pc.ambient_dimension();
|
<< pc.ambient_dimension();
|
||||||
assert(pc.empty());
|
assert(pc.empty());
|
||||||
|
|
@ -104,7 +104,7 @@ void test(const int d, const string & type)
|
||||||
std::ifstream fi((string("output-pcds-")+type).c_str());
|
std::ifstream fi((string("output-pcds-")+type).c_str());
|
||||||
if( d % 2 )
|
if( d % 2 )
|
||||||
CGAL::set_binary_mode(fi);
|
CGAL::set_binary_mode(fi);
|
||||||
PCDS input_pcds(d);
|
TDS input_pcds(d);
|
||||||
fi >> input_pcds;
|
fi >> input_pcds;
|
||||||
fi.close();
|
fi.close();
|
||||||
|
|
||||||
|
|
@ -116,20 +116,20 @@ void test(const int d, const string & type)
|
||||||
}
|
}
|
||||||
|
|
||||||
#define test_static(DIM) { \
|
#define test_static(DIM) { \
|
||||||
typedef CGAL::Pure_complex_data_structure<CGAL::Dimension_tag<DIM> > PCDS; \
|
typedef CGAL::Pure_complex_data_structure<CGAL::Dimension_tag<DIM> > TDS; \
|
||||||
test<PCDS>(DIM, string("static")+string(#DIM)); }
|
test<TDS>(DIM, string("static")+string(#DIM)); }
|
||||||
#define test_dyn(DIM) { \
|
#define test_dyn(DIM) { \
|
||||||
typedef CGAL::Pure_complex_data_structure<CGAL::Dynamic_dimension_tag> PCDS; \
|
typedef CGAL::Pure_complex_data_structure<CGAL::Dynamic_dimension_tag> TDS; \
|
||||||
test<PCDS>(DIM, string("dynamic")+string(#DIM)) ;}
|
test<TDS>(DIM, string("dynamic")+string(#DIM)) ;}
|
||||||
|
|
||||||
#define test_mirror_static(DIM) { \
|
#define test_mirror_static(DIM) { \
|
||||||
typedef CGAL::Pure_complex_ds_simplex<void, CGAL::PCDS_simplex_mirror_storage_policy> My_ds_simplex; \
|
typedef CGAL::Pure_complex_ds_simplex<void, CGAL::TDS_simplex_mirror_storage_policy> My_ds_simplex; \
|
||||||
typedef CGAL::Pure_complex_data_structure<CGAL::Dimension_tag<DIM>, \
|
typedef CGAL::Pure_complex_data_structure<CGAL::Dimension_tag<DIM>, \
|
||||||
CGAL::Pure_complex_ds_vertex<>, \
|
CGAL::Pure_complex_ds_vertex<>, \
|
||||||
My_ds_simplex> My_pcds; \
|
My_ds_simplex> My_pcds; \
|
||||||
test<My_pcds>(DIM, string("mirror&static")+string(#DIM)); }
|
test<My_pcds>(DIM, string("mirror&static")+string(#DIM)); }
|
||||||
#define test_mirror_dyn(DIM) { \
|
#define test_mirror_dyn(DIM) { \
|
||||||
typedef CGAL::Pure_complex_ds_simplex<void, CGAL::PCDS_simplex_mirror_storage_policy> My_ds_simplex; \
|
typedef CGAL::Pure_complex_ds_simplex<void, CGAL::TDS_simplex_mirror_storage_policy> My_ds_simplex; \
|
||||||
typedef CGAL::Pure_complex_data_structure<CGAL::Dynamic_dimension_tag, \
|
typedef CGAL::Pure_complex_data_structure<CGAL::Dynamic_dimension_tag, \
|
||||||
CGAL::Pure_complex_ds_vertex<>, \
|
CGAL::Pure_complex_ds_vertex<>, \
|
||||||
My_ds_simplex> My_pcds; \
|
My_ds_simplex> My_pcds; \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue