From b8a6835ada8f3ae6ce02b8ab9f9e50769bd15867 Mon Sep 17 00:00:00 2001 From: "mmore500.login+git@gmail.com" Date: Sun, 30 May 2021 01:52:25 -0400 Subject: [PATCH] Fixup small bugs in data recording --- include/dish2/load/reconstitute_population_load.hpp | 1 - include/dish2/record/dump_genome_statistics.hpp | 3 ++- include/dish2/record/dump_spawn_log.hpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/dish2/load/reconstitute_population_load.hpp b/include/dish2/load/reconstitute_population_load.hpp index 0e2c7a02be..388818fe6d 100644 --- a/include/dish2/load/reconstitute_population_load.hpp +++ b/include/dish2/load/reconstitute_population_load.hpp @@ -16,7 +16,6 @@ #include "../../../third-party/Empirical/include/emp/tools/keyname_utils.hpp" #include "../../../third-party/Empirical/include/emp/tools/string_utils.hpp" -#include "../algorithm/seed_genomes_into.hpp" #include "../genome/Genome.hpp" #include "../utility/autoload.hpp" diff --git a/include/dish2/record/dump_genome_statistics.hpp b/include/dish2/record/dump_genome_statistics.hpp index 87d83df56c..b90c8eb82e 100644 --- a/include/dish2/record/dump_genome_statistics.hpp +++ b/include/dish2/record/dump_genome_statistics.hpp @@ -56,7 +56,8 @@ void dump_genome_statistics( file.AddVal( v, emp::to_string("Treatment ", k) ); } } - file.AddVal( "proc", emp::to_string( uitsl::get_proc_id() ) ); + file.AddVal( uitsl::get_proc_id(), "proc" ); + file.AddVal( dish2::thread_idx, "thread" ); const std::string slug = dish2::make_genome_slug( genome_filename ); file.AddVar(slug, "Genome Slug"); diff --git a/include/dish2/record/dump_spawn_log.hpp b/include/dish2/record/dump_spawn_log.hpp index 48301b430a..8fcb753874 100644 --- a/include/dish2/record/dump_spawn_log.hpp +++ b/include/dish2/record/dump_spawn_log.hpp @@ -5,12 +5,12 @@ #include #include +#include "../../../third-party/bxzstr/include/bxzstr.hpp" #include "../../../third-party/conduit/include/uitsl/algorithm/for_each.hpp" #include "../../../third-party/conduit/include/uitsl/mpi/comm_utils.hpp" #include "../../../third-party/Empirical/include/emp/data/DataFile.hpp" #include "../../../third-party/Empirical/include/emp/tools/keyname_utils.hpp" #include "../../../third-party/Empirical/include/emp/tools/string_utils.hpp" -#include "../../../third-party/header-only-gzstream/include/hogzstr/gzstream.hpp" #include "../../../third-party/signalgp-lite/include/sgpl/utility/CountingIterator.hpp" #include "../config/has_replicate.hpp" @@ -30,12 +30,12 @@ void dump_spawn_log( const dish2::ThreadWorld< Spec >& world ) { const auto& population = world.population; - const thread_local std::string out_filename = dish2::pare_keyname_filename( + const std::string out_filename = dish2::pare_keyname_filename( dish2::make_spawn_log_filename(), dish2::make_data_path() ); - thread_local bxz::ofstream out_stream( + bxz::ofstream out_stream( dish2::make_data_path( out_filename ), bxz::lzma, 6 ); emp::DataFile file( out_stream );