Feature/acer iza

CMakeLists.txt

@@ -87,18 +87,6 @@ set( lipservice_AppleClang_Darwin_link_time_optimization_flags "-flto" )
 set( lipservice_AppleClang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( lipservice_AppleClang_Darwin_nonportable_optimization_flags "-march=native" )
 set( lipservice_AppleClang_Darwin_static_flags "-static" )
-set( lipservice_GNU_Darwin_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
-set( lipservice_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
-set( lipservice_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
-set( lipservice_GNU_Darwin_strict_flags "-Werror" )
-set( lipservice_GNU_Darwin_coverage_flags "--coverage" )
-set( lipservice_GNU_Darwin_subproject_flags  )
-set( lipservice_GNU_Darwin_base_project_flags  )
-set( lipservice_GNU_Darwin_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_GNU_Darwin_link_time_optimization_flags "-flto" )
-set( lipservice_GNU_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_GNU_Darwin_nonportable_optimization_flags "-march=native" )
-set( lipservice_GNU_Darwin_static_flags "-static" )
 set( lipservice_GNU_Windows_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
 set( lipservice_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
 set( lipservice_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
@@ -111,6 +99,18 @@ set( lipservice_GNU_Windows_link_time_optimization_flags "-flto" )
 set( lipservice_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( lipservice_GNU_Windows_nonportable_optimization_flags "-march=native" )
 set( lipservice_GNU_Windows_static_flags "-static" )
+set( lipservice_GNU_MinGW_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( lipservice_GNU_MinGW_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( lipservice_GNU_MinGW_RELEASE_flags "-O3" "-DNDEBUG" )
+set( lipservice_GNU_MinGW_strict_flags "-Werror" )
+set( lipservice_GNU_MinGW_coverage_flags "--coverage" )
+set( lipservice_GNU_MinGW_subproject_flags  )
+set( lipservice_GNU_MinGW_base_project_flags  )
+set( lipservice_GNU_MinGW_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_GNU_MinGW_link_time_optimization_flags "-flto" )
+set( lipservice_GNU_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_GNU_MinGW_nonportable_optimization_flags "-march=native" )
+set( lipservice_GNU_MinGW_static_flags "-static" )
 set( lipservice_GNU_CYGWIN_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=gnu++14" )
 set( lipservice_GNU_CYGWIN_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
 set( lipservice_GNU_CYGWIN_RELEASE_flags "-O3" "-DNDEBUG" )
@@ -135,30 +135,18 @@ set( lipservice_GNU_Linux_link_time_optimization_flags "-flto" )
 set( lipservice_GNU_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( lipservice_GNU_Linux_nonportable_optimization_flags "-march=native" )
 set( lipservice_GNU_Linux_static_flags "-static" )
-set( lipservice_GNU_MinGW_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
-set( lipservice_GNU_MinGW_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
-set( lipservice_GNU_MinGW_RELEASE_flags "-O3" "-DNDEBUG" )
-set( lipservice_GNU_MinGW_strict_flags "-Werror" )
-set( lipservice_GNU_MinGW_coverage_flags "--coverage" )
-set( lipservice_GNU_MinGW_subproject_flags  )
-set( lipservice_GNU_MinGW_base_project_flags  )
-set( lipservice_GNU_MinGW_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_GNU_MinGW_link_time_optimization_flags "-flto" )
-set( lipservice_GNU_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_GNU_MinGW_nonportable_optimization_flags "-march=native" )
-set( lipservice_GNU_MinGW_static_flags "-static" )
-set( lipservice_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
-set( lipservice_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
-set( lipservice_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
-set( lipservice_Clang_Darwin_strict_flags "-Werror" )
-set( lipservice_Clang_Darwin_coverage_flags "--coverage" )
-set( lipservice_Clang_Darwin_subproject_flags  )
-set( lipservice_Clang_Darwin_base_project_flags  )
-set( lipservice_Clang_Darwin_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_Clang_Darwin_link_time_optimization_flags "-flto" )
-set( lipservice_Clang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_Clang_Darwin_nonportable_optimization_flags "-march=native" )
-set( lipservice_Clang_Darwin_static_flags "-static" )
+set( lipservice_GNU_Darwin_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( lipservice_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( lipservice_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
+set( lipservice_GNU_Darwin_strict_flags "-Werror" )
+set( lipservice_GNU_Darwin_coverage_flags "--coverage" )
+set( lipservice_GNU_Darwin_subproject_flags  )
+set( lipservice_GNU_Darwin_base_project_flags  )
+set( lipservice_GNU_Darwin_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_GNU_Darwin_link_time_optimization_flags "-flto" )
+set( lipservice_GNU_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_GNU_Darwin_nonportable_optimization_flags "-march=native" )
+set( lipservice_GNU_Darwin_static_flags "-static" )
 set( lipservice_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
 set( lipservice_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
 set( lipservice_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
@@ -171,6 +159,18 @@ set( lipservice_Clang_Windows_link_time_optimization_flags "-flto" )
 set( lipservice_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( lipservice_Clang_Windows_nonportable_optimization_flags "-march=native" )
 set( lipservice_Clang_Windows_static_flags "-static" )
+set( lipservice_Clang_MinGW_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( lipservice_Clang_MinGW_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
+set( lipservice_Clang_MinGW_RELEASE_flags "-O3" "-DNDEBUG" )
+set( lipservice_Clang_MinGW_strict_flags "-Werror" )
+set( lipservice_Clang_MinGW_coverage_flags "--coverage" )
+set( lipservice_Clang_MinGW_subproject_flags  )
+set( lipservice_Clang_MinGW_base_project_flags  )
+set( lipservice_Clang_MinGW_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_Clang_MinGW_link_time_optimization_flags "-flto" )
+set( lipservice_Clang_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_Clang_MinGW_nonportable_optimization_flags "-march=native" )
+set( lipservice_Clang_MinGW_static_flags "-static" )
 set( lipservice_Clang_CYGWIN_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=gnu++14" )
 set( lipservice_Clang_CYGWIN_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
 set( lipservice_Clang_CYGWIN_RELEASE_flags "-O3" "-DNDEBUG" )
@@ -195,18 +195,18 @@ set( lipservice_Clang_Linux_link_time_optimization_flags "-flto" )
 set( lipservice_Clang_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
 set( lipservice_Clang_Linux_nonportable_optimization_flags "-march=native" )
 set( lipservice_Clang_Linux_static_flags "-static" )
-set( lipservice_Clang_MinGW_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
-set( lipservice_Clang_MinGW_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
-set( lipservice_Clang_MinGW_RELEASE_flags "-O3" "-DNDEBUG" )
-set( lipservice_Clang_MinGW_strict_flags "-Werror" )
-set( lipservice_Clang_MinGW_coverage_flags "--coverage" )
-set( lipservice_Clang_MinGW_subproject_flags  )
-set( lipservice_Clang_MinGW_base_project_flags  )
-set( lipservice_Clang_MinGW_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_Clang_MinGW_link_time_optimization_flags "-flto" )
-set( lipservice_Clang_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
-set( lipservice_Clang_MinGW_nonportable_optimization_flags "-march=native" )
-set( lipservice_Clang_MinGW_static_flags "-static" )
+set( lipservice_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
+set( lipservice_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
+set( lipservice_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
+set( lipservice_Clang_Darwin_strict_flags "-Werror" )
+set( lipservice_Clang_Darwin_coverage_flags "--coverage" )
+set( lipservice_Clang_Darwin_subproject_flags  )
+set( lipservice_Clang_Darwin_base_project_flags  )
+set( lipservice_Clang_Darwin_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_Clang_Darwin_link_time_optimization_flags "-flto" )
+set( lipservice_Clang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
+set( lipservice_Clang_Darwin_nonportable_optimization_flags "-march=native" )
+set( lipservice_Clang_Darwin_static_flags "-static" )
 get_directory_property( is_subproject PARENT_DIRECTORY )
 
 if( NOT TARGET range-v3-adapter )
@@ -468,6 +468,7 @@ target_sources( lipservice INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card9/Iwt.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card9/Mti.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card8/Tname.hpp"
+             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card8/Nza.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card6/Iopp.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card6/Newfor.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card6/Ismooth.hpp"
@@ -476,16 +477,16 @@ target_sources( lipservice INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card1/Ndir.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card1/Nendf.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card1/Ngend.hpp"
-             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card8a/Iza01.hpp"
-             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card8a/Iza02.hpp"
-             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card8a/Iza03.hpp"
+             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card8a/Iza.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card4/Izaw.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card3/Hk.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card2/Nxtra.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card2/Iopt.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card2/Iprint.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card2/Suff.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/Card2/Itype.hpp"
+             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/src/readCard4.hpp"
+             "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/ACER/src/readDataVariant.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/POWR/Card2.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/POWR/Lib1.hpp"
              "${CMAKE_CURRENT_SOURCE_DIR}/src/lipservice/POWR/Lib3.hpp"
@@ -1211,10 +1212,10 @@ if( NOT is_subproject )
         add_subdirectory( src/lipservice/ACER/Card7/Thin2/test )
         add_subdirectory( src/lipservice/ACER/Card7/Thin3/test )
         add_subdirectory( src/lipservice/ACER/Card8/test )
+        add_subdirectory( src/lipservice/ACER/Card8/Nza/test )
         add_subdirectory( src/lipservice/ACER/Card8/Tname/test )
         add_subdirectory( src/lipservice/ACER/Card8a/test )
-        add_subdirectory( src/lipservice/ACER/Card8a/Iza01/test )
-        add_subdirectory( src/lipservice/ACER/Card8a/Iza02/test )
+        add_subdirectory( src/lipservice/ACER/Card8a/Iza/test )
         add_subdirectory( src/lipservice/ACER/Card9/test )
         add_subdirectory( src/lipservice/ACER/Card9/Emax/test )
         add_subdirectory( src/lipservice/ACER/Card9/Ielas/test )

metaconfigure/description.json

@@ -753,6 +753,7 @@
     "src/lipservice/ACER/Card9/Iwt.hpp",
     "src/lipservice/ACER/Card9/Mti.hpp",
     "src/lipservice/ACER/Card8/Tname.hpp",
+    "src/lipservice/ACER/Card8/Nza.hpp",
     "src/lipservice/ACER/Card6/Iopp.hpp",
     "src/lipservice/ACER/Card6/Newfor.hpp",
     "src/lipservice/ACER/Card6/Ismooth.hpp",
@@ -761,16 +762,16 @@
     "src/lipservice/ACER/Card1/Ndir.hpp",
     "src/lipservice/ACER/Card1/Nendf.hpp",
     "src/lipservice/ACER/Card1/Ngend.hpp",
-    "src/lipservice/ACER/Card8a/Iza01.hpp",
-    "src/lipservice/ACER/Card8a/Iza02.hpp",
-    "src/lipservice/ACER/Card8a/Iza03.hpp",
+    "src/lipservice/ACER/Card8a/Iza.hpp",
     "src/lipservice/ACER/Card4/Izaw.hpp",
     "src/lipservice/ACER/Card3/Hk.hpp",
     "src/lipservice/ACER/Card2/Nxtra.hpp",
     "src/lipservice/ACER/Card2/Iopt.hpp",
     "src/lipservice/ACER/Card2/Iprint.hpp",
     "src/lipservice/ACER/Card2/Suff.hpp",
     "src/lipservice/ACER/Card2/Itype.hpp",
+    "src/lipservice/ACER/src/readCard4.hpp",
+    "src/lipservice/ACER/src/readDataVariant.hpp",
     "src/lipservice/POWR/Card2.hpp",
     "src/lipservice/POWR/Lib1.hpp",
     "src/lipservice/POWR/Lib3.hpp",
@@ -1559,17 +1560,17 @@
     "lipservice.ACER.Card8": [
       "src/lipservice/ACER/Card8/test/Card8.test.cpp"
     ],
+    "lipservice.ACER.Card8.Nza": [
+      "src/lipservice/ACER/Card8/Nza/test/Nza.test.cpp"
+    ],
     "lipservice.ACER.Card8.Tname": [
       "src/lipservice/ACER/Card8/Tname/test/Tname.test.cpp"
     ],
     "lipservice.ACER.Card8a": [
       "src/lipservice/ACER/Card8a/test/Card8a.test.cpp"
     ],
-    "lipservice.ACER.Card8a.Iza01": [
-      "src/lipservice/ACER/Card8a/Iza01/test/Iza01.test.cpp"
-    ],
-    "lipservice.ACER.Card8a.Iza02": [
-      "src/lipservice/ACER/Card8a/Iza02/test/Iza02.test.cpp"
+    "lipservice.ACER.Card8a.Iza": [
+      "src/lipservice/ACER/Card8a/Iza/test/Iza.test.cpp"
     ],
     "lipservice.ACER.Card9": [
       "src/lipservice/ACER/Card9/test/Card9.test.cpp"

src/lipservice/ACER.hpp

@@ -25,60 +25,25 @@ class ACER {
 
   std::optional< DataVariant > dataVariant;
 
-  template< typename Istream, typename Nextra >
-  auto readCard4( Istream& is, const Nextra& nxtra ){
-    return nxtra.value ?
-      std::optional< Card4 >{ std::in_place, is, nxtra } :
-      std::nullopt;
-  }
-
-  template< typename Istream >
-  DataVariant readDataVariant( Istream& is, int iopt ){
-    assert( (iopt > 0) and (iopt < 6) );
-    switch( iopt ){
-    case 1: {
-      Card5 card5( is );
-      Card6 card6( is );
-      Card7 card7( is );
-      return std::make_tuple< Card5, Card6, Card7 >( std::move( card5 ),
-                                                     std::move( card6 ),
-                                                     std::move( card7 ) );
-    }
-    case 2: {
-      Card8 card8( is );
-      Card8a card8a( is );
-      Card9 card9( is );
-      return std::make_tuple< Card8, Card8a, Card9 >( std::move( card8 ),
-                                                      std::move( card8a ),
-                                                      std::move( card9 ) );
-    }
-    case 3: {
-      return Card10( is );
-    }
-    case 4:
-    case 5: {
-      return Card11( is );
-    }
-    }
-    /* unreachable but necessary to silence compiler warning */
-    throw std::exception();
-  }
+  #include "lipservice/ACER/src/readCard4.hpp"
+  #include "lipservice/ACER/src/readDataVariant.hpp"
 
   template< typename Istream >
   ACER( Istream& is )
-    try:
-      card1( is ),
-      card2( is ),
-      card3( is ),
-      card4( readCard4( is, this->card2.nxtra ) ),
-      dataVariant( ( this->card2.iopt.value < 6 ) ?
-                   std::optional<DataVariant>{
-                     readDataVariant( is,
-                                      this->card2.iopt.value )
-                   } : std::nullopt ){
-   } catch( std::exception& e ) {
-     Log::info( "Trouble validating ACER input." );
-     throw e;
-   }
+  try:
+    card1( is ),
+    card2( is ),
+    card3( is ),
+    card4( readCard4( is, this->card2.nxtra ) ),
+    dataVariant( 
+      ( this->card2.iopt.value < 6 ) ?
+        std::optional<DataVariant>{
+          readDataVariant( is, this->card2.iopt.value ) } : 
+        std::nullopt )
+  {
+  } catch( std::exception& e ) {
+    Log::info( "Trouble validating ACER input." );
+    throw e;
+  }
 
 };

src/lipservice/ACER/Card4.hpp

@@ -7,14 +7,13 @@ class Card4 {
   template< typename Char >
   Card4( iRecordStream< Char >& is,
          const Argument< ACER::Card2::Nxtra >& nxtra )
-    try:
-      izaw( argument::extract< Izaw >( is, nxtra ) )
-    {
-      Card::clear( is );
-    }
-    catch( std::exception& e ){
-      Log::info("Trouble while validating Card 4");
-      throw e;
-    }
+  try:
+    izaw( argument::extract< Izaw >( is, nxtra ) )
+  {
+    Card::clear( is );
+  } catch( std::exception& e ){
+    Log::info("Trouble while validating Card 4");
+    throw e;
+  }
 };
 

src/lipservice/ACER/Card8.hpp

@@ -2,21 +2,23 @@ class Card8 {
 public:
 
   #include "lipservice/ACER/Card8/Tname.hpp"
+  #include "lipservice/ACER/Card8/Nza.hpp"
 
   Argument< argument::common::Matd > matd;
   Argument< argument::common::Tempd > tempd;
   Argument< Tname > tname;
+  Argument< Nza > nza;
 
   template< typename Char >
   Card8( iRecordStream< Char >& is )
-    try:
-      matd( argument::extract< argument::common::Matd >( is ) ),
-      tempd( argument::extract< argument::common::Tempd >( is ) ),
-      tname( argument::extract< Tname >( is ) )
+  try:
+    matd( argument::extract< argument::common::Matd >( is ) ),
+    tempd( argument::extract< argument::common::Tempd >( is ) ),
+    tname( argument::extract< Tname >( is ) ),
+    nza( argument::extract< Nza >( is ) )
   {
     Card::clear( is );
-  }
-    catch( std::exception& e ){
+  } catch( std::exception& e ){
       Log::info( "Trouble while validating card 8" );
       throw e;
   }

src/lipservice/ACER/Card8/Nza.hpp

@@ -0,0 +1,15 @@
+struct Nza {
+  using Value_t = int;
+  static std::string name(){ return "nza"; }
+
+  static std::string description(){
+    return 
+      "The nza parameter specifies the number of ZA values that will be\n "
+      "provided in Card8a.";
+  }
+
+  static Value_t defaultValue(){ return 1; }
+  static bool verify( const Value_t& n ){ 
+    return ( n > 0 ) and ( n <= 16 );
+  }
+};

src/lipservice/ACER/Card8a/Iza02/test/CMakeLists.txt → src/lipservice/ACER/Card8/Nza/test/CMakeLists.txt

@@ -1,6 +1,6 @@
 
-add_executable( lipservice.ACER.Card8a.Iza02.test Iza02.test.cpp )
-target_compile_options( lipservice.ACER.Card8a.Iza02.test PRIVATE ${${PREFIX}_common_flags}
+add_executable( lipservice.ACER.Card8.Nza.test Nza.test.cpp )
+target_compile_options( lipservice.ACER.Card8.Nza.test PRIVATE ${${PREFIX}_common_flags}
 $<$<BOOL:${strict}>:${${PREFIX}_strict_flags}>$<$<CONFIG:DEBUG>:
 ${${PREFIX}_DEBUG_flags}
 $<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags}>>
@@ -10,5 +10,5 @@ $<$<BOOL:${link_time_optimization}>:${${PREFIX}_link_time_optimization_flags}>
 $<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags}>>
 
 ${CXX_appended_flags} ${lipservice_appended_flags} )
-target_link_libraries( lipservice.ACER.Card8a.Iza02.test PUBLIC lipservice ) 
-add_test( NAME lipservice.ACER.Card8a.Iza02 COMMAND lipservice.ACER.Card8a.Iza02.test )
+target_link_libraries( lipservice.ACER.Card8.Nza.test PUBLIC lipservice ) 
+add_test( NAME lipservice.ACER.Card8.Nza COMMAND lipservice.ACER.Card8.Nza.test )