From 6254f92586845da3331256b1ec6b241d2495ca43 Mon Sep 17 00:00:00 2001 From: Matthew Andres Moreno Date: Wed, 15 Nov 2023 00:04:50 -0500 Subject: [PATCH] Fix tests --- .../expected/data/detail--1.spop | 27 ------------------- .../expected/data/detail-2.spop | 27 ------------------- .../expected/data/detail-3.spop | 27 ------------------- .../expected/data/detail-0.spop | 2 +- .../expected/data/detailgermlines-0.sgerm | 2 +- .../expected/data/detailgermlines-500.sgerm | 2 +- 6 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail--1.spop delete mode 100644 avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-2.spop delete mode 100644 avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-3.spop diff --git a/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail--1.spop b/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail--1.spop deleted file mode 100644 index 28aa5e964..000000000 --- a/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail--1.spop +++ /dev/null @@ -1,27 +0,0 @@ -#filetype genotype_data -#format id src src_args parents num_units total_units length merit gest_time fitness gen_born update_born update_deactivated depth hw_type inst_set sequence cells gest_offset lineage -# Structured Population Save -# Tue Nov 14 20:22:00 2023 -# 1: ID -# 2: Source -# 3: Source Args -# 4: Parent ID(s) -# 5: Number of currently living organisms -# 6: Total number of organisms that ever existed -# 7: Genome Length -# 8: Average Merit -# 9: Average Gestation Time -# 10: Average Fitness -# 11: Generation Born -# 12: Update Born -# 13: Update Deactivated -# 14: Phylogenetic Depth -# 15: Hardware Type ID -# 16: Inst Set Name -# 17: Genome Sequence -# 18: Occupied Cell IDs -# 19: Gestation (CPU) Cycle Offsets -# 20: Lineage Label - -1 div:ext (none) (none) 300 300 320 0 0 0 0 -1 -1 0 2 transsmt ycdAoaddxccccccccccccccEEEcccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccccccccccccccccccccccccccccccccEccccDcccccccccccccccccccccccccccccccccccccccccccccccccccdccccccccccccccccccccccccccccccccccccccccccxcccccccccccccccccccccccccccccccccccccccccccccccccAcccccccccccccccccccucccccccccccccccccccccypqvcrGxab 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2 horz:int ABB (none) 8 8 80 0 0 0 0 -1 -1 0 2 transsmt ycdAEcrlenbiErnEcEgctuccwwcgEocaEcxcxdmyEfiCmCEvanvbecvmsbEcaccncdoypqvcrFxppxab 0,1,2,17,170,200,201,202 -1,-1,-1,-1,-1,-1,-1,-1 diff --git a/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-2.spop b/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-2.spop deleted file mode 100644 index 37ff3b414..000000000 --- a/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-2.spop +++ /dev/null @@ -1,27 +0,0 @@ -#filetype genotype_data -#format id src src_args parents num_units total_units length merit gest_time fitness gen_born update_born update_deactivated depth hw_type inst_set sequence cells gest_offset lineage -# Structured Population Save -# Tue Nov 14 20:22:00 2023 -# 1: ID -# 2: Source -# 3: Source Args -# 4: Parent ID(s) -# 5: Number of currently living organisms -# 6: Total number of organisms that ever existed -# 7: Genome Length -# 8: Average Merit -# 9: Average Gestation Time -# 10: Average Fitness -# 11: Generation Born -# 12: Update Born -# 13: Update Deactivated -# 14: Phylogenetic Depth -# 15: Hardware Type ID -# 16: Inst Set Name -# 17: Genome Sequence -# 18: Occupied Cell IDs -# 19: Gestation (CPU) Cycle Offsets -# 20: Lineage Label - -1 div:ext (none) (none) 200 300 320 0 0 0 0 -1 -1 0 2 transsmt ycdAoaddxccccccccccccccEEEcccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccccccccccccccccccccccccccccccccEccccDcccccccccccccccccccccccccccccccccccccccccccccccccccdccccccccccccccccccccccccccccccccccccccccccxcccccccccccccccccccccccccccccccccccccccccccccccccAcccccccccccccccccccucccccccccccccccccccccypqvcrGxab 100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2 horz:int ABB (none) 4 8 80 0 0 0 0 -1 -1 0 2 transsmt ycdAEcrlenbiErnEcEgctuccwwcgEocaEcxcxdmyEfiCmCEvanvbecvmsbEcaccncdoypqvcrFxppxab 170,200,201,202 -1,-1,-1,-1 diff --git a/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-3.spop b/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-3.spop deleted file mode 100644 index 37ff3b414..000000000 --- a/avida-core/tests/demes_KillDemesHighestParasiteLoad/expected/data/detail-3.spop +++ /dev/null @@ -1,27 +0,0 @@ -#filetype genotype_data -#format id src src_args parents num_units total_units length merit gest_time fitness gen_born update_born update_deactivated depth hw_type inst_set sequence cells gest_offset lineage -# Structured Population Save -# Tue Nov 14 20:22:00 2023 -# 1: ID -# 2: Source -# 3: Source Args -# 4: Parent ID(s) -# 5: Number of currently living organisms -# 6: Total number of organisms that ever existed -# 7: Genome Length -# 8: Average Merit -# 9: Average Gestation Time -# 10: Average Fitness -# 11: Generation Born -# 12: Update Born -# 13: Update Deactivated -# 14: Phylogenetic Depth -# 15: Hardware Type ID -# 16: Inst Set Name -# 17: Genome Sequence -# 18: Occupied Cell IDs -# 19: Gestation (CPU) Cycle Offsets -# 20: Lineage Label - -1 div:ext (none) (none) 200 300 320 0 0 0 0 -1 -1 0 2 transsmt ycdAoaddxccccccccccccccEEEcccccccccccccccccccccccccccccccccccccccccccccccccccgccccccccccccccccccccccccccccccccccccccccEccccDcccccccccccccccccccccccccccccccccccccccccccccccccccdccccccccccccccccccccccccccccccccccccccccccxcccccccccccccccccccccccccccccccccccccccccccccccccAcccccccccccccccccccucccccccccccccccccccccypqvcrGxab 100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -2 horz:int ABB (none) 4 8 80 0 0 0 0 -1 -1 0 2 transsmt ycdAEcrlenbiErnEcEgctuccwwcgEocaEcxcxdmyEfiCmCEvanvbecvmsbEcaccncdoypqvcrFxppxab 170,200,201,202 -1,-1,-1,-1 diff --git a/avida-core/tests/demes_savegermlines/expected/data/detail-0.spop b/avida-core/tests/demes_savegermlines/expected/data/detail-0.spop index ce840eb5f..4e00dc738 100644 --- a/avida-core/tests/demes_savegermlines/expected/data/detail-0.spop +++ b/avida-core/tests/demes_savegermlines/expected/data/detail-0.spop @@ -1,7 +1,7 @@ #filetype genotype_data #format id src src_args parents num_units total_units length merit gest_time fitness gen_born update_born update_deactivated depth hw_type inst_set sequence cells gest_offset lineage # Structured Population Save -# Tue Aug 29 01:45:53 2023 +# Tue Nov 14 23:59:36 2023 # 1: ID # 2: Source # 3: Source Args diff --git a/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-0.sgerm b/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-0.sgerm index 89739f580..625a050f5 100644 --- a/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-0.sgerm +++ b/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-0.sgerm @@ -1,7 +1,7 @@ #filetype germline_data #format deme_id hw_type inst_set sequence # Mode 1 Germline Save -# Tue Aug 29 01:45:53 2023 +# Tue Nov 14 23:59:36 2023 # 1: Deme ID # 2: Hardware Type ID # 3: Inst Set Name diff --git a/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-500.sgerm b/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-500.sgerm index 89739f580..625a050f5 100644 --- a/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-500.sgerm +++ b/avida-core/tests/demes_savegermlines/expected/data/detailgermlines-500.sgerm @@ -1,7 +1,7 @@ #filetype germline_data #format deme_id hw_type inst_set sequence # Mode 1 Germline Save -# Tue Aug 29 01:45:53 2023 +# Tue Nov 14 23:59:36 2023 # 1: Deme ID # 2: Hardware Type ID # 3: Inst Set Name