Boost-Commit mailing page: [Boost-commit] svn:boost r55934

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r55934 - in sandbox/gtl: boost/polygon doc
From: lucanus.j.simonson_at_[hidden]
Date: 2009-08-31 17:45:32

Next message: jeff_at_[hidden]: "[Boost-commit] svn:boost r55935 - sandbox/explore/boost/explore"
Previous message: erwann.rogard_at_[hidden]: "[Boost-commit] svn:boost r55933 - sandbox/statistics/model"

Author: ljsimons
Date: 2009-08-31 17:45:31 EDT (Mon, 31 Aug 2009)
New Revision: 55934
URL: http://svn.boost.org/trac/boost/changeset/55934

Log:
fixed examples and MSVC9 syntax errors
Text files modified:
   sandbox/gtl/boost/polygon/interval_concept.hpp | 14 +++++++-------
   sandbox/gtl/doc/gtl_connectivity_extraction_usage.htm | 3 ++-
   sandbox/gtl/doc/gtl_custom_point.htm | 9 +++++----
   sandbox/gtl/doc/gtl_custom_polygon.htm | 14 +++++++-------
   sandbox/gtl/doc/gtl_custom_polygon_set.htm | 14 +++++++-------
   5 files changed, 28 insertions(+), 26 deletions(-)

Modified: sandbox/gtl/boost/polygon/interval_concept.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/interval_concept.hpp (original)
+++ sandbox/gtl/boost/polygon/interval_concept.hpp 2009-08-31 17:45:31 EDT (Mon, 31 Aug 2009)
@@ -67,10 +67,10 @@
 interval_mutable_traits<T>::set(interval, dir.backward(), value);
 }

- template <typename T>
+ template <typename T, typename T2, typename T3>
 T
- construct(typename interval_traits<T>::coordinate_type low_value, typename interval_traits<T>::coordinate_type high_value,
- typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type>::type * = 0
+ construct(T2 low_value, T3 high_value,
+ typename enable_if<typename is_mutable_interval_concept<typename geometry_concept<T>::type>::type>::type * = 0
 ) {
 if(low_value > high_value) std::swap(low_value, high_value);
 return interval_mutable_traits<T>::construct(low_value, high_value);
@@ -108,13 +108,13 @@
 get(interval2, HIGH);
 }

+ struct y_i_contains : gtl_yes {};
+
 template <typename interval_type>
- bool
+ typename enable_if< typename gtl_and< y_i_contains, typename is_interval_concept<typename geometry_concept<interval_type>::type>::type >::type, bool>::type
 contains(const interval_type& interval,
 typename interval_traits<interval_type>::coordinate_type value,
- bool consider_touch = true,
- typename enable_if< typename is_interval_concept<typename geometry_concept<interval_type>::type>::type>::type * = 0
- ) {
+ bool consider_touch = true ) {
 if(consider_touch) {
 return value <= high(interval) && value >= low(interval);
 } else {

Modified: sandbox/gtl/doc/gtl_connectivity_extraction_usage.htm
==============================================================================
--- sandbox/gtl/doc/gtl_connectivity_extraction_usage.htm (original)
+++ sandbox/gtl/doc/gtl_connectivity_extraction_usage.htm 2009-08-31 17:45:31 EDT (Mon, 31 Aug 2009)
@@ -7,8 +7,9 @@

<body>

-#include <boost/gtl/gtl.hpp> 
+#include <boost/polygon/polygon.hpp> 
#include <cassert> 
+namespace gtl = boost::polygon; 
 
//This function works with both the 90 and 45 versions 
//of connectivity extraction algroithm

Modified: sandbox/gtl/doc/gtl_custom_point.htm
==============================================================================
--- sandbox/gtl/doc/gtl_custom_point.htm (original)
+++ sandbox/gtl/doc/gtl_custom_point.htm 2009-08-31 17:45:31 EDT (Mon, 31 Aug 2009)
@@ -66,10 +66,11 @@
int y; };    
 //There, nice a simple...but wait, it doesn't do anything //how do we use it to do all the things a point needs to do?    
    
- //First we register it as a point with gtl namespace gtl {    
+ //First we register it as a point with boost polygon namespace boost {
+namespace polygon {    
template <>    
-struct geometry_concept<CPoint> { typedef point_concept type; }; }    
- //Then we specialize the gtl point traits for our point type namespace gtl {    
+struct geometry_concept<CPoint> { typedef point_concept type; };      
+     //Then we specialize the gtl point traits for our point type    
template <>    
struct point_traits<CPoint> {    
   
@@ -128,7 +129,7 @@
return retval;    
   
}    
-}; }    
+}; } }    
 //Now lets see if the CPoint works with the library functions int main() {    
test_point<CPoint>(); //yay! All your testing is done for you.    
return 0; }

Modified: sandbox/gtl/doc/gtl_custom_polygon.htm
==============================================================================
--- sandbox/gtl/doc/gtl_custom_polygon.htm (original)
+++ sandbox/gtl/doc/gtl_custom_polygon.htm 2009-08-31 17:45:31 EDT (Mon, 31 Aug 2009)
@@ -59,9 +59,9 @@
  int y; 
}; 
 
-//we have to get CPoint working with gtl to make our polygon 
-//that uses CPoint working with gtl 
-namespace gtl { 
+//we have to get CPoint working with boost polygon to make our polygon 
+//that uses CPoint working with boost polygon 
+namespace boost { namespace polygon { 
  template <> 
  struct geometry_concept<CPoint> { typedef point_concept type; }; 
  template <> 
@@ -92,14 +92,14 @@
      return retval; 
    } 
  }; 
-} 
+} } 
 
//I'm lazy and use the stl everywhere to avoid writing my own classes 
//my toy polygon is a std::list<CPoint> 
typedef std::list<CPoint> CPolygon; 
 
-//we need to specialize our polygon concept mapping in gtl 
-namespace gtl { 
+//we need to specialize our polygon concept mapping in boost polygon 
+namespace boost { namespace polygon { 
  //first register CPolygon as a polygon_concept type 
  template <> 
  struct geometry_concept<CPolygon>{ typedef polygon_concept type; }; 
@@ -144,7 +144,7 @@
    } 
 
  }; 
-} 
+} } 
 
//now there's nothing left to do but test that our polygon 
//works with library interfaces

Modified: sandbox/gtl/doc/gtl_custom_polygon_set.htm
==============================================================================
--- sandbox/gtl/doc/gtl_custom_polygon_set.htm (original)
+++ sandbox/gtl/doc/gtl_custom_polygon_set.htm 2009-08-31 17:45:31 EDT (Mon, 31 Aug 2009)
@@ -51,7 +51,7 @@
  int y; 
}; 
 
-namespace gtl { 
+namespace boost { namespace polygon { 
  template <> 
  struct geometry_concept<CPoint> { typedef point_concept type; }; 
  template <> 
@@ -83,13 +83,13 @@
      return retval; 
    } 
  }; 
-} 
+} } 
 
//the CPolygon example 
typedef std::list<CPoint> CPolygon; 
 
-//we need to specialize our polygon concept mapping in gtl 
-namespace gtl { 
+//we need to specialize our polygon concept mapping in boost polygon 
+namespace boost { namespace polygon { 
  //first register CPolygon as a polygon_concept type 
  template <> 
  struct geometry_concept<CPolygon>{ typedef polygon_concept type; }; 
@@ -138,7 +138,7 @@
    } 
 
  }; 
-} 
+} } 
 
//OK, finally we get to declare our own polygon set type 
typedef std::deque<CPolygon> CPolygonSet; 
@@ -147,7 +147,7 @@
//because it is a standard container there is a shortcut 
//for mapping it to polygon set concept, but I'll do it 
//the long way that you would use in the general case. 
-namespace gtl { 
+namespace boost { namespace polygon { 
  //first we register CPolygonSet as a polygon set 
  template <> 
  struct geometry_concept<CPolygonSet> { typedef polygon_set_concept type;
@@ -198,7 +198,7 @@
      //extra 
    } 
  }; 
-} 
+} } 
 
int main() { 
  long long c1 = clock();

Next message: jeff_at_[hidden]: "[Boost-commit] svn:boost r55935 - sandbox/explore/boost/explore"
Previous message: erwann.rogard_at_[hidden]: "[Boost-commit] svn:boost r55933 - sandbox/statistics/model"

Date view	Thread view	Subject view	Author view