From ee9d4197c848607af8683fba586cb4a88fc599ca Mon Sep 17 00:00:00 2001 From: Pierre Alliez Date: Fri, 18 Jan 2008 08:45:15 +0000 Subject: [PATCH] PCA: examples now compile fine one Windows --- .gitattributes | 2 +- .../Principal_component_analysis.sln | 2 +- .../VC/barycenter.vcproj | 4 ++-- .../VC/bounding_box.vcproj | 4 ++-- .../VC/centroid.vcproj | 4 ++-- ...near_least_squares_fitting_circles_2.vcproj | 4 ++-- ...near_least_squares_fitting_cuboids_3.vcproj | 4 ++-- ...inear_least_squares_fitting_points_2.vcproj | 4 ++-- ...inear_least_squares_fitting_points_3.vcproj | 4 ++-- ...r_least_squares_fitting_rectangles_2.vcproj | 4 ++-- ...ear_least_squares_fitting_segments_2.vcproj | 4 ++-- ...ear_least_squares_fitting_segments_3.vcproj | 4 ++-- ...near_least_squares_fitting_spheres_3.vcproj | 4 ++-- ..._least_squares_fitting_tetrahedra_3.vcproj} | 10 +++++----- ...ar_least_squares_fitting_triangles_2.vcproj | 4 ++-- ...ar_least_squares_fitting_triangles_3.vcproj | 4 ++-- ...near_least_squares_fitting_tetrahedra_3.cpp | 18 +++++++++--------- .../linear_least_squares_fitting_triangles_2.h | 2 +- 18 files changed, 43 insertions(+), 43 deletions(-) rename Principal_component_analysis/examples/Principal_component_analysis/VC/{linear_least_squares_fitting_tetrahedrons_3.vcproj => linear_least_squares_fitting_tetrahedra_3.vcproj} (87%) diff --git a/.gitattributes b/.gitattributes index 73745cc5c7d..91fd958d885 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3040,7 +3040,7 @@ Principal_component_analysis/examples/Principal_component_analysis/VC/linear_lea Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_2.vcproj eol=crlf Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_3.vcproj eol=crlf Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_spheres_3.vcproj eol=crlf -Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedrons_3.vcproj eol=crlf +Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedra_3.vcproj eol=crlf Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_triangles_2.vcproj eol=crlf Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_triangles_3.vcproj eol=crlf Principal_component_analysis/examples/Principal_component_analysis/linear_least_squares_fitting_circles_2.cpp -text diff --git a/Principal_component_analysis/examples/Principal_component_analysis/Principal_component_analysis.sln b/Principal_component_analysis/examples/Principal_component_analysis/Principal_component_analysis.sln index f5ab0cf0780..347e3e424b9 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/Principal_component_analysis.sln +++ b/Principal_component_analysis/examples/Principal_component_analysis/Principal_component_analysis.sln @@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_least_squares_fittin EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_least_squares_fitting_spheres_3", "VC\linear_least_squares_fitting_spheres_3.vcproj", "{00000000-0000-0000-0000-000000003631}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_least_squares_fitting_tetrahedrons_3", "VC\linear_least_squares_fitting_tetrahedrons_3.vcproj", "{00000000-0000-0000-0000-000000015443}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_least_squares_fitting_tetrahedra_3", "VC\linear_least_squares_fitting_tetrahedra_3.vcproj", "{00000000-0000-0000-0000-000000015443}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_least_squares_fitting_triangles_2", "VC\linear_least_squares_fitting_triangles_2.vcproj", "{00000000-0000-0000-0000-000000027255}" EndProject diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/barycenter.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/barycenter.vcproj index a7f0687ae19..0a9e79f44a7 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/barycenter.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/barycenter.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/bounding_box.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/bounding_box.vcproj index 84c82e89e8e..0dfd44c63a9 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/bounding_box.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/bounding_box.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/centroid.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/centroid.vcproj index 0d71d2e9149..88ad3232133 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/centroid.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/centroid.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_circles_2.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_circles_2.vcproj index 673c0b1e32b..6399b3a6e77 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_circles_2.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_circles_2.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_cuboids_3.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_cuboids_3.vcproj index ef3756ebf8e..72b9cc1a128 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_cuboids_3.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_cuboids_3.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_2.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_2.vcproj index 78e25c0657e..934e5bfd65c 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_2.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_2.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_3.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_3.vcproj index dff7aed8079..31c1e2c9548 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_3.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_points_3.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_rectangles_2.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_rectangles_2.vcproj index eba7082f6cc..cb20dc1c262 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_rectangles_2.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_rectangles_2.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_2.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_2.vcproj index 38465a0d8a9..5710fa6234a 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_2.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_2.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_3.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_3.vcproj index e9ea7cf50f9..6c4e2484c81 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_3.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_segments_3.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_spheres_3.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_spheres_3.vcproj index 518914e16f2..acd001cace2 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_spheres_3.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_spheres_3.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -122,7 +122,7 @@ AdditionalOptions="/Zm900" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;NDEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" RuntimeLibrary="2" diff --git a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedrons_3.vcproj b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedra_3.vcproj similarity index 87% rename from Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedrons_3.vcproj rename to Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedra_3.vcproj index 7ed812d37b5..663419e6473 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedrons_3.vcproj +++ b/Principal_component_analysis/examples/Principal_component_analysis/VC/linear_least_squares_fitting_tetrahedra_3.vcproj @@ -2,7 +2,7 @@ @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm900" Optimization="0" - AdditionalIncludeDirectories="..\include;$(CGALROOT)\include\CGAL\config\msvc;$(CGALROOT)\include;$(CGALROOT)\auxiliary\gmp\include;$(CGALROOT)\auxiliary\TAUCS\include;$(BOOSTROOT)" + AdditionalIncludeDirectories="..\..\..\include;"$(CGALROOT)\include\CGAL\config\msvc";"$(CGALROOT)\include";"$(CGALROOT)\auxiliary\gmp\include";"$(CGALROOT)\auxiliary\TAUCS\include";"$(BOOSTROOT)"" PreprocessorDefinitions="WIN32;_DEBUG;_SECURE_SCL=0;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;CGAL_USE_GMP;CGAL_USE_TAUCS" MinimalRebuild="false" BasicRuntimeChecks="0" @@ -63,7 +63,7 @@ K; -typedef K::Line_3 Line_3; -typedef K::Plane_3 Plane_3; -typedef K::Point_3 Point_3; -typedef K::Tetrahedron_3 Tetrahedron_3; +typedef K::Line_3 Line; +typedef K::Plane_3 Plane; +typedef K::Point_3 Point; +typedef K::Tetrahedron_3 Tetrahedron; int main(void) { @@ -20,16 +20,16 @@ int main(void) Point d( 0.0,1.0,1.0); Point e( 0.0,0.0,0.0); - std::list tetrahedra; - tetrahedra.push_back(Tetrahedron_3(a,b,c,d)); - tetrahedra.push_back(Tetrahedron_3(a,b,c,e)); + std::list tetrahedra; + tetrahedra.push_back(Tetrahedron(a,b,c,d)); + tetrahedra.push_back(Tetrahedron(a,b,c,e)); // fit a line - Line_3 line; + Line line; linear_least_squares_fitting_3(tetrahedra.begin(),tetrahedra.end(),line,CGAL::PCA_dimension_3_tag()); // fit a plane - Plane_3 plane; + Plane plane; linear_least_squares_fitting_3(tetrahedra.begin(),tetrahedra.end(),plane,CGAL::PCA_dimension_3_tag()); return 0; diff --git a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h index 6e04b4223bb..f1a3542e1b7 100644 --- a/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h +++ b/Principal_component_analysis/include/CGAL/linear_least_squares_fitting_triangles_2.h @@ -169,7 +169,7 @@ linear_least_squares_fitting_2(InputIterator first, // precondition: at least one element in the container. CGAL_precondition(first != beyond); - std::list segments; + std::list segments; for(InputIterator it = first; it != beyond; it++)