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

PCA: removed some warnings (used level 4 on MS .NET) 

I think some will remain due to other parts of CGAL
Next step will be to parameterize the test suite with several Kernels
This commit is contained in:
Pierre Alliez 2008-02-11 11:36:43 +00:00
parent d9cfa0a686
commit c56158d568
15 changed files with 63 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Principal_component_analysis/include/CGAL/PCA_util.h
View File

@ -56,7 +56,7 @@ assemble_covariance_matrix_3(InputIterator first,
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Point_3*, // used for indirection
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -91,9 +91,9 @@ assemble_covariance_matrix_3(InputIterator first,
InputIterator beyond,
typename K::FT covariance[6], // covariance matrix
const typename K::Point_3& c, // centroid
const K& k, // kernel
const K&, // kernel
const typename K::Triangle_3*,// used for indirection
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -169,7 +169,7 @@ assemble_covariance_matrix_3(InputIterator first,
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Iso_cuboid_3*,// used for indirection
const CGAL::PCA_dimension_3_tag& tag)
const CGAL::PCA_dimension_3_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -253,7 +253,7 @@ assemble_covariance_matrix_3(InputIterator first,
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Iso_cuboid_3*,// used for indirection
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -343,9 +343,9 @@ assemble_covariance_matrix_3(InputIterator first,
InputIterator beyond,
typename K::FT covariance[6], // covariance matrix
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Sphere_3*,// used for indirection
const CGAL::PCA_dimension_3_tag& tag)
const K&, // kernel
const typename K::Sphere_3*, // used for indirection
const CGAL::PCA_dimension_3_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -424,9 +424,9 @@ assemble_covariance_matrix_3(InputIterator first,
InputIterator beyond,
typename K::FT covariance[6], // covariance matrix
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Sphere_3*,// used for indirection
const CGAL::PCA_dimension_2_tag& tag)
const K&, // kernel
const typename K::Sphere_3*, // used for indirection
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -509,7 +509,7 @@ assemble_covariance_matrix_3(InputIterator first,
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Tetrahedron_3*,// used for indirection
const CGAL::PCA_dimension_3_tag& tag)
const CGAL::PCA_dimension_3_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;
@ -594,7 +594,7 @@ assemble_covariance_matrix_3(InputIterator first,
const typename K::Point_3& c, // centroid
const K& , // kernel
const typename K::Segment_3*,// used for indirection
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag&)
{
typedef typename K::FT FT;
typedef typename K::Point_3 Point;

69
Principal_component_analysis/include/CGAL/centroid.h
View File

@ -51,7 +51,7 @@ centroid(InputIterator begin,
InputIterator end,
const K&,
const typename K::Point_2*,
const CGAL::PCA_dimension_0_tag&)
const CGAL::PCA_dimension_0_tag&)
{
typedef typename K::Vector_2 Vector;
typedef typename K::FT FT;
@ -79,7 +79,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Segment_2*,
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag& tag)
{
typedef typename K::Point_2 Point;
typedef typename K::Segment_2 Segment;
@ -106,7 +106,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Segment_2*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_2 Vector;
@ -142,7 +142,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Triangle_2*,
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag&)
{
typedef typename K::Triangle_2 Triangle;
typedef typename K::Point_2 Point;
@ -171,7 +171,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Triangle_2*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag& tag)
{
typedef typename K::Triangle_2 Triangle;
typedef typename K::Segment_2 Segment;
@ -200,7 +200,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Triangle_2*,
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_2 Vector;
@ -236,7 +236,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Circle_2*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_2 Vector;
@ -269,7 +269,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Circle_2*,
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_2 Vector;
@ -305,7 +305,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Iso_rectangle_2*,
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag& tag)
{
typedef typename K::Iso_rectangle_2 Iso_rectangle;
typedef typename K::Point_2 Point;
@ -335,7 +335,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Iso_rectangle_2*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag& tag)
{
typedef typename K::Iso_rectangle_2 Iso_rectangle;
typedef typename K::Segment_2 Segment;
@ -365,7 +365,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Iso_rectangle_2*,
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_2 Vector;
@ -390,8 +390,6 @@ centroid(InputIterator begin,
return ORIGIN + v / sum_areas;
} // end centroid of a 2D rectangle set with 2D tag
//::::::::::: 3D Objects ::::::::::::::::::::::::::
// computes the centroid of a 3D point set
// takes an iterator range over K::Point_3
@ -403,7 +401,7 @@ centroid(InputIterator begin,
InputIterator end,
const K&,
const typename K::Point_3*,
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag&)
{
typedef typename K::Vector_3 Vector;
typedef typename K::FT FT;
@ -428,7 +426,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Segment_3*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -445,8 +443,9 @@ centroid(InputIterator begin,
{
const Segment& s = *it;
FT length = std::sqrt(s.squared_length());
// Point c = K().construct_midpoint_3_object()(s[0],s[1]);
Point c = Point((s[0][0] + s[1][0])/2.0, (s[0][1] + s[1][1])/2.0, (s[0][2] + s[1][2])/2.0);
Point c = CGAL::midpoint(s.source(),s.target());
// Point c = K().construct_midpoint_3_object()(s[0],s[1]);
//Point c = Point((s[0][0] + s[1][0])/2.0, (s[0][1] + s[1][1])/2.0, (s[0][2] + s[1][2])/2.0);
v = v + length * (c - ORIGIN);
sum_lengths += length;
}
@ -465,7 +464,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Triangle_3*,
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag& tag)
{
typedef typename K::Triangle_3 Triangle;
typedef typename K::Point_3 Point;
@ -494,7 +493,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Triangle_3*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag& tag)
{
typedef typename K::Triangle_3 Triangle;
typedef typename K::Segment_3 Segment;
@ -523,7 +522,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Triangle_3*,
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -559,7 +558,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Sphere_3*,
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -592,7 +591,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Sphere_3*,
const CGAL::PCA_dimension_3_tag& tag)
const CGAL::PCA_dimension_3_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -626,9 +625,9 @@ template < typename InputIterator,
typename K::Point_3
centroid(InputIterator begin,
InputIterator end,
const K& k,
const K& k,
const typename K::Iso_cuboid_3*,
const CGAL::PCA_dimension_0_tag& tag)
const CGAL::PCA_dimension_0_tag& tag)
{
typedef typename K::Iso_cuboid_3 Iso_cuboid;
typedef typename K::Point_3 Point;
@ -662,7 +661,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& k,
const typename K::Iso_cuboid_3*,
const CGAL::PCA_dimension_1_tag& tag)
const CGAL::PCA_dimension_1_tag& tag)
{
typedef typename K::Iso_cuboid_3 Iso_cuboid;
typedef typename K::Segment_3 Segment;
@ -700,7 +699,7 @@ centroid(InputIterator begin,
InputIterator end,
const K& ,
const typename K::Iso_cuboid_3*,
const CGAL::PCA_dimension_2_tag& tag)
const CGAL::PCA_dimension_2_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -731,9 +730,9 @@ template < typename InputIterator,
typename K::Point_3
centroid(InputIterator begin,
InputIterator end,
const K& ,
const K& ,
const typename K::Iso_cuboid_3*,
const CGAL::PCA_dimension_3_tag& tag)
const CGAL::PCA_dimension_3_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -764,9 +763,9 @@ template < typename InputIterator,
typename K::Point_3
centroid(InputIterator begin,
InputIterator end,
const K& ,
const K& ,
const typename K::Tetrahedron_3*,
const CGAL::PCA_dimension_3_tag& tag)
const CGAL::PCA_dimension_3_tag&)
{
typedef typename K::FT FT;
typedef typename K::Vector_3 Vector;
@ -797,7 +796,7 @@ centroid(InputIterator begin,
// takes an iterator range over kernel objects
template < typename InputIterator,
typename K,
typename tag >
typename tag >
inline
typename Point<Dimension<typename std::iterator_traits<InputIterator>::value_type, K>::value,
K
@ -805,10 +804,10 @@ typename Point<Dimension<typename std::iterator_traits<InputIterator>::value_typ
centroid(InputIterator begin,
InputIterator end,
const K& k,
const tag& t)
const tag& tag)
{
typedef typename std::iterator_traits<InputIterator>::value_type Value_type;
return CGALi::centroid(begin, end, k,(Value_type*) NULL, t);
return CGALi::centroid(begin, end, k,(Value_type*) NULL, tag);
}
// this one takes an iterator range over kernel objects
@ -819,11 +818,11 @@ typename Point<Dimension<
typename std::iterator_traits<InputIterator>::value_type,
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::value,
typename Kernel_traits<typename std::iterator_traits<InputIterator>::value_type>::Kernel >::type
centroid(InputIterator begin, InputIterator end, const tag& t)
centroid(InputIterator begin, InputIterator end, const tag& tag)
{
typedef typename std::iterator_traits<InputIterator>::value_type Point;
typedef typename Kernel_traits<Point>::Kernel K;
return CGAL::centroid(begin, end, K(), t);
return CGAL::centroid(begin, end, K(), tag);
}
CGAL_END_NAMESPACE

2
Principal_component_analysis/test/Principal_component_analysis/VC/bounding_box.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_circles_2.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_cuboids_3.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_points_2.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_points_3.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_rectangles_2.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_segments_2.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_segments_3.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

3
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_spheres_3.vcproj
View File

@ -4,6 +4,7 @@
Version="8,00"
Name="linear_least_squares_fitting_spheres_3"
ProjectGUID="{00000000-0000-0000-0000-000000029165}"
RootNamespace="linear_least_squares_fitting_spheres_3"
Keyword="ManagedCProj"
>
<Platforms>
@ -127,7 +128,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

5
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedra_3.vcproj
View File

@ -4,6 +4,7 @@
Version="8,00"
Name="linear_least_squares_fitting_tetrahedra_3"
ProjectGUID="{00000000-0000-0000-0000-000000008209}"
RootNamespace="linear_least_squares_fitting_tetrahedra_3"
Keyword="ManagedCProj"
>
<Platforms>
@ -48,7 +49,7 @@
BasicRuntimeChecks="0"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
DebugInformationFormat="3"
/>
<Tool
@ -127,7 +128,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

3
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_triangles_2.vcproj
View File

@ -4,6 +4,7 @@
Version="8,00"
Name="linear_least_squares_fitting_triangles_2"
ProjectGUID="{00000000-0000-0000-0000-000000009659}"
RootNamespace="linear_least_squares_fitting_triangles_2"
Keyword="ManagedCProj"
>
<Platforms>
@ -127,7 +128,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

2
Principal_component_analysis/test/Principal_component_analysis/VC/linear_least_squares_fitting_triangles_3.vcproj
View File

@ -127,7 +127,7 @@
MinimalRebuild="false"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
WarningLevel="2"
WarningLevel="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"

1
Principal_component_analysis/test/Principal_component_analysis/linear_least_squares_fitting_rectangles_2.cpp
View File

@ -117,7 +117,6 @@ void test_3()
Iso_rectangles1.push_back(Iso_rectangle_2(Point_2(1.6,15.2),Point_2(11.6,17.2)));
Iso_rectangles1.push_back(Iso_rectangle_2(Point_2(1.6,17.2),Point_2(11.6,19.2)));
std::cout << "fit 2D line to two small rectangles...";
Kernel k1;
Line_2 line1;
Point_2 centroid1;
FT quality1;