From 2927005064892a9704f49fdd0c5f28794a7f85c7 Mon Sep 17 00:00:00 2001
From: Yoann Dufresne <yoann.dufresne0@gmail.com>
Date: Tue, 26 Nov 2024 21:14:30 +0100
Subject: [PATCH] :package: new results

---
 app/brutforce.cpp        |  1 +
 data/hash_loading.txt    |  2 +-
 data/opti_fraction_s.txt | 72 ++++++++++++++++++++++++++++++++++++++++
 external/googletest      |  2 +-
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 data/opti_fraction_s.txt

diff --git a/app/brutforce.cpp b/app/brutforce.cpp
index f9b1085..df7d623 100644
--- a/app/brutforce.cpp
+++ b/app/brutforce.cpp
@@ -229,6 +229,7 @@ int main(int argc, char* argv[])
 
     size_t const skipt_to {argparser.createParam<size_t>(0, "skip-to", "Skip the first combinations to start the brutforce later. This option is made to allow save and restart.").value()};
 
+    make_help(argparser);
 
     clutchlog_config(); // common config
     auto& log = clutchlog::logger();
diff --git a/data/hash_loading.txt b/data/hash_loading.txt
index 381f798..ec3384d 100644
--- a/data/hash_loading.txt
+++ b/data/hash_loading.txt
@@ -37,7 +37,7 @@
 
 # 0.13486
 8 5 XSL 1 XSR 2 ASL 4 XSR 6 MUL 135
-# 0.0572857
+# Best function: 0.0572857
 8 5 XSR 1 MUL 15 XSR 3 MUL 221 XSR 4
 
 
diff --git a/data/opti_fraction_s.txt b/data/opti_fraction_s.txt
new file mode 100644
index 0000000..f445acb
--- /dev/null
+++ b/data/opti_fraction_s.txt
@@ -0,0 +1,72 @@
+rHashGen:
+    forward: |4
+        template <typename myuint>
+        myuint hash𓐅9𓉘r3𐙤x5𐙤m8𐙤r3𐙤a1𐙤m8𐙤r4𐙤x3𐙤m8𓉝(myuint val)
+        {
+          val ^= val >> 3;
+          val *= 5;
+          val &= 0xff;
+          val ^= val >> 3;
+          val += val << 1;
+          val &= 0xff;
+          val ^= val >> 4;
+          val *= 3;
+          val &= 0xff;
+          return val;
+        }
+    reverse: |4
+        template <typename myuint>
+        myuint inverted_hash𓐅9𓉘r3𐙤x5𐙤m8𐙤r3𐙤a1𐙤m8𐙤r4𐙤x3𐙤m8𓉝(myuint val)
+        {
+          val *= 171;
+          val &= 0xff;
+          val ^= val >> 4;
+          val *= 171;
+          val &= 0xff;
+          val ^= val >> 3;
+          val ^= val >> 6;
+          val *= 205;
+          val &= 0xff;
+          val ^= val >> 3;
+          val ^= val >> 6;
+          return val;
+        }
+    solution: "0.0968904  6 7 20 7 2 10 19  21"
+    quality: 0.0968904
+
+
+### GENERAL ########################################################################
+# --help=0                                 # -h : Prints this message
+# --stopOnUnknownParam=1                   # Stop if unkown param entered
+
+### ALGORITHM ######################################################################
+--algo=HC                                # -a : Search metaheuristic (CMAES:CMA-ES [mono-objective, parametrize], HC:Hill-Climbing [mono-objective, fixed-size-combination], NSGA2:NSGAII [bi-objective, fixed-size-combination], SA:Simulated-Annealing [mono-objective, fixed-size-combination], )
+# --init-sol=0                             # -I : Read initial solution from standard input
+# --parametrize=0                          # -P : Only tune the parameters and do not change the operators.This will interpret --operators=<SEQ> as a sequence of operators to be parametrized.
+# --pop-size=100                           # -p : Population size for evolutionary algorithms
+
+### LOGGING ########################################################################
+# --log-level=Progress                     # -l : Maximum depth level of logging (Critical<Error<Warning<Progress<Note<Info<Debug<XDebug)
+# --log-file=.*                            # -f : Regexp indicating which source file is allowed logging (use '.*' to allow all)
+# --log-func=.*                            # -F : Regexp indicating which function is allowed logging (use '.*' to allow all)
+# --log-depth=18446744073709551615         # -D : Maximum stack depth above which logging is not allowed (the larger, the more is displayed)
+
+### OBJECTIVE FUNCTIONS ############################################################
+# --nb-tests=1000                          # -x : Number of tests performed to assess the quality (whether the hash function distributes closely related k-mers uniformly in binary space)
+
+### PARAMETERS #####################################################################
+# --seed=0                                 # -s : Seed of the pseudo-random generator (0 = use number of seconds since The Epoch)
+
+### PERSISTENCE ####################################################################
+# --status=./search.status                 # Status file
+
+### SEARCH DOMAIN ##################################################################
+--value-size=8                           # -v : Value size (in bits)
+--func-len=6                             # -n : Number of operations in the hash function
+--shift-min=1                            # -t : Minimum number of shifts
+--shift-max=7                            # -T : Maximum number of shifts
+# --shift-step=1                           # -i : Increment step for number of shifts
+--mult-min=1                             # -m : Smallest multiplier
+--mult-max=255                           # -M : Largest multiplier
+# --mult-step=2                            # -u : Increment step for multipliers (note: only odd multipliers will be allowed)
+# --operators=XorLeftShift,XorRightShift,AddShift,Multiply # -o : Operators allowed in the domain, as a comma-separated list
\ No newline at end of file
diff --git a/external/googletest b/external/googletest
index a1e255a..d144031 160000
--- a/external/googletest
+++ b/external/googletest
@@ -1 +1 @@
-Subproject commit a1e255a582377e1006bb88a408ac3f933ba7c916
+Subproject commit d144031940543e15423a25ae5a8a74141044862f