column and row headers are stored in seperate vectors. Previously they were part of the data-vector. Introduced enums 'FlgColumnName' and 'FlgRowName'

Author: panchaBhuta

README.md

@@ -595,14 +595,44 @@ rapidcsv::FilterSortDocument
 When both filter and sorting is needed [rapidcsv::FilterSortDocument](doc/view/rapidcsv_FilterSortDocument.md). <br>
 Both the filter-function and sort-details are passed to [rapidcsv::FilterSortDocument](doc/view/rapidcsv_FilterSortDocument.md)
 
-Refer [tests/testView001.cpp](tests/testView001.cpp) <br>
-```cpp
+Refer [tests/testView001.cpp](tests/testView001.cpp)
+```c++
     /////  Filter + Sort
     const rapidcsv::SortParams<int, rapidcsv::e_SortOrder::DESCEND> spD(1);
     rapidcsv::FilterSortDocument<isFirstCellPositive, decltype(spD)> viewdoc2(doc, spD);
 ```
+<br>
 
-Similar to `rapidcsv::SortDocument`, multiple columns can vebew specified for sorting thru variadic-arguments.
+Similar to `rapidcsv::SortDocument`, multiple columns can be sorted thru variadic-arguments. Refer [tests/testViewB001.cpp](tests/testViewB001.cpp)
+```c++
+    rapidcsv::Document doc(path, rapidcsv::LabelParams(rapidcsv::FlgColumnName::CN_PRESENT,
+                                                       rapidcsv::FlgRowName::RN_PRESENT));
+
+    /////  Filter + Sort
+    const rapidcsv::SortParams<int> spA(0);
+    const rapidcsv::SortParams<int, rapidcsv::e_SortOrder::DESCEND> spD(1);
+    rapidcsv::FilterSortDocument<isFirstCellPositive,
+                                 rapidcsv::SortParams<int>,
+                                 rapidcsv::SortParams<int, rapidcsv::e_SortOrder::DESCEND> > viewdoc1(doc, spA, spD);
+```
+<br>
+
+If the sorted column has NaN (Not-A-Number) values, one can still sort using `converter::FailureS2Tprocess::VARIANT_NAN` template parameter. Refer [tests/testViewfNaN001.cpp](tests/testViewfNaN001.cpp)
+```c++
+template <typename T>
+using _ConvS2T_NAN =
+      converter::ConvertFromStr
+          < T,
+            converter::S2T_Format_std_CtoT
+                < T,
+                  converter::FailureS2Tprocess::VARIANT_NAN
+                >
+          >;
+...
+    /////  Filter + Sort
+    const rapidcsv::SortParams<_ConvS2T_NAN<int>, rapidcsv::e_SortOrder::DESCEND> spD(0);
+    rapidcsv::FilterSortDocument<isCellPositive, decltype(spD)> viewdoc2(doc, spD);
+```
 
 <br>
 <br>
@@ -616,7 +646,8 @@ Architecture Components and Overview
    document.Get***<T>(...);            //  1. T is 'data-type' such as int, long, float, double, ...
    document.Get***<C>(...);            //  2. C is 'convertor-type' satisfying concept 'converter::c_S2Tconverter'
                                        //          C can also be "a user defined Converter class"
-   document.Get***<&CONV_S2T>(...);    //  3. CONV_S2T is 'function-address' of signature 'R (*CONV_S2T)(const std::string&)'
+   document.Get***<&CONV_S2T>(...);    //  3. CONV_S2T is 'function-address' of signature
+                                       //          'R (*CONV_S2T)(const std::string&)'.
                                        //     R  is either type 'T' or 'std::variant<T, std::string>'
    ```
 
@@ -625,7 +656,8 @@ Architecture Components and Overview
    document.Set***<T>(...);            //  1. T is 'data-type' such as int, long, float, double, ...
    document.Set***<C>(...);            //  2. C is 'convertor-type' satisfying concept 'converter::c_T2Sconverter'
                                        //          C can also be "a user defined Converter class"
-   document.Set***<&CONV_T2S>(...);    //  3. CONV_T2S is 'function-address' of signature 'std::string (*CONV_T2S)(const R&)'
+   document.Set***<&CONV_T2S>(...);    //  3. CONV_T2S is 'function-address' of signature
+                                      //           'std::string (*CONV_T2S)(const R&)'.
                                        //     R  is either type 'T' or 'std::variant<T, std::string>'
    ```
 

cmake/rapidcsv.cmake

@@ -86,7 +86,7 @@ macro(fetch_dependencies)
     include( FetchContent )
     FetchContent_Declare( ${CONVERTERLIB}
 		          GIT_REPOSITORY https://github.com/panchaBhuta/converter.git
-		          GIT_TAG        v1.2.11)  # adjust tag/branch/commit as needed
+		          GIT_TAG        v1.2.12)  # adjust tag/branch/commit as needed
     FetchContent_MakeAvailable(${CONVERTERLIB})
 
     #[==================[

doc/UpstreamRepoChanges.md

@@ -20,7 +20,8 @@ void Converter<T>::ToStr(const T& pVal, std::string& pStr) const;
                     AND
 void Converter<T>::ToVal(const std::string& pStr, T& pVal) const;
 ```
----
+
+<br>
 
 ## Removed `struct ConverterParams`
 `struct ConverterParams`, which had several member variables to determine the run time conversion behavior has been done away with. <br> <br>
@@ -49,14 +50,33 @@ _T2S_Format_StreamAsIs_ &nbsp; , &nbsp; _T2S_Format_StreamUseClassicLocale_ &nbs
 <br> <br>
 
 One can also provide their own implementations of _T2S_FORMAT_ or _S2T_FORMAT_. For implentation details, refer **exConv001.cpp, ex008.cpp, ex009.cpp**.
-<br> <br>
 
----
+<br>
+
+
 ## Removed `class no_converter : public std::exception`
 For types which are not supported will generate compile-time error. This approach is better then getting a run-time exception.
 
----
-## Performance gains
+<br>
+
+## Refactored constructor of `LabelParams`
+In the upstream repo, the labels-usage for row and column could be turned off by passing `-1`. Instead of `int` , enum's `FlgColumnName` and `FlgRowName` are passed to the constrcutor.
+
+```c++
+  enum FlgColumnName { CN_PRESENT, CN_MISSING };
+  enum FlgRowName    { RN_PRESENT, RN_MISSING };
+...
+    explicit LabelParams(const FlgColumnName pColumnNameFlg = FlgColumnName::CN_PRESENT,
+                         const FlgRowName    pRowNameFlg    = FlgRowName::RN_MISSING)
+```
+
+`FlgColumnName::CN_PRESENT` would imply that the column labels(headers) are available in the first row of the CSV file.
+`FlgRowName::RN_PRESENT` would imply that the row labels are available in the first column of the CSV file.
+
+
+<br>
+
+# Performance gains
 Removed header `<typeinfo>` and calls to function `typeid(...)`.
 In template based code, calling any _RTTI_ functions such as `typeid(...)` is unnecessary, as templates are working with _types_ itself. 
 

doc/document/rapidcsv_LabelParams.md

@@ -5,13 +5,14 @@ Datastructure holding parameters controlling which row and column should be trea
 ---
 
 ```c++
-LabelParams (const ssize_t pColumnNameIdx = 0, const ssize_t pRowNameIdx = -1)
+explicit LabelParams(const FlgColumnName pColumnNameFlg = FlgColumnName::CN_PRESENT,
+                     const FlgRowName    pRowNameFlg    = FlgRowName::RN_MISSING)
 ```
 Constructor. 
 
 **Parameters**
-- `pColumnNameIdx` specifies the zero-based row index of the column labels, setting it to -1 prevents column lookup by label name, and gives access to all rows as document data. Default: 0 
-- `pRowNameIdx` specifies the zero-based column index of the row labels, setting it to -1 prevents row lookup by label name, and gives access to all columns as document data. Default: -1 
+- `pColumnNameFlg` specifies the zero-based row index of the column labels, setting it to _FlgColumnName::CN_MISSING_ prevents column lookup by label name, and gives access to all rows as document data. Default: _FlgColumnName::CN_PRESENT_
+- `pRowNameIdx` specifies the zero-based column index of the row labels, setting it to _FlgRowName::RN_MISSING_ prevents row lookup by label name, and gives access to all columns as document data. Default: _FlgRowName::RN_MISSING_
 
 ---
 

examples/CMakeLists.txt

@@ -21,7 +21,6 @@ endmacro(add_example)
 
 
 
-
 # Examples
 add_example(ex001 ex001.cpp)
 add_example(ex002 ex002.cpp)

examples/ex002.cpp

@@ -5,7 +5,7 @@
 
 int main()
 {
-  rapidcsv::Document doc("examples/colrowhdr.csv", rapidcsv::LabelParams(0, 0));
+  rapidcsv::Document doc("examples/colrowhdr.csv", rapidcsv::LabelParams(rapidcsv::FlgColumnName::CN_PRESENT, rapidcsv::FlgRowName::RN_PRESENT));
 
   std::tuple<float, float, float, float, unsigned long, float>
      hlocVa = doc.GetRow<float, float, float, float, unsigned long, float>("2017-02-22");

examples/ex003.cpp

@@ -5,7 +5,7 @@
 
 int main()
 {
-  rapidcsv::Document doc("examples/rowhdr.csv", rapidcsv::LabelParams(-1, 0));
+  rapidcsv::Document doc("examples/rowhdr.csv", rapidcsv::LabelParams(rapidcsv::FlgColumnName::CN_MISSING, rapidcsv::FlgRowName::RN_PRESENT));
 
   std::tuple<float, float, float, float, unsigned long, float>
      hlocVa = doc.GetRow<float, float, float, float, unsigned long, float>("2017-02-22");

examples/ex004.cpp

@@ -5,7 +5,7 @@
 
 int main()
 {
-  rapidcsv::Document doc("examples/nohdr.csv", rapidcsv::LabelParams(-1, -1));
+  rapidcsv::Document doc("examples/nohdr.csv", rapidcsv::LabelParams(rapidcsv::FlgColumnName::CN_MISSING, rapidcsv::FlgRowName::RN_MISSING));
 
   std::vector<float> close = doc.GetColumn<float>(5);
   std::cout << "Read " << close.size() << " values." << std::endl;

examples/ex005.cpp

@@ -5,7 +5,7 @@
 
 int main()
 {
-  rapidcsv::Document doc("examples/semi.csv", rapidcsv::LabelParams(0, 0),
+  rapidcsv::Document doc("examples/semi.csv", rapidcsv::LabelParams(rapidcsv::FlgColumnName::CN_PRESENT, rapidcsv::FlgRowName::RN_PRESENT),
                          rapidcsv::SeparatorParams(';'));
 
   std::vector<float> close = doc.GetColumn<float>("Close");

examples/ex006.cpp

@@ -5,7 +5,7 @@
 
 int main()
 {
-  rapidcsv::Document doc("examples/colrowhdr.csv", rapidcsv::LabelParams(0, 0));
+  rapidcsv::Document doc("examples/colrowhdr.csv", rapidcsv::LabelParams(rapidcsv::FlgColumnName::CN_PRESENT, rapidcsv::FlgRowName::RN_PRESENT));
 
   std::cout << doc.GetCell<std::string>("Volume", "2017-02-22") << std::endl;
   std::cout << doc.GetCell<int>("Volume", "2017-02-22") << std::endl;