Merge remote-tracking branch 'origin/MABE_devel'

.github/workflows/CI.yml

@@ -55,6 +55,10 @@ jobs:
         uses: egor-tensin/setup-gcc@v1
         with:
           version: 11
+      - name: Set up clang
+        uses: egor-tensin/setup-clang@v1
+        with:
+          version: 15
       - run: sudo apt-get update -qq
       - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
       - run: sudo apt-get update -qq
@@ -87,6 +91,10 @@ jobs:
     name: Measure Test Coverage
     runs-on: ubuntu-22.04
     steps:
+      - name: Set up clang
+        uses: egor-tensin/setup-clang@v1
+        with:
+          version: 15
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'

.gitignore

@@ -1,4 +1,5 @@
 *~
+*.csv
 *.debug
 *.dSYM
 *.gcov
@@ -17,16 +18,15 @@
 *.dat
 *.exe
 *tmp.*
+*-bak.*
+*-bak2.*
 
 */env/*
 */3nv/*
 
 .DS_Store
 a.out
 a.out.js
-fitness.csv
-population.csv
-systematics.csv
 
 incoming/
 tmp/
@@ -48,6 +48,7 @@ demos/Emphatic/Emphatic
 demos/Emphatic/examples/ConceptTest
 demos/Emphatic/examples/ConceptTest.cpp
 demos/MABE/examples/NK
+demos/MAP-Elites-Arm/web/MAP-Elites-Arm.js
 demos/NK.bak/
 demos/NK/NK
 demos/NK/web/NK.js
@@ -76,6 +77,13 @@ demos/NK/web/jquery-1.11.2.min.js
 demos/NK/web/NK.asm.js
 demos/NK/web/NK.html
 demos/NK/web/NK.js.mem
+demos/utils/words/Wordle/Wordle
+demos/utils/words/Wordle/web/
+demos/utils/words/annotate-length
+demos/utils/words/has-only
+demos/utils/words/wordlists/
+demos/utils/words/wordplay-remove
+demos/utils/words/wordplay-shuffle
 
 doc/doxygen/
 examples/*/*
@@ -88,7 +96,6 @@ examples/*/*
 !examples/*/Makefile
 !examples/timing/BENCHMARKS
 
-tests/*.csv
 tests/StatsConfig.cfg
 tests/web/*.js
 tests/web/package.json

.gitmodules

@@ -10,10 +10,6 @@
   path = third-party/cereal
   url = https://github.com/mmore500/cereal.git
   shallow = true
-[submodule "third-party/span-lite"]
-  path = third-party/span-lite
-  url = https://github.com/martinmoene/span-lite.git
-  shallow = true
 [submodule "third-party/robin-hood-hashing"]
   path = third-party/robin-hood-hashing
   url = https://github.com/martinus/robin-hood-hashing.git

Dockerfile

@@ -46,7 +46,7 @@ RUN \
     build-essential \
     dpkg-dev \
     g++-11 \
-    libc6 \
+    libc6=2.27-3ubuntu1 \
     xvfb \
     x11vnc \
     x11-xkb-utils \

Planning/NEXT_PASS

@@ -0,0 +1,13 @@
+Next time we do a full pass through files, we should:
+
+* Use notify for proper error tracking.  Bias toward exceptions so developers can choose individualized responses to errors.
+* Change member functions (and variables?) to begin with _
+* Cleanup Doxygen?
+* Move std::string to emp::String, where possible.
+* Cleanup any SFINEA or other template tricks and use constexpr instead.
+
+
+And if implemented
+* Simplify emp_asserts to assume that will disentangle tests and print values of components?
+* Add in the ability to turn on "EMP_THREADED" options?
+* Add in serialization capabilities?

demos/MAP-Elites-Arm/Makefile

@@ -3,7 +3,7 @@ PROJECT := MAP-Elites-Arm
 EMP_DIR := ../../include
 
 # Flags to use regardless of compiler
-CFLAGS_all := -Wall -Wno-unused-function -std=c++17 -I$(EMP_DIR)/
+CFLAGS_all := -Wall -Wno-unused-function -std=c++20 -I$(EMP_DIR)/
 
 # Native compiler information
 CXX_nat := g++
@@ -12,7 +12,7 @@ CFLAGS_nat_debug := -g -DEMP_TRACK_MEM -Wnon-virtual-dtor -Wcast-align -Woverloa
 
 # Emscripten compiler information
 CXX_web := emcc
-OFLAGS_web_all := -s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall', 'cwrap']" -s TOTAL_MEMORY=67108864 --js-library $(EMP_DIR)/emp/web/library_emp.js -s EXPORTED_FUNCTIONS="['_main', '_empCppCallback']" -s DISABLE_EXCEPTION_CATCHING=1 -s NO_EXIT_RUNTIME=1 #--embed-file configs
+OFLAGS_web_all := -s "EXPORTED_RUNTIME_METHODS=['ccall', 'cwrap']" -s TOTAL_MEMORY=67108864 --js-library $(EMP_DIR)/emp/web/library_emp.js -s EXPORTED_FUNCTIONS="['_main', '_empCppCallback']" -s DISABLE_EXCEPTION_CATCHING=1 -s NO_EXIT_RUNTIME=1 #--embed-file configs
 OFLAGS_web := -Oz -DNDEBUG
 # OFLAGS_web_debug := -g4 -Oz -pedantic -Wno-dollar-in-identifier-extension -s ASSERTIONS=2
 OFLAGS_web_debug := -g4 -pedantic -Wno-dollar-in-identifier-extension -s ASSERTIONS=2

demos/NK/Makefile

@@ -3,7 +3,7 @@ PROJECT := NK
 EMP_DIR := ../../include
 
 # Flags to use regardless of compiler
-CFLAGS_all := -Wall -Wno-unused-function -std=c++17 -I$(EMP_DIR)/
+CFLAGS_all := -Wall -Wno-unused-function -std=c++20 -I$(EMP_DIR)/
 
 # Native compiler information
 CXX_nat := g++

demos/SelectionAnalyze/Makefile

@@ -1,6 +1,6 @@
 # Flags to use regardless of compiler
 CFLAGS_all := -Wall -Wno-unused-function -I../../include/
-CFLAGS_version := -std=c++17
+CFLAGS_version := -std=c++20
 
 # Emscripten compiler information
 CXX_web := emcc

demos/SpatialCoop2017/Makefile

@@ -3,7 +3,7 @@ PROJECT := SimplePDWorld
 EMP_DIR := ../../include
 
 # Flags to use regardless of compiler
-CFLAGS_all := -Wall -Wno-unused-function -std=c++17 -I$(EMP_DIR)/
+CFLAGS_all := -Wall -Wno-unused-function -std=c++20 -I$(EMP_DIR)/
 
 # Native compiler information
 CXX_nat := g++

demos/Sudoku/Makefile

@@ -1,5 +1,5 @@
 # Flags to use regardless of compiler
-CFLAGS_all := -std=c++17 -Wall -Wno-unused-function -I../../include/
+CFLAGS_all := -std=c++20 -Wall -Wno-unused-function -I../../include/
 
 # Emscripten compiler information
 CXX_web := emcc

demos/utils/graphs/web/Makefile

@@ -1,7 +1,7 @@
 CXX_web := emcc
 # OFLAGS_web := -g4 -Wall
 OFLAGS_web := -oz -DNDEBUG
-CFLAGS_web := -std=c++17 $(OFLAGS_web) -s EXPORTED_FUNCTIONS="['_empLoadString']" -I../../../../include/
+CFLAGS_web := -std=c++20 $(OFLAGS_web) -s EXPORTED_FUNCTIONS="['_empLoadString']" -I../../../../include/
 
 default: web