Added struct for easier handling of functions

jwood000 · Sep 27, 2023 · faf28fc · faf28fc
1 parent cbd164a
commit faf28fc
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 67 deletions.
diff --git a/inst/include/ComboGroups/ComboGroupsTemplate.h b/inst/include/ComboGroups/ComboGroupsTemplate.h
@@ -21,6 +21,13 @@ typedef std::function<void(
     const std::vector<mpz_class>&, bool
 )> finalTouchFunc;
 
+struct CmbGrpClsFuncs {
+    const nthFuncDbl nthDbl;
+    const nthFuncGmp nthGmp;
+    const nextGrpFunc next;
+    const finalTouchFunc finishing;
+};
+
 class ComboGroupsTemplate {
 protected:
 

diff --git a/inst/include/ComboGroups/GetComboGroups.h b/inst/include/ComboGroups/GetComboGroups.h
@@ -12,6 +12,10 @@
 #include <numeric>
 #include <thread>
 
+CmbGrpClsFuncs GetClassFuncs(
+    std::unique_ptr<ComboGroupsTemplate> const &CmbGrp
+);
+
 SEXP GetComboGroups(
     SEXP Rv, nextGrpFunc nextCmbGrp, nthFuncDbl nthCmbGrp,
     nthFuncGmp nthCmbGrpGmp, finalTouchFunc FinalTouch,

diff --git a/src/ComboGroups.cpp b/src/ComboGroups.cpp
@@ -105,30 +105,10 @@ SEXP ComboGroupsCpp(SEXP Rv, SEXP RNumGroups, SEXP RGrpSize, SEXP RRetType,
     SetThreads(Parallel, maxThreads, numResults,
                myType, nThreads, RNumThreads, limit);
 
-    const nextGrpFunc nextCmbGrp = std::bind(
-        &ComboGroupsTemplate::nextComboGroup,
-        std::cref(CmbGrp), std::placeholders::_1
-    );
-
-    const nthFuncDbl nthCmbGrp = std::bind(
-        &ComboGroupsTemplate::nthComboGroup,
-        std::cref(CmbGrp), std::placeholders::_1
-    );
-
-    const nthFuncGmp nthCmbGrpGmp = std::bind(
-        &ComboGroupsTemplate::nthComboGroupGmp,
-        std::cref(CmbGrp), std::placeholders::_1
-    );
-
-    const finalTouchFunc FinalTouch = std::bind(
-        &ComboGroupsTemplate::FinalTouch, std::cref(CmbGrp),
-        std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
-        std::placeholders::_4, std::placeholders::_5, std::placeholders::_6,
-        std::placeholders::_7
-    );
+    CmbGrpClsFuncs f = GetClassFuncs(CmbGrp);
 
     cpp11::sexp res = GetComboGroups(
-        Rv, nextCmbGrp, nthCmbGrp, nthCmbGrpGmp, FinalTouch, vNum, vInt,
+        Rv, f.next, f.nthDbl, f.nthGmp, f.finishing, vNum, vInt,
         startZ, myType, mySample, myBigSamp, lowerMpz, lower, n, numResults,
         nThreads, IsArray, IsNamed, Parallel, IsSample, IsGmp
     );

diff --git a/src/ComboGroupsClass.cpp b/src/ComboGroupsClass.cpp
@@ -25,30 +25,10 @@ SEXP ComboGroupsClass::GeneralReturn(int numResults) {
     SetThreads(LocalPar, maxThreads, numResults,
                myType, nThreads, sexpNThreads, limit);
 
-    const nextGrpFunc nextCmbGrp = std::bind(
-        &ComboGroupsTemplate::nextComboGroup,
-        std::cref(CmbGrp), std::placeholders::_1
-    );
-
-    const nthFuncDbl nthCmbGrp = std::bind(
-        &ComboGroupsTemplate::nthComboGroup,
-        std::cref(CmbGrp), std::placeholders::_1
-    );
-
-    const nthFuncGmp nthCmbGrpGmp = std::bind(
-        &ComboGroupsTemplate::nthComboGroupGmp,
-        std::cref(CmbGrp), std::placeholders::_1
-    );
-
-    const finalTouchFunc FinalTouch = std::bind(
-        &ComboGroupsTemplate::FinalTouch, std::cref(CmbGrp),
-        std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
-        std::placeholders::_4, std::placeholders::_5, std::placeholders::_6,
-        std::placeholders::_7
-    );
+    CmbGrpClsFuncs f = GetClassFuncs(CmbGrp);
 
     cpp11::sexp res = GetComboGroups(
-        sexpVec, nextCmbGrp, nthCmbGrp, nthCmbGrpGmp, FinalTouch, vNum,
+        sexpVec, f.next, f.nthDbl, f.nthGmp, f.finishing, vNum,
         vInt, z, myType, tempSample, tempBigSamp, mpzIndex, dblIndex, n,
         numResults, nThreads, IsArray, false, LocalPar, false, IsGmp
     );
@@ -271,31 +251,10 @@ SEXP ComboGroupsClass::randomAccess(SEXP RindexVec) {
                    myType, nThreads, sexpNThreads, limit);
 
         const std::vector<int> before(z);
-
-        const nextGrpFunc nextCmbGrp = std::bind(
-            &ComboGroupsTemplate::nextComboGroup,
-            std::cref(CmbGrp), std::placeholders::_1
-        );
-
-        const nthFuncDbl nthCmbGrp = std::bind(
-            &ComboGroupsTemplate::nthComboGroup,
-            std::cref(CmbGrp), std::placeholders::_1
-        );
-
-        const nthFuncGmp nthCmbGrpGmp = std::bind(
-            &ComboGroupsTemplate::nthComboGroupGmp,
-            std::cref(CmbGrp), std::placeholders::_1
-        );
-
-        const finalTouchFunc FinalTouch = std::bind(
-            &ComboGroupsTemplate::FinalTouch, std::cref(CmbGrp),
-            std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
-            std::placeholders::_4, std::placeholders::_5, std::placeholders::_6,
-            std::placeholders::_7
-        );
+        CmbGrpClsFuncs f = GetClassFuncs(CmbGrp);
 
         cpp11::sexp res = GetComboGroups(
-            sexpVec, nextCmbGrp, nthCmbGrp, nthCmbGrpGmp, FinalTouch, vNum,
+            sexpVec, f.next, f.nthDbl, f.nthGmp, f.finishing, vNum,
             vInt, z, myType, mySample, mpzVec, mpzIndex, dblIndex, n,
             sampSize, nThreads, IsArray, false, LocalPar, true, IsGmp
         );

diff --git a/src/GetComboGroups.cpp b/src/GetComboGroups.cpp
@@ -1,5 +1,41 @@
 #include "ComboGroups/GetComboGroups.h"
 
+CmbGrpClsFuncs GetClassFuncs(
+    std::unique_ptr<ComboGroupsTemplate> const &CmbGrp
+) {
+
+    const nextGrpFunc nextCmbGrp = std::bind(
+        &ComboGroupsTemplate::nextComboGroup,
+        std::cref(CmbGrp), std::placeholders::_1
+    );
+
+    const nthFuncDbl nthCmbGrp = std::bind(
+        &ComboGroupsTemplate::nthComboGroup,
+        std::cref(CmbGrp), std::placeholders::_1
+    );
+
+    const nthFuncGmp nthCmbGrpGmp = std::bind(
+        &ComboGroupsTemplate::nthComboGroupGmp,
+        std::cref(CmbGrp), std::placeholders::_1
+    );
+
+    const finalTouchFunc FinalTouch = std::bind(
+        &ComboGroupsTemplate::FinalTouch, std::cref(CmbGrp),
+        std::placeholders::_1, std::placeholders::_2, std::placeholders::_3,
+        std::placeholders::_4, std::placeholders::_5, std::placeholders::_6,
+        std::placeholders::_7
+    );
+
+    CmbGrpClsFuncs myFuncs = {
+        nthCmbGrp,
+        nthCmbGrpGmp,
+        nextCmbGrp,
+        FinalTouch
+    };
+
+    return myFuncs;
+}
+
 void SampleResults(SEXP GroupsMat, SEXP v,
                    nthFuncDbl nthCmbGrp, nthFuncGmp nthCmbGrpGmp,
                    const std::vector<double> &mySample,