Changeset 961

Timestamp:

11/06/08 11:18:31 (2 months ago)

Author:

mloskot

Message:

lasreader_iterator_test.cpp: added test cases for number of standard algorithms: copy, count, equal, find, find_if, for_each.

Location:

trunk/test/unit

Files:

• common.hpp (modified) (1 diff)
• lasreader_iterator_test.cpp (modified) (19 diffs, 1 prop)

trunk/test/unit/common.hpp

@@ -38 +38 @@
 struct bbox_calculator
 {
+    // bbox object will store operation result
     bbox_calculator(liblas::detail::Extents<double>& bbox)
         : empty(true), bbox(bbox)

trunk/test/unit/lasreader_iterator_test.cpp

@@ -6 +6 @@
 // http://www.opensource.org/licenses/bsd-license.php)
 //
+#include <liblas/cstdint.hpp>
 #include <liblas/iterator.hpp>
-#include <liblas/cstdint.hpp>
+#include <liblas/laspoint.hpp>
+#include <liblas/detail/utility.hpp>
 #include <tut/tut.hpp>
+#include <algorithm>
 #include <fstream>
 #include <iterator>
+#include <list>
 #include "liblas_test.hpp"
 #include "common.hpp"
+using namespace liblas;
 
 namespace tut
@@ -35 +40 @@
     void to::test<1>()
     {
-        liblas::lasreader_iterator it;
+        lasreader_iterator it;
     }
 
@@ -44 +49 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
     }
 
@@ -53 +58 @@
     void to::test<3>()
     {
-        liblas::lasreader_iterator it1;
-        liblas::lasreader_iterator it2(it1);
+        lasreader_iterator it1;
+        lasreader_iterator it2(it1);
 
         ensure(it1 == it2);
@@ -65 +70 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it1(reader);
-        liblas::lasreader_iterator it2(it1);
+        LASReader reader(ifs);
+        lasreader_iterator it1(reader);
+        lasreader_iterator it2(it1);
 
         ensure(it1 == it2);
@@ -77 +82 @@
     void to::test<5>()
     {
-        liblas::lasreader_iterator it1;
-        liblas::lasreader_iterator it2;
+        lasreader_iterator it1;
+        lasreader_iterator it2;
         it1 = it2;
 
@@ -90 +95 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it1(reader);
-        liblas::lasreader_iterator it2;
+        LASReader reader(ifs);
+        lasreader_iterator it1(reader);
+        lasreader_iterator it2;
         it1 = it2;
 
@@ -104 +109 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
 
         test_file10_point1(*it);
     }
 
- // Test pointer-to-member operator
+    // Test pointer-to-member operator
     template<>
     template<>
@@ -116 +121 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
 
         // test 1st point data record 
@@ -124 +129 @@
         ensure_distance(it->GetZ(), double(51.53), 0.0001);
         ensure_equals(it->GetIntensity(), 670);
-        ensure_equals(it->GetClassification(), liblas::uint8_t(1));
+        ensure_equals(it->GetClassification(), uint8_t(1));
         ensure_equals(it->GetScanAngleRank(), 0);
         ensure_equals(it->GetUserData(), 3);
@@ -137 +142 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader); // move to 1st point
+        LASReader reader(ifs);
+        lasreader_iterator it(reader); // move to 1st point
         ++it; // move to 2nd record
 
@@ -150 +155 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader); // move to 1st point
+        LASReader reader(ifs);
+        lasreader_iterator it(reader); // move to 1st point
         it++; // move to 2nd record
 
@@ -163 +168 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader); // move to 1st point
-        liblas::lasreader_iterator end;
+        LASReader reader(ifs);
+        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator end;
 
         ensure_not(end == it);
@@ -176 +181 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader); // move to 1st point
-        liblas::lasreader_iterator end;
+        LASReader reader(ifs);
+        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator end;
 
         ensure(end != it);
@@ -189 +194 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::uint32_t const cnt = reader.GetHeader().GetPointRecordsCount();
-        liblas::lasreader_iterator it(reader); // move to 1st point
-        liblas::lasreader_iterator end;
-
-        liblas::uint32_t s = 0;
+        LASReader reader(ifs);
+        uint32_t const cnt = reader.GetHeader().GetPointRecordsCount();
+        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator end;
+
+        uint32_t s = 0;
         while (end != it)
         {
@@ -204 +209 @@
     }
 
-    // Test std::distance
+    // Test std::distance operation
     template<>
     template<>
@@ -210 +215 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::uint32_t const cnt = reader.GetHeader().GetPointRecordsCount();
-        liblas::lasreader_iterator it(reader); // move to 1st point
-        liblas::lasreader_iterator end;
-
-        ensure_equals(std::distance(it, end), cnt);
-    }
-
-    // Test std::advance
+        LASReader reader(ifs);
+        uint32_t const cnt = reader.GetHeader().GetPointRecordsCount();
+        lasreader_iterator it(reader); // move to 1st point
+        lasreader_iterator end;
+
+        lasreader_iterator::difference_type const d = std::distance(it, end);
+        ensure_equals(d, cnt);
+    }
+
+    // Test std::advance operation
     template<>
     template<>
@@ -224 +230 @@
     {
         std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
-        liblas::LASReader reader(ifs);
-        liblas::lasreader_iterator it(reader); // move to 1st point
+        LASReader reader(ifs);
+        lasreader_iterator it(reader); // move to 1st point
 
         std::advance(it, 1); // move to 2nd record
@@ -233 +239 @@
         test_file10_point4(*it);
     }
+
+    // Test std::copy algorithm
+    template<>
+    template<>
+    void to::test<16>()
+    {
+        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
+        LASReader reader(ifs);
+        uint32_t const size = reader.GetHeader().GetPointRecordsCount();
+
+        lasreader_iterator it(reader);
+        lasreader_iterator end;
+
+        typedef std::list<LASPoint> list_t;
+        typedef std::back_insert_iterator<list_t> inserter_t;
+        list_t cache;
+
+        // Test copying LAS records to std::list based cache
+        std::copy(it, end, inserter_t(cache));
+        ensure_equals(cache.size(), size);
+
+        // Test copied data
+        list_t::const_iterator cit = cache.begin(); // 1st element
+        std::advance(cit, 1); // move to 2nd element in cache
+        test_file10_point2(*cit);
+        std::advance(cit, 2); // move to 4th element in cache
+        test_file10_point4(*cit);
+    }
+
+    // Test std::count algorithm
+    template<>
+    template<>
+    void to::test<17>()
+    {
+        // Construct copy of 2nd point record from tested file
+        LASPoint pt;
+        pt.SetCoordinates(630282.45, 4834500, 51.63);
+        pt.SetIntensity(350);
+        pt.SetClassification(1);
+        pt.SetScanAngleRank(0);
+        pt.SetUserData(3);
+        pt.SetScanFlags(9);
+        pt.SetTime(413665.52880000003);
+        ensure(pt.IsValid());
+        test_file10_point2(pt);
+
+        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
+        lasreader_iterator end;
+
+        // Count records equal to given point object
+        lasreader_iterator::difference_type const expected = 1;
+        lasreader_iterator::difference_type n = std::count(it, end, pt);
+        ensure_equals(n, expected);
+    }
+
+
+    // Test std::equal algorithm
+    template<>
+    template<>
+    void to::test<18>()
+    {
+        // TODO - mloskot: Can not re-use the reader because libLAS does
+        // not support reset operation yet. In order to reuse reader with mre than one iterator
+        // we have to provide operation to reset reader (set internal pointer to beginning of LAS file, etc.).
+        // So, here we reuse only file stream.
+        //LASReader reader(ifs);
+
+        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
+     
+
+        // Copy LAS records to std::list based cache
+        typedef std::list<LASPoint> list_t;
+        typedef std::back_insert_iterator<list_t> inserter_t;
+        list_t cache;
+        {
+            LASReader reader(ifs);
+            lasreader_iterator it(reader);
+            lasreader_iterator end;
+            ensure(it != end);
+
+            std::copy(it, end, inserter_t(cache));
+            ensure_equals(cache.size(), reader.GetHeader().GetPointRecordsCount());
+        }
+
+        // Compare LAS file with cache
+        {
+            LASReader reader(ifs);
+            lasreader_iterator it(reader);
+            lasreader_iterator end;
+            ensure(it != end);
+
+            bool eq = std::equal(it, end, cache.begin());
+            ensure(eq);
+        }
+    }
+
+    // Test std::find algorithm
+    template<>
+    template<>
+    void to::test<19>()
+    {
+        // Construct copy of 2nd point record from tested file
+        LASPoint pt;
+        pt.SetCoordinates(630282.45, 4834500, 51.63);
+        pt.SetIntensity(350);
+        pt.SetClassification(1);
+        pt.SetScanAngleRank(0);
+        pt.SetUserData(3);
+        pt.SetScanFlags(9);
+        pt.SetTime(413665.52880000003);
+        ensure(pt.IsValid());
+        test_file10_point2(pt);
+
+        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
+        lasreader_iterator end;
+
+        // find 2nd point data record
+        lasreader_iterator fit;
+        fit = std::find(it, end, pt);
+        ensure(fit != end);
+        test_file10_point2(*fit);
+    }
+
+    // Test std::find_if algorithm
+    template<>
+    template<>
+    void to::test<20>()
+    {
+        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
+        lasreader_iterator end;
+
+        // find 2nd point data record comparing XY coordinates
+        lasreader_iterator fit;
+        fit = std::find_if(it, end, is_xy(630282.45, 4834500, 0.0001));
+        ensure(fit != end);
+        test_file10_point2(*fit);
+    }
+
+    // Test std::for_each algorithm
+    template<>
+    template<>
+    void to::test<21>()
+    {
+        std::ifstream ifs(file10_.c_str(), std::ios::in | std::ios::binary);
+        LASReader reader(ifs);
+        lasreader_iterator it(reader);
+        lasreader_iterator end;
+
+        typedef liblas::detail::Point<double> point_t;
+        typedef liblas::detail::Extents<double> bbox_t;
+
+        LASHeader const& h = reader.GetHeader();
+        bbox_t lasbbox(point_t(h.GetMinX(), h.GetMinY(), h.GetMinZ()),
+                       point_t(h.GetMaxX(), h.GetMaxY(), h.GetMaxZ()));
+
+        // Accumulate points extents to common bounding box
+        bbox_t bbox;
+        std::for_each(it, end, bbox_calculator(bbox));
+
+        ensure(lasbbox == bbox);
+    }
+
+ 
 }