Updates after Wim's comments.

src/ENDFtk/gendf/CrossSection.hpp

@@ -12,29 +12,13 @@ namespace gendf {
 
   class CrossSection : protected SectionBase {
 
-    /* constructor */
-    #include "ENDFtk/gendf/CrossSection/src/ctor.hpp"
-
   protected:
 
-    /* convenience functions */
-
-    double getValue( unsigned int block, unsigned int group,
-                     unsigned int order, unsigned int dilution ) {
-
-      // default value
-      if ( !this->hasRecord(group) )
-        return 0.0;
-
-      // from list
-      auto values = this->record( group ).data( block );
-      return values[ this->num_legendre_ * dilution + order ];
-    }
-
+    /* constructor */
+    #include "ENDFtk/gendf/CrossSection/src/ctor.hpp"
 
   public:
 
-
     /* convenience functions */
 
     /**
@@ -153,14 +137,14 @@ namespace gendf {
 
     // from gendf::SectionBase
     using SectionBase::NL;
-    using SectionBase::numLegendre;
+    using SectionBase::numberLegendreMoments;
     using SectionBase::legendreOrder;
     using SectionBase::NZ;
-    using SectionBase::numDilutions;
-    using SectionBase::numSigmaZeros;
+    using SectionBase::numberDilutions;
+    using SectionBase::numberSigmaZeros;
     using SectionBase::NGN;
-    using SectionBase::numGroups;
-    using SectionBase::LRFLAG;
+    using SectionBase::numberGroups;
+    using SectionBase::LR;
     using SectionBase::complexBreakUp;
 
     // from section::Base

src/ENDFtk/gendf/CrossSection/src/ctor.hpp

@@ -38,9 +38,13 @@
    *  @param[in] head         the head record of the section
    *  @param[in] begin        the iterator for begin
    *  @param[in] end          the iterator for end
+   *  @param[in] lineNumber   the current line number
+   *  @param[in] MAT          the expected MAT number
    */
   template< typename Iterator >
   CrossSection( const HEAD& head,
                Iterator& begin,
-               const Iterator& end ) :
-    SectionBase( head, begin, end ) {}
+               const Iterator& end,
+               long& lineNumber,
+               int MAT ) :
+    SectionBase( head, begin, end, lineNumber, MAT ) {}

src/ENDFtk/gendf/CrossSection/test/CrossSection.test.cpp

@@ -31,37 +31,32 @@ bool compareRanges( Range1 r1, Range2 r2 ) {
 // tests
 SCENARIO( "CrossSection tests") {
 
-  GIVEN( "a string representing the CrossSection" ) {
+  GIVEN( "valid data for the CrossSection" ) {
 
-    std::string line = chunk();
-    auto begin = line.begin();
-    auto end = line.end();
-    long lineNumber = 0;
-    auto head = StructureDivision( begin, end, lineNumber );
+    WHEN( "the data is given as a string" ) {}
 
-    THEN( "the section can be constructed" ) {
+      std::string line = chunk();
+      auto begin = line.begin();
+      auto end = line.end();
+      long lineNumber = 0;
+      auto head = StructureDivision( begin, end, lineNumber );
 
-      CrossSection section( asHead(head), begin, end );
+      THEN( "the section can be constructed" ) {
 
-      AND_THEN( "we can get the parameters from it" ) {
+        CrossSection section( asHead(head), begin, end, lineNumber, 9228 );
         verifySection( section );
-      } // AND_THEN
-    } // THEN
-  } // GIVEN
-
-  WHEN( "the section is created from parameters" ) {
-
-    THEN( "the section can be constructed" ) {
+      } // THEN
+    } // WHEN
 
-      // TODO
+    WHEN( "the data is given explicitly" ) {
 
-      AND_THEN( "we can get the parameters from it" ) {
+      THEN( "the section can be constructed" ) {
 
+        // TODO
         // verifySection( section );
-      } // AND_THEN
-    } // THEN
-  } // WHEN
-
+      } // THEN
+    } // WHEN
+  } // GIVEN
 } // SCENARIO
 
 std::string chunk(){
@@ -80,55 +75,55 @@ std::string chunk(){
 void verifySection( CrossSection section ) {
 
   // header information
-  REQUIRE( 1 == section.MT() );
-  REQUIRE( 1 == section.sectionNumber() );
-  REQUIRE( 92235 == section.ZA() );
-  REQUIRE( 0.0 == section.atomicWeightRatio() );
-  REQUIRE( 0.0 == section.AWR() );
-  REQUIRE( 2 == section.NL() );
-  REQUIRE( 2 == section.numLegendre() );
-  REQUIRE( 1 == section.legendreOrder() );
-  REQUIRE( 3 == section.NZ() );
-  REQUIRE( 3 == section.numDilutions() );
-  REQUIRE( 0 == section.LRFLAG() );
-  REQUIRE( 0 == section.complexBreakUp() );
-  REQUIRE( 3 == section.NGN() );
-  REQUIRE( 3 == section.numGroups() );
+  CHECK( 1 == section.MT() );
+  CHECK( 1 == section.sectionNumber() );
+  CHECK( 92235 == section.ZA() );
+  CHECK( 0.0 == section.atomicWeightRatio() );
+  CHECK( 0.0 == section.AWR() );
+  CHECK( 2 == section.NL() );
+  CHECK( 2 == section.numberLegendreMoments() );
+  CHECK( 1 == section.legendreOrder() );
+  CHECK( 3 == section.NZ() );
+  CHECK( 3 == section.numberDilutions() );
+  CHECK( 0 == section.LR() );
+  CHECK( 0 == section.complexBreakUp() );
+  CHECK( 3 == section.NGN() );
+  CHECK( 3 == section.numberGroups() );
 
   // group not provided
-  REQUIRE( 0.0 == Approx( section.flux(1) ) );
-  REQUIRE( 0.0 == Approx( section.flux(1, 1, 1) ) );
-  REQUIRE( 0.0 == Approx( section.crossSection(1) ) );
-  REQUIRE( 0.0 == Approx( section.crossSection(1, 0, 0) ) );
+  CHECK( 0.0 == Approx( section.flux(1) ) );
+  CHECK( 0.0 == Approx( section.flux(1, 1, 1) ) );
+  CHECK( 0.0 == Approx( section.crossSection(1) ) );
+  CHECK( 0.0 == Approx( section.crossSection(1, 0, 0) ) );
 
   // group provided -- flux
-  REQUIRE( 1.0 == Approx( section.flux(2) ) );
-  REQUIRE( 1.0 == Approx( section.flux(2, 0, 0) ) );
-  REQUIRE( 2.0 == Approx( section.flux(2, 1, 0) ) );
-  REQUIRE( 3.0 == Approx( section.flux(2, 0, 1) ) );
-  REQUIRE( 3.0 == Approx( section.flux(2, 1) ) );
-  REQUIRE( 4.0 == Approx( section.flux(2, 1, 1) ) );
-  REQUIRE( 5.0 == Approx( section.flux(2, 0, 2) ) );
-  REQUIRE( 6.0 == Approx( section.flux(2, 1, 2) ) );
+  CHECK( 1.0 == Approx( section.flux(2) ) );
+  CHECK( 1.0 == Approx( section.flux(2, 0, 0) ) );
+  CHECK( 2.0 == Approx( section.flux(2, 1, 0) ) );
+  CHECK( 3.0 == Approx( section.flux(2, 0, 1) ) );
+  CHECK( 3.0 == Approx( section.flux(2, 1) ) );
+  CHECK( 4.0 == Approx( section.flux(2, 1, 1) ) );
+  CHECK( 5.0 == Approx( section.flux(2, 0, 2) ) );
+  CHECK( 6.0 == Approx( section.flux(2, 1, 2) ) );
 
   // group provided -- cross_section
-  REQUIRE( 7.1 == Approx( section.crossSection(3) ) );
-  REQUIRE( 7.1 == Approx( section.crossSection(3, 0, 0) ) );
-  REQUIRE( 8.1 == Approx( section.crossSection(3, 1, 0) ) );
-  REQUIRE( 9.1 == Approx( section.crossSection(3, 0, 1) ) );
-  REQUIRE( 10.1 == Approx( section.crossSection(3, 1, 1) ) );
-  REQUIRE( 11.1 == Approx( section.crossSection(3, 0, 2) ) );
-  REQUIRE( 11.1 == Approx( section.crossSection(3, 2) ) );
-  REQUIRE( 12.1 == Approx( section.crossSection(3, 1, 2) ) );
+  CHECK( 7.1 == Approx( section.crossSection(3) ) );
+  CHECK( 7.1 == Approx( section.crossSection(3, 0, 0) ) );
+  CHECK( 8.1 == Approx( section.crossSection(3, 1, 0) ) );
+  CHECK( 9.1 == Approx( section.crossSection(3, 0, 1) ) );
+  CHECK( 10.1 == Approx( section.crossSection(3, 1, 1) ) );
+  CHECK( 11.1 == Approx( section.crossSection(3, 0, 2) ) );
+  CHECK( 11.1 == Approx( section.crossSection(3, 2) ) );
+  CHECK( 12.1 == Approx( section.crossSection(3, 1, 2) ) );
 
   // vectors
-  REQUIRE( compareRanges( std::vector( {0.0, 1.0, 1.1} ),
+  CHECK( compareRanges( std::vector( {0.0, 1.0, 1.1} ),
                           section.fluxes(0) ) );
-  REQUIRE( compareRanges( std::vector( {0.0, 2.0, 2.1} ),
+  CHECK( compareRanges( std::vector( {0.0, 2.0, 2.1} ),
                           section.fluxes(1, 0) ) );
-  REQUIRE( compareRanges( std::vector( {0.0, 7.0, 7.1} ),
+  CHECK( compareRanges( std::vector( {0.0, 7.0, 7.1} ),
                           section.crossSections(0) ) );
-  REQUIRE( compareRanges( std::vector( {0.0, 10.0, 10.1} ),
+  CHECK( compareRanges( std::vector( {0.0, 10.0, 10.1} ),
                           section.crossSections(1, 1) ) );
 
 }

src/ENDFtk/gendf/DataRecord.hpp

@@ -67,7 +67,7 @@ namespace gendf {
     /**
      *  @brief The number of secondary positions
      */
-    long numSecondaryPositions() const { return this->NG2(); }
+    long numberSecondaryPositions() const { return this->NG2(); }
 
     /**
      *  @brief The index to the lowest position
@@ -88,7 +88,7 @@ namespace gendf {
     /**
      *  @brief The number of words in the list
      */
-    long numWords() const { return this->NW(); }
+    long numberWords() const { return this->NW(); }
 
     /**
      *  @brief The group index
@@ -108,9 +108,9 @@ namespace gendf {
     auto data( unsigned int block ) const {
 
       std::size_t size = this->NW() / this->NG2();
-      return this->list() |
-        ranges::view::drop_exactly( block * size ) |
-        ranges::view::take_exactly( size );
+      return this->list()
+        | ranges::view::drop_exactly( block * size )
+        | ranges::view::take_exactly( size );
     }
 
     using ListRecord::list;

src/ENDFtk/gendf/DataRecord/test/DataRecord.test.cpp

@@ -15,37 +15,35 @@ void verifyRecord( DataRecord );
 // tests
 SCENARIO( "DataRecord tests") {
 
-  GIVEN( "a string representing the DataRecord" ) {
+  GIVEN( "valid data for the DataRecord" ) {
 
-    std::string data = chunk();
-    auto begin = data.begin();
-    auto end = data.end();
-    long lineNumber = 10;
+    WHEN( "the data is given as a string" ) {
 
-    THEN( "the record can be constructed" ) {
+      std::string data = chunk();
+      auto begin = data.begin();
+      auto end = data.end();
+      long lineNumber = 10;
 
-      DataRecord record( begin, end, lineNumber, 9228, 3, 1 );
+      THEN( "the record can be constructed" ) {
 
-      AND_THEN( "we can get the data from it" ) {
+        DataRecord record( begin, end, lineNumber, 9228, 3, 1 );
         verifyRecord( record );
 
-      } // AND_THEN
-    } // THEN
-  } // GIVEN
+      } // THEN
+    } // WHEN
 
-  WHEN( "the record is created from parameters" ) {
+    WHEN( "the data is given explicitly" ) {
 
-    THEN( "the record can be constructed" ) {
+      std::vector<double> data = { 1.0, 2.0, 3.0, 4.0 };
 
-      std::vector<double> data = {1.0, 2.0, 3.0, 4.0};
-      DataRecord record( 293.6, 2, 1, 5, std::move(data) );
+      THEN( "the record can be constructed" ) {
 
-      AND_THEN( "we can get the data from it" ) {
+        DataRecord record( 293.6, 2, 1, 5, std::move( data ) );
         verifyRecord( record );
 
-      } // AND_THEN
-    } // THEN
-  } // WHEN
+      } // THEN
+    } // WHEN
+  } // GIVEN
 
 } // SCENARIO
 
@@ -58,19 +56,19 @@ std::string chunk(){
 }
 
 void verifyRecord( DataRecord record ) {
-  REQUIRE( 293.6 == Approx( record.TEMP() ) );
-  REQUIRE( 293.6 == Approx( record.temperature() ) );
-  REQUIRE( 2 == record.NG2() );
-  REQUIRE( 2 == record.numSecondaryPositions() );
-  REQUIRE( 1 == record.IG2LO() );
-  REQUIRE( 1 == record.lowestPosition() );
-  REQUIRE( 4 == record.NW() );
-  REQUIRE( 4 == record.numWords() );
-  REQUIRE( 5 == record.IG() );
-  REQUIRE( 5 == record.groupIndex() );
-  REQUIRE( 1.0 == Approx( record.list()[0] ) );
-  REQUIRE( 2.0 == Approx( record.list()[1] ) );
-  REQUIRE( 2.0 == Approx( record.data(0)[1] ) );
-  REQUIRE( 4.0 == Approx( record.data(1)[1] ) );
+  CHECK( 293.6 == Approx( record.TEMP() ) );
+  CHECK( 293.6 == Approx( record.temperature() ) );
+  CHECK( 2 == record.NG2() );
+  CHECK( 2 == record.numberSecondaryPositions() );
+  CHECK( 1 == record.IG2LO() );
+  CHECK( 1 == record.lowestPosition() );
+  CHECK( 4 == record.NW() );
+  CHECK( 4 == record.numberWords() );
+  CHECK( 5 == record.IG() );
+  CHECK( 5 == record.groupIndex() );
+  CHECK( 1.0 == Approx( record.list()[0] ) );
+  CHECK( 2.0 == Approx( record.list()[1] ) );
+  CHECK( 2.0 == Approx( record.data(0)[1] ) );
+  CHECK( 4.0 == Approx( record.data(1)[1] ) );
 
 }