[Boost-commit] svn:boost r70859 - in trunk/libs/geometry: doc test/arithmetic test/extensions test/extensions/arithmetic

Subject: [Boost-commit] svn:boost r70859 - in trunk/libs/geometry: doc test/arithmetic test/extensions test/extensions/arithmetic
From: barend.gehrels_at_[hidden]
Date: 2011-04-02 12:32:00

Author: barendgehrels
Date: 2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
New Revision: 70859
URL: http://svn.boost.org/trac/boost/changeset/70859

Log:
Moved cross_product to extensions/arithmetic
Added:
   trunk/libs/geometry/test/extensions/arithmetic/
   trunk/libs/geometry/test/extensions/arithmetic/Jamfile.v2   (contents, props changed)
   trunk/libs/geometry/test/extensions/arithmetic/arithmetic_tests.sln   (contents, props changed)
   trunk/libs/geometry/test/extensions/arithmetic/cross_product.cpp
      - copied, changed from r70779, /trunk/libs/geometry/test/arithmetic/cross_product.cpp
   trunk/libs/geometry/test/extensions/arithmetic/cross_product.vcproj
      - copied unchanged from r70779, /trunk/libs/geometry/test/arithmetic/cross_product.vcproj
Removed:
   trunk/libs/geometry/test/arithmetic/cross_product.cpp
   trunk/libs/geometry/test/arithmetic/cross_product.vcproj
Text files modified: 
   trunk/libs/geometry/doc/quickref.xml                             |     1 -                                       
   trunk/libs/geometry/test/arithmetic/Jamfile.v2                   |     9 +--------                               
   trunk/libs/geometry/test/arithmetic/arithmetic_tests.sln         |     6 ------                                  
   trunk/libs/geometry/test/extensions/Jamfile.v2                   |     1 +                                       
   trunk/libs/geometry/test/extensions/arithmetic/cross_product.cpp |     2 +-                                      
   5 files changed, 3 insertions(+), 16 deletions(-)

Modified: trunk/libs/geometry/doc/quickref.xml
==============================================================================
--- trunk/libs/geometry/doc/quickref.xml	(original)
+++ trunk/libs/geometry/doc/quickref.xml	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -574,7 +574,6 @@
    <entry valign="center" namest="a" nameend="d">
     <bridgehead renderas="sect3">Products</bridgehead>
     <simplelist type="vert" columns="1">
-     <member><link linkend="geometry.reference.arithmetic.cross_product">cross_product</link></member>
      <member><link linkend="geometry.reference.arithmetic.dot_product">dot_product</link></member>
     </simplelist>
    </entry>

Modified: trunk/libs/geometry/test/arithmetic/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/arithmetic/Jamfile.v2	(original)
+++ trunk/libs/geometry/test/arithmetic/Jamfile.v2	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -6,15 +6,8 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-test-suite ggl-arithmetic
+test-suite boost-geometry-arithmetic
     :
     [ run arithmetic.cpp ]
-    [ run cross_product.cpp ]
-    [ compile-fail cross_product.cpp
-        : # requirements
-        <define>TEST_FAIL_CROSS_PRODUCT
-        : # target name
-        cross_product_compile_fail
-    ]
     [ run dot_product.cpp ]
     ;

Modified: trunk/libs/geometry/test/arithmetic/arithmetic_tests.sln
==============================================================================
--- trunk/libs/geometry/test/arithmetic/arithmetic_tests.sln	(original)
+++ trunk/libs/geometry/test/arithmetic/arithmetic_tests.sln	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -4,8 +4,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot_product", "dot_product.vcproj", "{C9CD2A98-3327-4560-A979-4BF506F777A8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_product", "cross_product.vcproj", "{C2CD2F98-3327-4560-A979-4BF506F777A8}"
-EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
@@ -20,10 +18,6 @@
                 {C9CD2A98-3327-4560-A979-4BF506F777A8}.Debug|Win32.Build.0 = Debug|Win32
                 {C9CD2A98-3327-4560-A979-4BF506F777A8}.Release|Win32.ActiveCfg = Release|Win32
                 {C9CD2A98-3327-4560-A979-4BF506F777A8}.Release|Win32.Build.0 = Release|Win32
-		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Debug|Win32.Build.0 = Debug|Win32
-		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Release|Win32.ActiveCfg = Release|Win32
-		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE

Deleted: trunk/libs/geometry/test/arithmetic/cross_product.cpp
==============================================================================
--- trunk/libs/geometry/test/arithmetic/cross_product.cpp	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
+++ (empty file)
@@ -1,79 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) test file
-//
-// Copyright (c) 2009 Mateusz Loskot, (mateusz_at_[hidden])
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-
-#include <geometry_test_common.hpp>
-
-#include <boost/geometry/arithmetic/cross_product.hpp>
-
-#include <boost/geometry/algorithms/assign.hpp>
-
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/adapted/c_array_cartesian.hpp>
-#include <boost/geometry/geometries/adapted/tuple_cartesian.hpp>
-#include <test_common/test_point.hpp>
-
-
-template <typename P>
-void test_2d()
-{
-    P p1;
-    bg::assign(p1, 20, 30);
-    P p2;
-    bg::assign(p2, 45, 70);
-    P c = bg::cross_product(p1, p2);
-
-    typedef typename bg::coordinate_type<P>::type scalar_type;
-    BOOST_CHECK_EQUAL(bg::get<0>(c), scalar_type(50));
-}
-
-template <typename P>
-void test_3d()
-{
-    P p1;
-    bg::assign(p1, 20, 30, 10);
-    P p2;
-    bg::assign(p2, 45, 70, 20);
-    P c = bg::cross_product(p1, p2);
-
-    typedef typename bg::coordinate_type<P>::type scalar_type;
-    BOOST_CHECK_EQUAL(bg::get<0>(c), scalar_type(-100));
-    BOOST_CHECK_EQUAL(bg::get<1>(c), scalar_type(50));
-    BOOST_CHECK_EQUAL(bg::get<2>(c), scalar_type(50));
-}
-
-#ifdef TEST_FAIL_CROSS_PRODUCT
-template <typename P>
-void test_4d()
-{
-    P p1;
-    bg::assign(p1, 20, 30, 10, 15);
-    P p2;
-    bg::assign(p2, 45, 70, 20, 35);
-    P c = bg::cross_product(p1, p2);
-}
-#endif
-
-int test_main(int, char* [])
-{
-    test_2d<bg::model::point<int, 2, bg::cs::cartesian> >();
-    test_2d<bg::model::point<float, 2, bg::cs::cartesian> >();
-    test_2d<bg::model::point<double, 2, bg::cs::cartesian> >();
-
-    test_3d<bg::model::point<int, 3, bg::cs::cartesian> >();
-    test_3d<bg::model::point<float, 3, bg::cs::cartesian> >();
-    test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
-
-#ifdef TEST_FAIL_CROSS_PRODUCT
-    test_4d<bg::model::point<int, 3, bg::cs::cartesian> >();
-    test_4d<bg::model::point<float, 3, bg::cs::cartesian> >();
-    test_4d<bg::model::point<double, 3, bg::cs::cartesian> >();
-#endif
-
-    return 0;
-}
-

Deleted: trunk/libs/geometry/test/arithmetic/cross_product.vcproj
==============================================================================
--- trunk/libs/geometry/test/arithmetic/cross_product.vcproj	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
+++ (empty file)
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="cross_product"
-	ProjectGUID="{C2CD2F98-3327-4560-A979-4BF506F777A8}"
-	RootNamespace="cross_product"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\cross_product"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\boost.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../..;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				ExceptionHandling="2"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				DebugInformationFormat="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\cross_product"
-			ConfigurationType="1"
-			InheritedPropertySheets="..\boost.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../..;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				ExceptionHandling="2"
-				UsePrecompiledHeader="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\cross_product.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

Modified: trunk/libs/geometry/test/extensions/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/test/extensions/Jamfile.v2	(original)
+++ trunk/libs/geometry/test/extensions/Jamfile.v2	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -7,6 +7,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 build-project algorithms ;
+build-project arithmetic ;
 build-project gis ;
 build-project iterators ;
 

Added: trunk/libs/geometry/test/extensions/arithmetic/Jamfile.v2
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/extensions/arithmetic/Jamfile.v2	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,18 @@
+# test/arithmetic/Jamfile.v2 
+#
+# Copyright (c) 2009 Mateusz Loskot <mateusz_at_[hidden]>
+#
+# Use, modification and distribution is subject to the Boost Software License,
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+test-suite boost-geometry-extensions-arithmetic
+    :
+    [ run cross_product.cpp ]
+    [ compile-fail cross_product.cpp
+        : # requirements
+        <define>TEST_FAIL_CROSS_PRODUCT
+        : # target name
+        cross_product_compile_fail
+    ]
+    ;

Added: trunk/libs/geometry/test/extensions/arithmetic/arithmetic_tests.sln
==============================================================================
--- (empty file)
+++ trunk/libs/geometry/test/extensions/arithmetic/arithmetic_tests.sln	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -0,0 +1,31 @@
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arithmetic", "arithmetic.vcproj", "{4D447233-54DC-4C1B-B8DF-4689590ACF56}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot_product", "dot_product.vcproj", "{C9CD2A98-3327-4560-A979-4BF506F777A8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cross_product", "cross_product.vcproj", "{C2CD2F98-3327-4560-A979-4BF506F777A8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4D447233-54DC-4C1B-B8DF-4689590ACF56}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4D447233-54DC-4C1B-B8DF-4689590ACF56}.Debug|Win32.Build.0 = Debug|Win32
+		{4D447233-54DC-4C1B-B8DF-4689590ACF56}.Release|Win32.ActiveCfg = Release|Win32
+		{4D447233-54DC-4C1B-B8DF-4689590ACF56}.Release|Win32.Build.0 = Release|Win32
+		{C9CD2A98-3327-4560-A979-4BF506F777A8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C9CD2A98-3327-4560-A979-4BF506F777A8}.Debug|Win32.Build.0 = Debug|Win32
+		{C9CD2A98-3327-4560-A979-4BF506F777A8}.Release|Win32.ActiveCfg = Release|Win32
+		{C9CD2A98-3327-4560-A979-4BF506F777A8}.Release|Win32.Build.0 = Release|Win32
+		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Debug|Win32.Build.0 = Debug|Win32
+		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Release|Win32.ActiveCfg = Release|Win32
+		{C2CD2F98-3327-4560-A979-4BF506F777A8}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Copied: trunk/libs/geometry/test/extensions/arithmetic/cross_product.cpp (from r70779, /trunk/libs/geometry/test/arithmetic/cross_product.cpp)
==============================================================================
--- /trunk/libs/geometry/test/arithmetic/cross_product.cpp	(original)
+++ trunk/libs/geometry/test/extensions/arithmetic/cross_product.cpp	2011-04-02 12:31:59 EDT (Sat, 02 Apr 2011)
@@ -8,7 +8,7 @@
 
 #include <geometry_test_common.hpp>
 
-#include <boost/geometry/arithmetic/cross_product.hpp>
+#include <boost/geometry/extensions/arithmetic/cross_product.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>