Adding Column to skip columns

Author: whaeck

cmake/unit_testing.cmake

@@ -30,6 +30,7 @@ add_subdirectory( src/tools/Log/test )
 
 add_subdirectory( src/tools/disco/BaseField/test )
 add_subdirectory( src/tools/disco/BaseFixedWidthField/test )
+add_subdirectory( src/tools/disco/Column/test )
 add_subdirectory( src/tools/disco/Real/test )
 add_subdirectory( src/tools/disco/Scientific/test )
 

src/tools/disco/Column.hpp

@@ -0,0 +1,63 @@
+#ifndef NJOY_TOOLS_DISCO_FIXEDWIDTHSCIENTIFIC
+#define NJOY_TOOLS_DISCO_FIXEDWIDTHSCIENTIFIC
+
+// system includes
+#include <sstream>
+#include <iomanip>
+
+// other includes
+#include "tools/disco/BaseFixedWidthField.hpp"
+
+namespace njoy {
+namespace tools {
+namespace disco {
+
+/**
+ *  @brief A class for reading and writing fixed width data fields containing floating
+ *         point values
+ */
+template< unsigned int Width >
+class Column : public BaseFixedWidthField< Width > {
+
+  /* fields */
+
+protected:
+
+  using BaseFixedWidthField< Width >::isSpace;
+  using BaseFixedWidthField< Width >::isSpaceOrTabulation;
+  using BaseFixedWidthField< Width >::isWhiteSpace;
+  using BaseFixedWidthField< Width >::isNewLine;
+  using BaseFixedWidthField< Width >::isEndOfFile;
+  using BaseFixedWidthField< Width >::skipSpaces;
+  using BaseFixedWidthField< Width >::skipPlusSign;
+
+public:
+
+  template < typename Iterator >
+  static void read( Iterator& iter, const Iterator& ) {
+
+    unsigned int position = 0;
+    while( position < Width && ! ( isNewLine( iter ) || isEndOfFile( iter ) ) ) {
+
+      ++position;
+      ++iter;
+    }
+  }
+
+  template< typename Iterator >
+  static void write( Iterator& iter ) {
+
+    unsigned int position = 0;
+    while ( position < Width ) {
+
+      ++position;
+      *iter++ = ' ';
+    }
+  }
+  };
+
+} // disco namespace
+} // tools namespace
+} // njoy namespace
+
+#endif

src/tools/disco/Column/test/CMakeLists.txt

@@ -0,0 +1 @@
+add_cpp_test( disco.Column Column.test.cpp )

src/tools/disco/Column/test/Column.test.cpp

@@ -0,0 +1,42 @@
+// include Catch2
+#include <catch2/catch_test_macros.hpp>
+
+// what we are testing
+#include "tools/disco/Column.hpp"
+
+// other includes
+
+// convenience typedefs
+using namespace njoy::tools::disco;
+
+SCENARIO( "Column" ) {
+
+  std::string string;
+  auto begin = string.begin();
+  auto end = string.end();
+
+  string = "    ";
+  begin = string.begin();
+  end = string.end();
+  Column< 1 >::read( begin, end );
+  CHECK( begin == end - 3 );
+  Column< 3 >::read( begin, end );
+  CHECK( begin == end );
+
+  string = "abcd";
+  begin = string.begin();
+  end = string.end();
+  Column< 1 >::read( begin, end );
+  CHECK( begin == end - 3 );
+  Column< 3 >::read( begin, end );
+  CHECK( begin == end );
+
+  string = "  \n";
+  begin = string.begin();
+  end = string.end();
+  Column< 1 >::read( begin, end );
+  CHECK( begin == end - 2 );
+  Column< 3 >::read( begin, end );
+  CHECK( begin == end - 1 );
+
+} // SCENARIO

src/tools/disco/Scientific.hpp

@@ -4,7 +4,6 @@
 // system includes
 #include <sstream>
 #include <iomanip>
-#include <iostream>
 
 // other includes
 #include "fast_float/fast_float.h"
@@ -18,7 +17,7 @@ namespace disco {
  *  @brief A class for reading and writing fixed width data fields containing floating
  *         point values
  */
-template < unsigned int Width, unsigned int Precision, unsigned int Exponent = 2 >
+template < unsigned int Width, unsigned int Precision >
 class Scientific : public Real< Width > {
 
   /* fields */
@@ -48,7 +47,7 @@ class Scientific : public Real< Width > {
     }
     else {
 
-      unsigned int precision = Width - 4 - Exponent;
+      unsigned int precision = Width - 6;
       if ( value < 0 ) {
 
         precision -= 1;
@@ -59,7 +58,7 @@ class Scientific : public Real< Width > {
         // log10( significand ) is within [0,1[ so that exponent is given by the
         // floor value
         const int exponent = static_cast< int >( std::floor( std::log10( absValue ) ) );
-        precision -= static_cast< int >( std::floor( std::log10( std::abs( exponent ) ) ) ) - Exponent + 1;
+        precision -= static_cast< int >( std::floor( std::log10( std::abs( exponent ) ) ) ) - 1;
       }
       precision = std::min( precision, Precision );