eckit::geometry

src/eckit/geometry/CMakeLists.txt

@@ -63,8 +63,6 @@ list( APPEND eckit_geometry_srcs
     iterator/Reduced.h
     iterator/Regular.cc
     iterator/Regular.h
-    iterator/Unstructured.cc
-    iterator/Unstructured.h
     polygon/LonLatPolygon.cc
     polygon/LonLatPolygon.h
     polygon/Polygon.cc

src/eckit/geometry/Grid.h

@@ -34,8 +34,31 @@ class Grid {
 public:
     // -- Types
 
-    using iterator       = std::unique_ptr<Iterator>;
-    using const_iterator = std::unique_ptr<const Iterator>;
+    struct Iterator final : std::unique_ptr<geometry::Iterator> {
+        explicit Iterator(geometry::Iterator* it) :
+            unique_ptr(it) { ASSERT(operator bool()); }
+
+        Iterator(const Iterator&) = delete;
+        Iterator(Iterator&&)      = delete;
+
+        ~Iterator() = default;
+
+        void operator=(const Iterator&) = delete;
+        void operator=(Iterator&&)      = delete;
+
+        bool operator!=(const Iterator& other) { return get()->operator!=(*(other.get())); }
+        bool operator++() { return get()->operator++(); }
+        bool operator--() { return get()->operator--(); }
+
+        explicit operator bool() { return get()->operator bool(); }
+        Point& operator*() { return get()->operator*(); }
+
+        size_t size() const { return get()->size(); }
+        size_t index() const { return get()->index(); }
+    };
+
+    using iterator       = Iterator;
+    using const_iterator = const Iterator;
 
     // -- Exceptions
     // None

src/eckit/geometry/Iterator.h

@@ -45,8 +45,10 @@ class Iterator {
 
     virtual bool operator!=(const Iterator&) = 0;
     virtual bool operator++()                = 0;
-    virtual explicit operator bool()         = 0;
-    virtual const Point& operator*() const   = 0;
+    virtual bool operator--()                = 0;
+
+    virtual explicit operator bool() = 0;
+    virtual Point& operator*()       = 0;
 
     // -- Methods
 

src/eckit/geometry/iterator/Reduced.cc

@@ -12,8 +12,6 @@
 
 #include "eckit/geometry/iterator/Reduced.h"
 
-#include <ostream>
-
 #include "eckit/exception/Exceptions.h"
 
 
@@ -34,17 +32,6 @@ Reduced::Reduced(const std::vector<double>& latitudes,
 }
 
 
-void Reduced::print(std::ostream& out) const {
-    out << "Reduced[N=" << N_ << /*",bbox=" << bbox_ <<*/ ",Ni=" << Ni_ << ",Nj=" << Nj_
-        << ",i=" << i_ << ",j=" << j_ << ",k=" << k_ << ",count=" << count_ << "]";
-}
-
-
-size_t Reduced::index() const {
-    return count_;
-}
-
-
 size_t Reduced::resetToRow(size_t j) {
     ASSERT(j < latitudes_.size());
     lat_ = latitudes_[j];
@@ -71,6 +58,11 @@ size_t Reduced::resetToRow(size_t j) {
 }
 
 
+bool Reduced::operator!=(const Iterator&) {
+    NOTIMP;
+}
+
+
 bool Reduced::operator++() {
     while (Ni_ == 0 && j_ < Nj_) {
         Ni_ = resetToRow(k_ + j_++);
@@ -99,8 +91,27 @@ bool Reduced::operator++() {
 }
 
 
+bool Reduced::operator--() {
+    NOTIMP;
+}
+
+
+Reduced::operator bool() {
+    NOTIMP;
+}
+
+
+Point& Reduced::operator*() {
+    NOTIMP;
+}
+
+
 size_t Reduced::size() const {
-    return 0;
+    NOTIMP;
+}
+
+size_t Reduced::index() const {
+    return count_;
 }
 
 

src/eckit/geometry/iterator/Reduced.h

@@ -79,14 +79,19 @@ class Reduced final : public Iterator {
 
     // -- Methods
 
-    void print(std::ostream&) const;
-    size_t index() const;
     size_t resetToRow(size_t);
 
     // -- Overridden methods
 
+    bool operator!=(const Iterator&) override;
     bool operator++() override;
+    bool operator--() override;
+
+    explicit operator bool() override;
+    Point& operator*() override;
+
     size_t size() const override;
+    size_t index() const override;
 
     // -- Class members
     // None

src/eckit/geometry/iterator/Regular.cc

@@ -12,8 +12,6 @@
 
 #include "eckit/geometry/iterator/Regular.h"
 
-#include <ostream>
-
 #include "eckit/exception/Exceptions.h"
 
 
@@ -62,16 +60,8 @@ Regular::Regular(size_t ni, size_t nj, double north, double west, double we, dou
 }
 
 
-Regular::~Regular() {
-    auto count = count_ + (i_ > 0 || j_ > 0 ? 1 : 0);
-    ASSERT(count == ni_ * nj_);
-}
-
-
-void Regular::print(std::ostream& out) const {
-    out << "Regular[ni=" << ni_ << ",nj=" << nj_ << ",north=" << north_ << ",west=" << west_
-        << ",we=" << we_ << ",ns=" << ns_ << ",i=" << i_ << ",j=" << j_ << ",count=" << count_
-        << "]";
+bool Regular::operator!=(const Iterator&) {
+    NOTIMP;
 }
 
 
@@ -106,8 +96,27 @@ bool Regular::operator++() {
 }
 
 
+bool Regular::operator--() {
+    NOTIMP;
+}
+
+
+Regular::operator bool() {
+    NOTIMP;
+}
+
+
+Point& Regular::operator*() {
+    NOTIMP;
+}
+
+
 size_t Regular::size() const {
-    return 0;
+    NOTIMP;
+}
+
+size_t Regular::index() const {
+    NOTIMP;
 }
 
 

src/eckit/geometry/iterator/Regular.h

@@ -33,8 +33,7 @@ class Regular final : public Iterator {
     Regular(size_t ni, size_t nj, double north, double west, double we, double ns);
 
     // -- Destructor
-
-    ~Regular() override;
+    // None
 
     // -- Convertors
     // None
@@ -75,13 +74,19 @@ class Regular final : public Iterator {
     Point p_;
 
     // -- Methods
-
-    void print(std::ostream&) const;
+    // None
 
     // -- Overridden methods
 
+    bool operator!=(const Iterator&) override;
     bool operator++() override;
+    bool operator--() override;
+
+    explicit operator bool() override;
+    Point& operator*() override;
+
     size_t size() const override;
+    size_t index() const override;
 
     // -- Class members
     // None

src/tools/eckit-grid.cc

@@ -63,7 +63,7 @@ class EckitGrid final : public EckitTool {
 
             auto it = grid->begin();
 
-            std::cout << **it << std::endl;
+            std::cout << *it << std::endl;
 
             //             (*it).print(out) << std::endl;
             //             static_cast<std::ostream&>(out) << "first: " << q << std::endl;