Adding FixedPoint

cmake/unit_testing.cmake

@@ -35,6 +35,7 @@ add_subdirectory( src/tools/disco/Column/test )
 add_subdirectory( src/tools/disco/Character/test )
 add_subdirectory( src/tools/disco/Integer/test )
 add_subdirectory( src/tools/disco/Real/test )
+add_subdirectory( src/tools/disco/FixedPoint/test )
 add_subdirectory( src/tools/disco/Scientific/test )
 add_subdirectory( src/tools/disco/Record/test )
 

src/tools/disco.hpp

@@ -2,6 +2,9 @@
 #include "tools/disco/BaseField.hpp"
 #include "tools/disco/BaseFixedWidthField.hpp"
 #include "tools/disco/Column.hpp"
+#include "tools/disco/Character.hpp"
 #include "tools/disco/Integer.hpp"
 #include "tools/disco/Real.hpp"
+#include "tools/disco/FixedPoint.hpp"
 #include "tools/disco/Scientific.hpp"
+#include "tools/disco/Record.hpp"

src/tools/disco/FixedPoint.hpp

@@ -0,0 +1,74 @@
+#ifndef NJOY_TOOLS_DISCO_SCIENTIFIC
+#define NJOY_TOOLS_DISCO_SCIENTIFIC
+
+// system includes
+#include <sstream>
+#include <iomanip>
+
+// other includes
+#include "fast_float/fast_float.h"
+#include "tools/disco/Real.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, unsigned int Precision >
+class FixedPoint : public Real< Width > {
+
+  /* fields */
+
+public:
+
+  using Real< Width >::read;
+
+  template< typename Representation, typename Iterator >
+  static void write( const Representation& value, Iterator& iter ) {
+
+    const double absValue = std::abs( value );
+
+    std::ostringstream buffer;
+    buffer << std::right << std::setw( Width );
+
+    if ( absValue == std::numeric_limits< Representation >::max() ) {
+
+      if ( value < 0 ) {
+
+        buffer << "-Inf";
+      }
+      else {
+
+        buffer << "Inf";
+      }
+    }
+    else {
+
+      unsigned int precision = Width - 1;
+      if ( value < 0 ) {
+
+        precision -= 1;
+      }
+      precision = std::min( precision, Precision );
+
+      buffer << std::fixed
+             << std::uppercase
+             << std::setprecision( precision )
+             << value;
+    }
+
+    for ( auto b : buffer.str() ) {
+
+      *iter++ = b;
+    }
+  }
+};
+
+} // disco namespace
+} // tools namespace
+} // njoy namespace
+
+#endif

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

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

src/tools/disco/FixedPoint/test/FixedPoint.test.cpp

@@ -0,0 +1,108 @@
+// include Catch2
+#include <catch2/catch_test_macros.hpp>
+
+// what we are testing
+#include "tools/disco/FixedPoint.hpp"
+
+// other includes
+
+// convenience typedefs
+using namespace njoy::tools::disco;
+
+SCENARIO( "FixedPoint" ) {
+
+  double value;
+  std::string buffer;
+  auto iter = std::back_inserter( buffer );
+
+  value = 0;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "     0.00000" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = 2;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "     2.00000" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = 10;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "    10.00000" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = 3.14159265359;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "     3.14159" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = 0.69314718056;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "     0.69315" == buffer );
+  CHECK( 12 == buffer.size() );
+
+//  value = 1e-100;
+//  buffer = "";
+//  iter = std::back_inserter( buffer );
+//  FixedPoint< 12, 5 >::write( value, iter );
+//  CHECK( "1.00000E-100" == buffer );
+//  CHECK( 12 == buffer.size() );
+//
+//  value = 1e+100;
+//  buffer = "";
+//  iter = std::back_inserter( buffer );
+//  FixedPoint< 12, 5 >::write( value, iter );
+//  CHECK( "1.00000E+100" == buffer );
+//  CHECK( 12 == buffer.size() );
+
+  value = -2;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "    -2.00000" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = -10;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "   -10.00000" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = -3.14159265359;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "    -3.14159" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = -0.69314718056;
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "    -0.69315" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = std::numeric_limits< double >::max();
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "         Inf" == buffer );
+  CHECK( 12 == buffer.size() );
+
+  value = -std::numeric_limits< double >::max();
+  buffer = "";
+  iter = std::back_inserter( buffer );
+  FixedPoint< 12, 5 >::write( value, iter );
+  CHECK( "        -Inf" == buffer );
+  CHECK( 12 == buffer.size() );
+} // SCENARIO