songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change some internal files names

This commit is contained in:
Samuel Hornus 2011-05-10 12:33:19 +00:00
parent 1d4d6d99ac
commit c46b43fa08
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -3917,8 +3917,8 @@ Triangulation/include/CGAL/Pure_complex_simplex.h -text
Triangulation/include/CGAL/Pure_complex_vertex.h -text
Triangulation/include/CGAL/Regular_complex.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/Pure_complex_ds_iterators.h -text
Triangulation/include/CGAL/internal/Pure_complex/Dummy_TDS.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/Static_or_dynamic_array.h -text
Triangulation/package_info/Pure_complex/description.txt -text

2
Triangulation/include/CGAL/Pure_complex_data_structure.h
View File

@ -28,7 +28,7 @@
#include <CGAL/Pure_complex_ds_simplex.h>
#include <CGAL/internal/Combination_enumerator.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 <vector>

2
Triangulation/include/CGAL/Pure_complex_ds_simplex.h
View File

@ -20,7 +20,7 @@
#include <CGAL/PCDS_simplex_default_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/Default.h>
#include <CGAL/array.h>

2
Triangulation/include/CGAL/Pure_complex_ds_vertex.h
View File

@ -21,7 +21,7 @@
//#include <CGAL/basic.h>
//#include <CGAL/Iterator_project.h>
#include <CGAL/Compact_container.h>
#include <CGAL/internal/Pure_complex/Dummy_PCDS.h>
#include <CGAL/internal/Pure_complex/Dummy_TDS.h>
namespace CGAL {

4
Triangulation/include/CGAL/internal/Combination_enumerator.h
View File

@ -132,6 +132,6 @@ public:
} // end of namespace internal
} //namespace CGAL
} // end of namespace CGAL
#endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H
#endif // CGAL_INTERNAL_COMBINATION_ENUMERATOR_H

0
Triangulation/include/CGAL/internal/Pure_complex/Dummy_PCDS.h → Triangulation/include/CGAL/internal/Pure_complex/Dummy_TDS.h
View File

0
Triangulation/include/CGAL/internal/Pure_complex/Pure_complex_ds_iterators.h → Triangulation/include/CGAL/internal/Pure_complex/Triangulation_ds_iterators.h
View File

2
Triangulation/include/CGAL/internal/Static_or_dynamic_array.h
View File

@ -109,6 +109,6 @@ struct S_or_D_array< Containee, Dynamic_dimension_tag, true >
} // end of namespace internal
} //namespace CGAL
} // end of namespace CGAL
#endif // CGAL_INTERNAL_STATIC_OR_DYNAMIC_ARRAY_H

36
Triangulation/test/Triangulation/tds.cpp
View File

@ -6,22 +6,22 @@
using namespace std;
template<typename PCDS>
template<typename TDS>
void test(const int d, const string & type)
{
// 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.
typedef typename PCDS::Vertex Vertex;
typedef typename PCDS::Vertex_handle Vertex_handle;
typedef typename PCDS::Vertex_iterator Vertex_iterator;
typedef typename PCDS::Simplex Simplex;
typedef typename PCDS::Simplex_handle Simplex_handle;
typedef typename PCDS::Face Face;
typedef typename PCDS::Facet Facet;
typedef typename PCDS::Facet_iterator Facet_iterator;
typedef typename TDS::Vertex Vertex;
typedef typename TDS::Vertex_handle Vertex_handle;
typedef typename TDS::Vertex_iterator Vertex_iterator;
typedef typename TDS::Simplex Simplex;
typedef typename TDS::Simplex_handle Simplex_handle;
typedef typename TDS::Face Face;
typedef typename TDS::Facet Facet;
typedef typename TDS::Facet_iterator Facet_iterator;
PCDS pc(d);
TDS pc(d);
cerr << "\nChecking Pure_cds of (" << type << ") dimension "
<< pc.ambient_dimension();
assert(pc.empty());
@ -104,7 +104,7 @@ void test(const int d, const string & type)
std::ifstream fi((string("output-pcds-")+type).c_str());
if( d % 2 )
CGAL::set_binary_mode(fi);
PCDS input_pcds(d);
TDS input_pcds(d);
fi >> input_pcds;
fi.close();
@ -116,20 +116,20 @@ void test(const int d, const string & type)
}
#define test_static(DIM) { \
typedef CGAL::Pure_complex_data_structure<CGAL::Dimension_tag<DIM> > PCDS; \
test<PCDS>(DIM, string("static")+string(#DIM)); }
typedef CGAL::Pure_complex_data_structure<CGAL::Dimension_tag<DIM> > TDS; \
test<TDS>(DIM, string("static")+string(#DIM)); }
#define test_dyn(DIM) { \
typedef CGAL::Pure_complex_data_structure<CGAL::Dynamic_dimension_tag> PCDS; \
test<PCDS>(DIM, string("dynamic")+string(#DIM)) ;}
typedef CGAL::Pure_complex_data_structure<CGAL::Dynamic_dimension_tag> TDS; \
test<TDS>(DIM, string("dynamic")+string(#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>, \
CGAL::Pure_complex_ds_vertex<>, \
My_ds_simplex> My_pcds; \
test<My_pcds>(DIM, string("mirror&static")+string(#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, \
CGAL::Pure_complex_ds_vertex<>, \
My_ds_simplex> My_pcds; \