DGtal-team · dcoeurjo · Jun 26, 2014 · Jun 26, 2014 · Jun 26, 2014
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -48,7 +48,8 @@
 - *Base Package*
  - Add comparison operators in variants of CountedPtr. Improve coverage of these classes
    and fix compilation problem (Jacques-Olivier Lachaud)
-
+ - XXXOutputRangeYYY classes are now called XXXRangeWithWritableIteratorYYY
+   (Tristan Roussillon, [#850](https://github.com/DGtal-team/DGtal/pull/850)). 
 
 - *Geometry Package*
  - Fix and add concept of CSurfelLocalEstimator and related ground

diff --git a/src/DGtal/base/CBidirectionalOutputRange.h → ...CBidirectionalRangeWithWritableIterator.h b/src/DGtal/base/CBidirectionalOutputRange.h → ...CBidirectionalRangeWithWritableIterator.h
@@ -17,7 +17,7 @@
 #pragma once
 
 /**
- * @file CBidirectionalOutputRange.h
+ * @file CBidirectionalRangeWithWritableIterator.h
  * @author David Coeurjolly (\c [email protected] )
  * Laboratoire d'InfoRmatique en Image et Systèmes d'information - LIRIS (CNRS, UMR 5205), CNRS, France
  *
@@ -27,41 +27,41 @@
  * This file is part of the DGtal library.
  */
 
-#if defined(CBidirectionalOutputRange_RECURSES)
-#error Recursive header files inclusion detected in CBidirectionalOutputRange.h
-#else // defined(CBidirectionalOutputRange_RECURSES)
+#if defined(CBidirectionalRangeWithWritableIterator_RECURSES)
+#error Recursive header files inclusion detected in CBidirectionalRangeWithWritableIterator.h
+#else // defined(CBidirectionalRangeWithWritableIterator_RECURSES)
 /** Prevents recursive inclusion of headers. */
-#define CBidirectionalOutputRange_RECURSES
+#define CBidirectionalRangeWithWritableIterator_RECURSES
 
-#if !defined CBidirectionalOutputRange_h
+#if !defined CBidirectionalRangeWithWritableIterator_h
 /** Prevents repeated inclusion of headers. */
-#define CBidirectionalOutputRange_h
+#define CBidirectionalRangeWithWritableIterator_h
 
 //////////////////////////////////////////////////////////////////////////////
 // Inclusions
 #include <iostream>
 #include "DGtal/base/Common.h"
-#include "DGtal/base/CSinglePassOutputRange.h"
+#include "DGtal/base/CSinglePassRangeWithWritableIterator.h"
 //////////////////////////////////////////////////////////////////////////////
 
 namespace DGtal
 {
 
   /////////////////////////////////////////////////////////////////////////////
-  // class CBidirectionalOutputRange
+  // class CBidirectionalRangeWithWritableIterator
   /**
-Description of \b concept '\b CBidirectionalOutputRange'
+Description of \b concept '\b CBidirectionalRangeWithWritableIterator'
      @ingroup Concepts
      @brief Aim: refined concept of bidirectional range which require that a reverse output iterator exists.
 
 
-### Refinement of CSinglePassOutputRange
+### Refinement of CSinglePassRangeWithWritableIterator
 
 ### Associated types :
 - OutputIterator: type of output iterator on the range.
 
 ### Notation
-- \a X : A type that is a model of CBidirectionalOutputRange
+- \a X : A type that is a model of CBidirectionalRangeWithWritableIterator
 - \a x, \a y : object of type X
 
 
@@ -82,12 +82,12 @@ ImageContainerBySTLVector::Range
 
 ### Notes###
 
-@tparam T the type that should be a model of CBidirectionalOutputRange.
+@tparam T the type that should be a model of CBidirectionalRangeWithWritableIterator.
 @tparam Value the type of object t in (*it) = t.
 
    */
   template <typename T, typename Value>
-  struct CBidirectionalOutputRange : CSinglePassOutputRange<T, Value>
+  struct CBidirectionalRangeWithWritableIterator : CSinglePassRangeWithWritableIterator<T, Value>
   {
     // ----------------------- Concept checks ------------------------------
   public:
@@ -96,7 +96,7 @@ ImageContainerBySTLVector::Range
     // possibly check these types so as to satisfy a concept with
     //BOOST_CONCEPT_ASSERT(( CConcept< InnerType > ));
 
-    BOOST_CONCEPT_USAGE( CBidirectionalOutputRange )
+    BOOST_CONCEPT_USAGE( CBidirectionalRangeWithWritableIterator )
     {
       ConceptUtils::sameType( myOutput, myX.routputIterator( ) );
     }
@@ -108,14 +108,14 @@ ImageContainerBySTLVector::Range
     // ------------------------- Internals ------------------------------------
   private:
 
-  }; // end of concept CBidirectionalOutputRange
+  }; // end of concept CBidirectionalRangeWithWritableIterator
 
 } // namespace DGtal
 
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // !defined CBidirectionalOutputRange_h
+#endif // !defined CBidirectionalRangeWithWritableIterator_h
 
-#undef CBidirectionalOutputRange_RECURSES
-#endif // else defined(CBidirectionalOutputRange_RECURSES)
+#undef CBidirectionalRangeWithWritableIterator_RECURSES
+#endif // else defined(CBidirectionalRangeWithWritableIterator_RECURSES)
diff --git a/...base/CBidirectionalOutputRangeFromPoint.h → ...ionalRangeWithWritableIteratorFromPoint.h b/...base/CBidirectionalOutputRangeFromPoint.h → ...ionalRangeWithWritableIteratorFromPoint.h
@@ -17,50 +17,50 @@
 #pragma once
 
 /**
- * @file CBidirectionalOutputRangeFromPoint.h
+ * @file CBidirectionalRangeWithWritableIteratorFromPoint.h
  * @author David Coeurjolly (\c [email protected] )
  * Laboratoire d'InfoRmatique en Image et Systèmes d'information - LIRIS (CNRS, UMR 5205), CNRS, France
  *
  * @date 2012/03/27
  *
- * Header file for concept CBidirectionalOutputRangeFromPoint.cpp
+ * Header file for concept CBidirectionalRangeWithWritableIteratorFromPoint.cpp
  *
  * This file is part of the DGtal library.
  */
 
-#if defined(CBidirectionalOutputRangeFromPoint_RECURSES)
-#error Recursive header files inclusion detected in CBidirectionalOutputRangeFromPoint.h
-#else // defined(CBidirectionalOutputRangeFromPoint_RECURSES)
+#if defined(CBidirectionalRangeWithWritableIteratorFromPoint_RECURSES)
+#error Recursive header files inclusion detected in CBidirectionalRangeWithWritableIteratorFromPoint.h
+#else // defined(CBidirectionalRangeWithWritableIteratorFromPoint_RECURSES)
 /** Prevents recursive inclusion of headers. */
-#define CBidirectionalOutputRangeFromPoint_RECURSES
+#define CBidirectionalRangeWithWritableIteratorFromPoint_RECURSES
 
-#if !defined CBidirectionalOutputRangeFromPoint_h
+#if !defined CBidirectionalRangeWithWritableIteratorFromPoint_h
 /** Prevents repeated inclusion of headers. */
-#define CBidirectionalOutputRangeFromPoint_h
+#define CBidirectionalRangeWithWritableIteratorFromPoint_h
 
 //////////////////////////////////////////////////////////////////////////////
 // Inclusions
 #include <iostream>
 #include "DGtal/base/Common.h"
-#include "DGtal/base/CBidirectionalOutputRange.h"
+#include "DGtal/base/CBidirectionalRangeWithWritableIterator.h"
 //////////////////////////////////////////////////////////////////////////////
 
 namespace DGtal
 {
 
   /////////////////////////////////////////////////////////////////////////////
-  // class CBidirectionalOutputRangeFromPoint
+  // class CBidirectionalRangeWithWritableIteratorFromPoint
   /**
-DescriptionDescription of \b concept '\b CBidirectionalOutputRangeFromPoint' <p>
+DescriptionDescription of \b concept '\b CBidirectionalRangeWithWritableIteratorFromPoint' <p>
 @ingroup Concepts
 @brief Aim: refined concept of  single pass range with an routputIterator() method from a point.
 
-### Refinement of CBidirectionalOutputRange
+### Refinement of CBidirectionalRangeWithWritableIterator
 
 ### Associated types :
 
 ### Notation
-- X : A type that is a model of CBidirectionalOutputRangeFromPoint
+- X : A type that is a model of CBidirectionalRangeWithWritableIteratorFromPoint
 - x,  y : object of type X
 - Point: A type of Point
 
@@ -82,12 +82,12 @@ ImageContainerBySTLVector::Range
 
 ### Notes
 
-@tparam T the type that should be a model of CBidirectionalOutputRangeFromPoint.
+@tparam T the type that should be a model of CBidirectionalRangeWithWritableIteratorFromPoint.
 @tparam Value the type of object t in (*it) = t.
       */
   template <typename T, typename Value>
-  struct CBidirectionalOutputRangeFromPoint:
-    CBidirectionalOutputRange<T,Value>
+  struct CBidirectionalRangeWithWritableIteratorFromPoint:
+    CBidirectionalRangeWithWritableIterator<T,Value>
   {
     // ----------------------- Concept checks ------------------------------
   public:
@@ -96,7 +96,7 @@ ImageContainerBySTLVector::Range
     typedef typename T::ReverseOutputIterator ReverseOutputIterator;
 
     // 2. then check the presence of data members, operators and methods with
-    BOOST_CONCEPT_USAGE( CBidirectionalOutputRangeFromPoint )
+    BOOST_CONCEPT_USAGE( CBidirectionalRangeWithWritableIteratorFromPoint )
     {
        ConceptUtils::sameType( myIt, myX.routputIterator( myPoint ) );
     }
@@ -110,14 +110,14 @@ ImageContainerBySTLVector::Range
     // ------------------------- Internals ------------------------------------
   private:
 
-  }; // end of concept CBidirectionalOutputRangeFromPoint
+  }; // end of concept CBidirectionalRangeWithWritableIteratorFromPoint
 
 } // namespace DGtal
 
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // !defined CBidirectionalOutputRangeFromPoint_h
+#endif // !defined CBidirectionalRangeWithWritableIteratorFromPoint_h
 
-#undef CBidirectionalOutputRangeFromPoint_RECURSES
-#endif // else defined(CBidirectionalOutputRangeFromPoint_RECURSES)
+#undef CBidirectionalRangeWithWritableIteratorFromPoint_RECURSES
+#endif // else defined(CBidirectionalRangeWithWritableIteratorFromPoint_RECURSES)
diff --git a/src/DGtal/base/CSinglePassOutputRange.h → ...se/CSinglePassRangeWithWritableIterator.h b/src/DGtal/base/CSinglePassOutputRange.h → ...se/CSinglePassRangeWithWritableIterator.h
@@ -17,7 +17,7 @@
 #pragma once
 
 /**
- * @file CSinglePassOutputRange.h
+ * @file CSinglePassRangeWithWritableIterator.h
  * @author David Coeurjolly (\c [email protected] )
  * Laboratoire d'InfoRmatique en Image et Systèmes d'information - LIRIS (CNRS, UMR 5205), CNRS, France
  *
@@ -27,15 +27,15 @@
  * This file is part of the DGtal library.
  */
 
-#if defined(CSinglePassOutputRange_RECURSES)
-#error Recursive header files inclusion detected in CSinglePassOutputRange.h
-#else // defined(CSinglePassOutputRange_RECURSES)
+#if defined(CSinglePassRangeWithWritableIterator_RECURSES)
+#error Recursive header files inclusion detected in CSinglePassRangeWithWritableIterator.h
+#else // defined(CSinglePassRangeWithWritableIterator_RECURSES)
 /** Prevents recursive inclusion of headers. */
-#define CSinglePassOutputRange_RECURSES
+#define CSinglePassRangeWithWritableIterator_RECURSES
 
-#if !defined CSinglePassOutputRange_h
+#if !defined CSinglePassRangeWithWritableIterator_h
 /** Prevents repeated inclusion of headers. */
-#define CSinglePassOutputRange_h
+#define CSinglePassRangeWithWritableIterator_h
 
 //////////////////////////////////////////////////////////////////////////////
 // Inclusions
@@ -48,9 +48,9 @@ namespace DGtal
 {
 
   /////////////////////////////////////////////////////////////////////////////
-  // class CSinglePassOutputRange
+  // class CSinglePassRangeWithWritableIterator
   /**
-     Description of \b concept '\b CSinglePassOutputRange' <p>
+     Description of \b concept '\b CSinglePassRangeWithWritableIterator' <p>
      @ingroup Concepts
      @brief Aim: refined concept of const single pass range which require that an output iterator exists.
 
@@ -60,7 +60,7 @@ namespace DGtal
      - OutputIterator: type of output iterator on the range.
 
      ###  Notation
-     - \a X : A type that is a model of CSinglePassOutputRange
+     - \a X : A type that is a model of CSinglePassRangeWithWritableIterator
      - \a x, \a y : object of type X
 
      ###  Definitions
@@ -77,11 +77,11 @@ namespace DGtal
 
      ###  Notes
 
-     @tparam T the type that should be a model of CSinglePassOutputRange.
+     @tparam T the type that should be a model of CSinglePassRangeWithWritableIterator.
      @tparam Value the type of object t in (*it) = t.
    */
   template <typename T, typename Value>
-  struct CSinglePassOutputRange : CConstSinglePassRange<T>
+  struct CSinglePassRangeWithWritableIterator : CConstSinglePassRange<T>
   {
     // ----------------------- Concept checks ------------------------------
   public:
@@ -91,7 +91,7 @@ namespace DGtal
     // possibly check these types so as to satisfy a concept with
     BOOST_CONCEPT_ASSERT(( boost::OutputIterator<OutputIterator,Value> ));
 
-    BOOST_CONCEPT_USAGE( CSinglePassOutputRange )
+    BOOST_CONCEPT_USAGE( CSinglePassRangeWithWritableIterator )
     {
       ConceptUtils::sameType( myOutput, myX.outputIterator( ) );
     }
@@ -103,14 +103,14 @@ namespace DGtal
     // ------------------------- Internals ------------------------------------
   private:
 
-  }; // end of concept CSinglePassOutputRange
+  }; // end of concept CSinglePassRangeWithWritableIterator
 
 } // namespace DGtal
 
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif // !defined CSinglePassOutputRange_h
+#endif // !defined CSinglePassRangeWithWritableIterator_h
 
-#undef CSinglePassOutputRange_RECURSES
-#endif // else defined(CSinglePassOutputRange_RECURSES)
+#undef CSinglePassRangeWithWritableIterator_RECURSES
+#endif // else defined(CSinglePassRangeWithWritableIterator_RECURSES)