patch: renaming expectedNodeCount to weightedNodeCount (and all relat…

…ed functions)
SGSSGene · Sep 14, 2023 · 75712d6 · 75712d6
1 parent 5cd56f4
commit 75712d6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/src/example/main.cpp b/src/example/main.cpp
@@ -128,8 +128,8 @@ int main(int argc, char const* const* argv) {
                     auto len = mut_queries[0].size();
                     auto oss = iter->second.generator(0, k, 0, 0); //!TODO last two parameters of second are not being used
                     auto ess = search_schemes::expand(oss, len);
-                    auto dss = search_schemes::expandDynamicExpected</*Edit=*/true>(oss, len, 4, 3'000'000'000); //!TODO use correct Sigma and text size
-                    fmt::print("ss diff: {} to {}, using dyn: {}\n", search_schemes::expectedNodeCount</*Edit=*/false>(ess, 4, 3'000'000'000), search_schemes::expectedNodeCount</*Edit=*/false>(dss, 4, 3'000'000'000), config.generator_dyn);
+                    auto dss = search_schemes::expandByWNC</*Edit=*/true>(oss, len, 4, 3'000'000'000); //!TODO use correct Sigma and text size
+                    fmt::print("ss diff: {} to {}, using dyn: {}\n", search_schemes::weightedNodeCount</*Edit=*/false>(ess, 4, 3'000'000'000), search_schemes::weightedNodeCount</*Edit=*/false>(dss, 4, 3'000'000'000), config.generator_dyn);
                     if (!config.generator_dyn) {
                         return ess;
                     } else {
@@ -147,7 +147,7 @@ int main(int argc, char const* const* argv) {
                             auto len = mut_queries[0].size();
                             auto oss = iter->second.generator(j, j, 0, 0); //!TODO last two parameters of second are not being used
                             auto ess = search_schemes::expand(oss, len);
-                            auto dss = search_schemes::expandDynamicExpected</*Edit=*/true>(oss, len, 4, 3'000'000'000); //!TODO use correct Sigma and text size
+                            auto dss = search_schemes::expandByWNC</*Edit=*/true>(oss, len, 4, 3'000'000'000); //!TODO use correct Sigma and text size
                             if (!config.generator_dyn) {
                                 return ess;
                             } else {

diff --git a/src/run_search_schemes/main.cpp b/src/run_search_schemes/main.cpp
@@ -5,11 +5,7 @@
 // shipped with this file.
 // -----------------------------------------------------------------------------------------------------
 #include <fmt/format.h>
-#include <search_schemes/generator/all.h>
-#include <search_schemes/nodeCount.h>
-#include <search_schemes/expectedNodeCount.h>
-#include <search_schemes/expand.h>
-#include <search_schemes/isComplete.h>
+#include <search_schemes/search_schemes.h>
 
 int main(int argc, char** argv) {
     if (argc != 4) {
@@ -40,12 +36,12 @@ int main(int argc, char** argv) {
         auto ss = search_schemes::expand(oss, len);
 
         auto nc = [&](auto ss) {
-            return search_schemes::expectedNodeCount</*Edit=*/false>(ss, 4, 3'000'000'000);
+            return search_schemes::weightedNodeCount</*Edit=*/false>(ss, 4, 3'000'000'000);
         };
         auto nce = [&](auto ss) {
-            return search_schemes::expectedNodeCount</*Edit=*/true>(ss, 4, 3'000'000'000);
+            return search_schemes::weightedNodeCount</*Edit=*/true>(ss, 4, 3'000'000'000);
         };
-        auto dss = search_schemes::expandDynamicExpected</*Edit=*/true>(oss, len, 4, 3'000'000'000);
+        auto dss = search_schemes::expandByWNC</*Edit=*/true>(oss, len, 4, 3'000'000'000);
 
 
 //        fmt::print("ess:\n");

diff --git a/src/search_schemes/expand.h b/src/search_schemes/expand.h
@@ -9,7 +9,7 @@
 #include "Scheme.h"
 #include "isValid.h"
 #include "nodeCount.h"
-#include "expectedNodeCount.h"
+#include "weightedNodeCount.h"
 
 #include <algorithm>
 #include <cassert>
@@ -188,7 +188,7 @@ inline auto expand(Scheme ss, std::vector<size_t> parts) -> Scheme {
 }
 
 template <bool Edit=false>
-auto expandDynamic(Scheme ss, size_t _newLen, size_t sigma) -> Scheme {
+auto expandByNC(Scheme ss, size_t _newLen, size_t sigma) -> Scheme {
     if (ss.size() == 0) return {};
     auto additionalPos = _newLen - ss[0].pi.size();
     auto counts = std::vector<size_t>(ss[0].pi.size(), 1);
@@ -213,7 +213,7 @@ auto expandDynamic(Scheme ss, size_t _newLen, size_t sigma) -> Scheme {
 }
 
 template <bool Edit=false>
-auto expandDynamicExpected(Scheme ss, size_t _newLen, size_t sigma, size_t N) -> Scheme {
+auto expandByWNC(Scheme ss, size_t _newLen, size_t sigma, size_t N) -> Scheme {
     if (ss.size() == 0) return {};
     auto additionalPos = _newLen - ss[0].pi.size();
     auto counts = std::vector<size_t>(ss[0].pi.size(), 1);
@@ -225,7 +225,7 @@ auto expandDynamicExpected(Scheme ss, size_t _newLen, size_t sigma, size_t N) ->
             counts[j] += 1;
             auto ess = expand(ss, counts);
             counts[j] -= 1;
-            auto f = expectedNodeCount<Edit>(ess, sigma, N);
+            auto f = weightedNodeCount<Edit>(ess, sigma, N);
             if (f < bestVal) {
                 bestVal = f;
                 bestPos = j;

diff --git a/src/search_schemes/search_schemes.h b/src/search_schemes/search_schemes.h
@@ -9,8 +9,8 @@
 #include "Scheme.h"
 #include "Search.h"
 #include "expand.h"
-#include "expectedNodeCount.h"
 #include "generator/all.h"
 #include "isComplete.h"
 #include "isValid.h"
 #include "nodeCount.h"
+#include "weightedNodeCount.h"
diff --git a/src/search_schemes/expectedNodeCount.h → src/search_schemes/weightedNodeCount.h b/src/search_schemes/expectedNodeCount.h → src/search_schemes/weightedNodeCount.h
@@ -22,7 +22,7 @@ namespace search_schemes {
  * \param N     size of the reference text, ~3'000'000'000 for hg
  */
 template <bool Edit>
-long double expectedNodeCount(Search s, size_t sigma, size_t N) {
+long double weightedNodeCount(Search s, size_t sigma, size_t N) {
     auto n_max = s.pi.size();
     auto e     = *std::max_element(begin(s.u), end(s.u));
 
@@ -65,9 +65,9 @@ long double expectedNodeCount(Search s, size_t sigma, size_t N) {
  * \param N     size of the reference text, ~3'000'000'000 for hg
  */
 template <bool Edit>
-long double expectedNodeCount(Scheme const& ss, size_t sigma, size_t N) {
+long double weightedNodeCount(Scheme const& ss, size_t sigma, size_t N) {
     return std::accumulate(begin(ss), end(ss), static_cast<long double>(0.), [&](long double v, auto const& s) {
-        return v + expectedNodeCount<Edit>(s, sigma, N);
+        return v + weightedNodeCount<Edit>(s, sigma, N);
     });
 }
 }