Fixup small bugs in data recording

mmore500 · May 30, 2021 · b8a6835 · b8a6835
1 parent b628032
commit b8a6835
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -5,12 +5,12 @@
 #include <algorithm>
 #include <string>
 
+#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 );