[Avida-SVN] r3215 - in development: source/main tests/hoarding_collect_internal_300u tests/hoarding_collect_internal_300u/expected tests/hoarding_collect_internal_300u/expected/data
blwalker at myxo.css.msu.edu
blwalker at myxo.css.msu.edu
Mon Apr 20 12:45:47 PDT 2009
Author: blwalker
Date: 2009-04-20 15:45:47 -0400 (Mon, 20 Apr 2009)
New Revision: 3215
Added:
development/tests/hoarding_collect_internal_300u/expected/
development/tests/hoarding_collect_internal_300u/expected/data/
development/tests/hoarding_collect_internal_300u/expected/data/average.dat
development/tests/hoarding_collect_internal_300u/expected/data/count.dat
development/tests/hoarding_collect_internal_300u/expected/data/dominant.dat
development/tests/hoarding_collect_internal_300u/expected/data/in_tasks.dat
development/tests/hoarding_collect_internal_300u/expected/data/in_tasks_quality.dat
development/tests/hoarding_collect_internal_300u/expected/data/resource.dat
development/tests/hoarding_collect_internal_300u/expected/data/stats.dat
development/tests/hoarding_collect_internal_300u/expected/data/tasks.dat
development/tests/hoarding_collect_internal_300u/expected/data/tasks_quality.dat
development/tests/hoarding_collect_internal_300u/expected/data/time.dat
Modified:
development/source/main/cOrganism.cc
development/source/main/cOrganism.h
development/source/main/cPhenotype.h
Log:
Finishing up the process of placing all internal resource storage in cPhenotype.
Added corrected expected results for hoard_collect_internal_300u test.
Modified: development/source/main/cOrganism.cc
===================================================================
--- development/source/main/cOrganism.cc 2009-04-20 16:16:48 UTC (rev 3214)
+++ development/source/main/cOrganism.cc 2009-04-20 19:45:47 UTC (rev 3215)
@@ -380,9 +380,10 @@
}
}
- bool task_completed = m_phenotype.TestOutput(ctx, taskctx, globalAndDeme_resource_count, m_phenotype.GetCurRBinsAvail(),
- globalAndDeme_res_change, insts_triggered);
-
+ bool task_completed = m_phenotype.TestOutput(ctx, taskctx, globalAndDeme_resource_count,
+ m_phenotype.GetCurRBinsAvail(), globalAndDeme_res_change,
+ insts_triggered);
+
//disassemble global and deme resource counts
global_res_change = globalAndDeme_res_change.Subset(0, global_res_change.GetSize());
deme_res_change = globalAndDeme_res_change.Subset(global_res_change.GetSize(), globalAndDeme_res_change.GetSize());
@@ -395,9 +396,8 @@
m_interface->UpdateMerit(newMerit);
}
}
-
m_interface->UpdateResources(global_res_change);
-
+
//update deme resources
m_interface->UpdateDemeResources(deme_res_change);
Modified: development/source/main/cOrganism.h
===================================================================
--- development/source/main/cOrganism.h 2009-04-20 16:16:48 UTC (rev 3214)
+++ development/source/main/cOrganism.h 2009-04-20 19:45:47 UTC (rev 3215)
@@ -103,8 +103,6 @@
int m_lineage_label; // a lineages tag; inherited unchanged in offspring
cLineage* m_lineage; // A lineage descriptor... (different from label)
int cclade_id; // @MRR Coalescence clade information (set in cPopulation)
- tArray<double> m_rbins; // Holds amount of resources internal to org
- // Note: m_rbins gets its proper size in SetOrgInterface()
// Other stats
cMetaGenome m_offspring_genome; // Child genome, while under construction.
@@ -201,9 +199,8 @@
void SetCCladeLabel( int in_label ) { cclade_id = in_label; }; //@MRR
int GetCCladeLabel() const { return cclade_id; }
- const tArray<double>& GetRBins() const { return m_rbins; }
- tArray<double>& GetRBins() { return m_rbins; }
- double GetRBin(int index) { return m_rbins[index]; }
+ const tArray<double>& GetRBins() const { return m_phenotype.GetCurRBinsAvail(); }
+ double GetRBin(int index) { return m_phenotype.GetCurRBinAvail(index); }
double GetRBinsTotal();
void SetRBins(const tArray<double>& rbins_in);
void SetRBin(const int index, const double value);
Modified: development/source/main/cPhenotype.h
===================================================================
--- development/source/main/cPhenotype.h 2009-04-20 16:16:48 UTC (rev 3214)
+++ development/source/main/cPhenotype.h 2009-04-20 19:45:47 UTC (rev 3215)
@@ -343,7 +343,9 @@
const tArray<double> & GetCurTaskValue() const { assert(initialized == true); return cur_task_value; }
const tArray<double> & GetCurInternalTaskQuality() const { assert(initialized == true); return cur_internal_task_quality; }
const tArray<double>& GetCurRBinsTotal() const { assert(initialized == true); return cur_rbins_total; }
+ double GetCurRBinTotal(int index) const { assert(initialized == true); return cur_rbins_total[index]; }
const tArray<double>& GetCurRBinsAvail() const { assert(initialized == true); return cur_rbins_avail; }
+ double GetCurRBinAvail(int index) const { assert(initialized == true); return cur_rbins_avail[index]; }
const tArray<int>& GetCurReactionCount() const { assert(initialized == true); return cur_reaction_count;}
const tArray<double>& GetCurReactionAddReward() const { assert(initialized == true); return cur_reaction_add_reward;}
const tArray<int>& GetCurInstCount() const { assert(initialized == true); return cur_inst_count; }
Added: development/tests/hoarding_collect_internal_300u/expected/data/average.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/average.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/average.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,50 @@
+# Avida Average Data
+# Mon Apr 20 15:42:03 2009
+# 1: Update
+# 2: Merit
+# 3: Gestation Time
+# 4: Fitness
+# 5: Repro Rate?
+# 6: Size
+# 7: Copied Size
+# 8: Executed Size
+# 9: Abundance
+# 10: Proportion of organisms that gave birth in this update
+# 11: Proportion of Breed True Organisms
+# 12: Genotype Depth
+# 13: Generation
+# 14: Neutral Metric
+# 15: Lineage Label
+# 16: True Replication Rate (based on births/update, time-averaged)
+
+0 12424.476720 3507.027928 0.000000 0.000000 296.594756 296.594756 273.537475 1.010657 1.000285 1.000285 0.601311 0.000000 0.000000 0.000000 0.000000
+10 12424.5 3507.03 0 0 296.595 296.595 273.537 1.01066 0 0 0.601311 0 0 0 0
+20 16821.2 3606.85 0.829394 0 302.062 302.053 278.56 1.01037 0.00170989 0 0.61214 0.0319179 0.012822 0 0
+30 18142.7 3646.96 1.08055 0 304.3 304.288 280.065 1.01008 0 0 0.617161 0.0433295 0.00759952 0 0
+40 20266.2 3718.54 1.33545 0 308.222 308.098 283.353 1.01008 0.0045623 0 0.629313 0.0749929 0.0135199 0 0
+50 22504.5 3810.26 1.81297 0 313.517 313.376 287.856 1.011 0.00400687 0 0.657127 0.147968 0.0195286 0 0
+60 22922.8 3822.71 2.38855 0 314.321 314.171 289.226 1.00982 0.00428816 0 0.684677 0.214122 0.0218252 0 0
+70 24832.3 3874.95 2.97803 0 317.03 316.864 291.949 1.01153 0.00598291 0.0002849 0.719943 0.305698 0.0140549 0 0
+80 26638.3 3903.78 3.54344 0 318.168 317.991 292.89 1.01181 0.00455322 0 0.758395 0.390723 0.00315474 0 0
+90 27443.3 3921.76 3.82795 0 318.978 318.706 293.154 1.01124 0.0022805 0 0.779361 0.441277 -0.00446298 0 0
+100 29062.8 3953.66 4.10253 0 320.314 319.912 294.564 1.0118 0.00540233 0.000284333 0.802388 0.506113 -0.00193895 0 0
+110 30081.3 3985.64 4.24117 0 322.487 321.756 295.935 1.01151 0.00341394 0 0.82532 0.559886 -0.00440197 0 0
+120 30988.5 4013.11 4.32901 0 323.961 323.15 296.548 1.01184 0.000570939 0 0.837853 0.596061 -0.0136726 0 0
+130 32109.1 4042.34 4.4617 0 325.912 324.878 297.756 1.01155 0.00342466 0 0.853596 0.640696 -0.00735008 0 0
+140 34366.2 4107.49 4.70851 0 329.521 328.449 301.158 1.01005 0.00170503 0 0.889457 0.728048 -0.00497019 0 0
+150 34896.4 4128.58 4.80172 0 330.498 329.44 302.198 1.00947 0.00255827 0 0.916146 0.782547 -0.00292933 0 0
+160 35022.1 4151.33 4.8762 0 331.915 330.755 302.961 1.01033 0.00369318 0 0.94858 0.844318 -0.00558186 0 0
+170 36516.6 4204.11 5.04305 0 334.693 333.508 305.156 1.00974 0.00397389 0 0.979847 0.925915 -0.0129919 0 0
+180 37932.3 4224.93 5.23902 0 335.678 334.457 306.279 1.00916 0.00226886 0 1.01418 1.01617 -0.0141209 0 0
+190 38364.2 4226.19 5.3265 0 335.475 334.282 305.985 1.00944 0.00255174 0 1.04196 1.0706 -0.0340582 0 0
+200 38425.5 4226.94 5.37851 0 335.501 334.279 305.242 1.01032 0.00283849 0 1.05932 1.11439 -0.0320132 0 0
+210 39347 4251.84 5.48431 0 336.664 335.489 306.305 1.01121 0.00312678 0 1.08272 1.1751 -0.026676 0 0
+220 41912.4 4303.12 5.71833 0 339.598 338.422 308.569 1.01119 0.00198638 0 1.10471 1.26419 -0.0448442 0 0
+230 42046 4320.07 5.77323 0 340.39 339.13 309.579 1.01062 0.0028401 0 1.1332 1.33712 -0.0271351 0 0
+240 42246 4309.38 5.83058 0 339.925 338.402 309.083 1.01035 0.00284576 0.000284576 1.14741 1.38105 -0.0141755 0 0
+250 42313.6 4305.31 5.84727 0 339.815 338.109 308.726 1.01037 0.00285144 0 1.16025 1.41717 -0.00455939 0 0
+260 43647.7 4347.9 5.98102 0 342.463 340.454 310.713 1.01064 0.00227726 0 1.20438 1.50299 -0.00623318 0 0
+270 45620 4393.7 6.1852 0 344.618 342.867 312.717 1.00948 0.00170697 0 1.22987 1.59886 0.00564582 0 0
+280 46697.8 4415.85 6.31015 0 345.592 343.84 313.42 1.01004 0.00141965 0 1.25468 1.66922 -0.000578779 0 0
+290 46599.2 4425.26 6.30911 0 346.023 344.266 314.281 1.00918 0.00113669 0 1.27906 1.71839 -0.00702323 0 0
+300 46013.5 4417.49 6.2997 0 345.37 343.616 313.768 1.00888 0.00170406 0 1.29367 1.75462 -0.0127656 0 0
Added: development/tests/hoarding_collect_internal_300u/expected/data/count.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/count.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/count.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,50 @@
+# Avida count data
+# Mon Apr 20 15:42:03 2009
+# 1: update
+# 2: number of insts executed this update
+# 3: number of organisms
+# 4: number of different genotypes
+# 5: number of different threshold genotypes
+# 6: number of different species
+# 7: number of different threshold species
+# 8: number of different lineages
+# 9: number of births in this update
+# 10: number of deaths in this update
+# 11: number of breed true
+# 12: number of breed true organisms?
+# 13: number of no-birth organisms
+# 14: number of single-threaded organisms
+# 15: number of multi-threaded organisms
+# 16: number of modified organisms
+
+0 105270 3509 3472 5 0 0 0 3510 1 3510 3509 3509 3509 0 0
+10 105270 3509 3472 5 0 0 0 0 0 0 3509 3509 3509 0 0
+20 105270 3509 3473 5 0 0 0 6 6 0 3450 3456 3509 0 0
+30 105240 3508 3473 5 0 0 0 0 0 0 3429 3435 3508 0 0
+40 105240 3507 3472 5 0 0 0 16 17 0 3389 3413 3507 0 0
+50 104820 3494 3456 5 0 0 0 14 14 0 3284 3344 3494 0 0
+60 104940 3498 3464 6 0 0 0 15 15 0 3177 3242 3498 0 0
+70 105150 3510 3470 7 0 0 0 21 16 1 3068 3162 3510 0 0
+80 105420 3514 3473 7 0 0 0 16 16 0 2962 3079 3514 0 0
+90 105240 3508 3469 7 0 0 0 8 8 0 2892 3021 3508 0 0
+100 105420 3517 3476 8 0 0 0 19 16 1 2847 2990 3517 0 0
+110 105480 3515 3475 8 0 0 0 12 13 0 2806 2977 3515 0 0
+120 105150 3503 3462 8 0 0 0 2 4 0 2780 2954 3503 0 0
+130 105090 3504 3464 8 0 0 0 12 11 0 2757 2938 3504 0 0
+140 105540 3519 3484 8 0 0 0 6 5 0 2712 2944 3519 0 0
+150 105600 3518 3485 8 0 0 0 9 11 0 2668 2941 3518 0 0
+160 105600 3520 3484 8 0 0 0 13 13 0 2624 2931 3520 0 0
+170 105660 3523 3489 8 0 0 0 14 13 0 2582 2922 3523 0 0
+180 105810 3526 3494 9 0 0 0 8 9 0 2529 2911 3526 0 0
+190 105840 3527 3494 9 0 0 0 9 10 0 2497 2895 3527 0 0
+200 105720 3523 3487 9 0 0 0 10 11 0 2474 2876 3523 0 0
+210 105510 3518 3479 10 0 0 0 11 10 0 2446 2865 3518 0 0
+220 105720 3524 3485 10 0 0 0 7 7 0 2419 2868 3524 0 0
+230 105630 3521 3484 10 0 0 0 10 10 0 2390 2851 3521 0 0
+240 105390 3514 3478 10 0 0 0 10 9 1 2366 2842 3514 0 0
+250 105240 3507 3471 10 0 0 0 10 11 0 2349 2837 3507 0 0
+260 105330 3513 3476 10 0 0 0 8 6 0 2330 2827 3513 0 0
+270 105420 3515 3482 10 0 0 0 6 5 0 2299 2818 3515 0 0
+280 105720 3522 3487 10 0 0 0 5 7 0 2282 2823 3522 0 0
+290 105630 3519 3487 10 0 0 0 4 6 0 2259 2821 3519 0 0
+300 105660 3521 3490 10 0 0 0 6 7 0 2238 2812 3521 0 0
Added: development/tests/hoarding_collect_internal_300u/expected/data/dominant.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/dominant.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/dominant.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,50 @@
+# Avida Dominant Data
+# Mon Apr 20 15:42:03 2009
+# 1: Update
+# 2: Average Merit of the Dominant Genotype
+# 3: Average Gestation Time of the Dominant Genotype
+# 4: Average Fitness of the Dominant Genotype
+# 5: Repro Rate?
+# 6: Size of Dominant Genotype
+# 7: Copied Size of Dominant Genotype
+# 8: Executed Size of Dominant Genotype
+# 9: Abundance of Dominant Genotype
+# 10: Number of Births
+# 11: Number of Dominant Breed True?
+# 12: Dominant Gene Depth
+# 13: Dominant Breed In
+# 14: Max Fitness?
+# 15: Genotype ID of Dominant Genotype
+# 16: Name of the Dominant Genotype
+
+0 0.000000 0.000000 0.000000 inf 166 0.000000 0.000000 4 0 0 1 0 0.000000 1364830 166-aaaab
+10 0 0 0 inf 166 0 0 4 0 0 1 0 0 1364830 166-aaaab
+20 0 0 0 inf 166 0 0 4 0 0 1 0 31.1568 1364830 166-aaaab
+30 0 0 0 inf 166 0 0 4 0 0 1 0 31.1568 1364830 166-aaaab
+40 0 0 0 inf 166 0 0 4 0 0 1 0 30.7276 1364830 166-aaaab
+50 0 0 0 inf 166 0 0 4 0 0 1 0 30.7276 1364830 166-aaaab
+60 0 0 0 inf 166 0 0 3 0 0 1 0 33.6118 1364830 166-aaaab
+70 0 0 0 0 169 0 0 3 0 0 0 0 34.5295 1353934 169-aaaaa
+80 0 0 0 0 169 0 0 3 0 0 0 0 34.5295 1353934 169-aaaaa
+90 27298.8 2422 11.2712 0.000412882 169 169 167 3 1 0 0 0 36.5786 1353934 169-aaaaa
+100 27286 2422 11.2659 0.000412882 169 169 167 4 0 0 0 0 36.5786 1353934 169-aaaaa
+110 27286 2422 11.2659 0.000412882 169 169 167 4 0 0 0 0 36.5786 1353934 169-aaaaa
+120 27286 2422 11.2659 0.000412882 169 169 167 4 0 0 0 0 40.4736 1353934 169-aaaaa
+130 27286 2422 11.2659 0.000412882 169 169 167 4 0 0 0 0 40.4736 1353934 169-aaaaa
+140 27286 2422 11.2659 0.000412882 169 169 167 4 0 0 0 0 40.4736 1353934 169-aaaaa
+150 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 35.6662 1363880 178-aaaaa
+160 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 35.4816 1363880 178-aaaaa
+170 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 35.4816 1363880 178-aaaaa
+180 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 38.6489 1363880 178-aaaaa
+190 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 38.6489 1363880 178-aaaaa
+200 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 38.6489 1363880 178-aaaaa
+210 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 42.6436 1363880 178-aaaaa
+220 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 42.6436 1363880 178-aaaaa
+230 24433.6 2932 8.33342 0.000341064 178 178 159 4 0 0 0 0 42.6436 1363880 178-aaaaa
+240 28131.2 2932 9.59455 0.000341064 178 177.75 159 5 1 1 0 0 46.0039 1363880 178-aaaaa
+250 28830.3 2932 9.83298 0.000341064 178 177.8 159 4 0 0 0 0 46.0039 1363880 178-aaaaa
+260 28369.4 2932 9.67579 0.000341064 178 177.667 159 4 0 0 0 0 46.0039 1363880 178-aaaaa
+270 28369.4 2932 9.67579 0.000341064 178 177.667 159 4 0 0 0 0 46.0039 1363880 178-aaaaa
+280 28369.4 2932 9.67579 0.000341064 178 177.667 159 4 0 0 0 0 48.5046 1363880 178-aaaaa
+290 28369.4 2932 9.67579 0.000341064 178 177.667 159 4 0 0 0 0 48.5046 1363880 178-aaaaa
+300 28369.4 2932 9.67579 0.000341064 178 177.667 159 4 0 0 0 0 48.5046 1363880 178-aaaaa
Added: development/tests/hoarding_collect_internal_300u/expected/data/in_tasks.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/in_tasks.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/in_tasks.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,47 @@
+# Avida tasks data: tasks performed with internal resources
+# Mon Apr 20 15:42:03 2009
+# First column gives the current update, next columns give the number
+# of organisms that have the particular task, performed with internal resources,
+# as a component of their merit
+# 1: Update
+# 2: Not
+# 3: Nand
+# 4: And
+# 5: OrNot
+# 6: Or
+# 7: AndNot
+# 8: Nor
+# 9: Xor
+# 10: Equals
+
+0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0
+20 108 108 112 112 112 108 2 108 112
+30 144 146 152 152 152 144 2 144 152
+40 177 177 197 197 197 175 4 173 197
+50 218 218 306 286 293 216 5 213 295
+60 250 250 474 400 427 248 5 245 435
+70 327 316 617 522 557 311 14 313 583
+80 428 412 736 649 683 404 62 427 725
+90 488 472 807 727 772 459 94 488 818
+100 549 539 847 788 842 522 120 555 883
+110 584 572 876 815 872 556 121 588 906
+120 598 584 884 827 884 568 128 600 917
+130 620 606 902 851 902 592 131 622 939
+140 654 634 938 890 926 622 129 651 968
+150 664 642 957 913 944 631 128 658 983
+160 678 652 978 924 970 644 126 668 1012
+170 692 667 996 944 981 658 124 680 1043
+180 718 694 1022 965 1005 681 133 699 1055
+190 726 709 1029 973 1022 698 140 713 1075
+200 743 726 1036 995 1032 709 147 727 1087
+210 752 736 1030 995 1030 713 150 734 1099
+220 774 755 1052 1022 1059 736 147 754 1120
+230 782 756 1067 1012 1063 739 148 756 1127
+240 781 755 1063 1002 1060 736 153 754 1132
+250 779 748 1061 994 1060 730 148 745 1121
+260 794 762 1082 1009 1059 745 143 760 1132
+270 828 790 1110 1024 1074 775 142 789 1144
+280 852 814 1125 1035 1098 797 146 811 1161
+290 847 804 1136 1042 1096 788 141 803 1157
+300 844 796 1132 1049 1097 781 151 803 1166
Added: development/tests/hoarding_collect_internal_300u/expected/data/in_tasks_quality.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/in_tasks_quality.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/in_tasks_quality.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,55 @@
+# Avida tasks quality data: tasks performed using internal resources
+# Mon Apr 20 15:42:03 2009
+# First column gives the current update, rest give average and max task quality
+# for those tasks performed using internal resources
+# 1: Update
+# 2: Not Average
+# 3: Not Max
+# 4: Nand Average
+# 5: Nand Max
+# 6: And Average
+# 7: And Max
+# 8: OrNot Average
+# 9: OrNot Max
+# 10: Or Average
+# 11: Or Max
+# 12: AndNot Average
+# 13: AndNot Max
+# 14: Nor Average
+# 15: Nor Max
+# 16: Xor Average
+# 17: Xor Max
+# 18: Equals Average
+# 19: Equals Max
+
+0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 47.5 56 47.4352 61 46.6964 61 53.9196 74 46.7232 59 47.3611 58 1 1 47.1667 57 46.5 58
+30 47.9097 57 46.9589 61 46.9079 61 53.9474 74 47.125 60 47.3403 58 1 1 47.3611 57 46.6711 58
+40 46.9774 65 46.1243 61 45.6701 57 53.9391 75 46.9848 70 46.7543 58 1.5 2 46.7457 57 45.7716 60
+50 45.4771 65 44.578 58 35.0948 57 44.5175 75 37.8669 70 44.8843 58 1.2 2 44.8169 60 36.5186 60
+60 41.684 65 40.868 58 23.9283 58 33.35 75 27.4356 70 40.996 58 1.2 2 40.7469 60 26.0552 60
+70 37.9327 70 36.9209 58 20.7796 59 28.7165 75 23.5655 70 37.3666 59 5.57143 9 36.7188 60 22.1029 60
+80 33.3294 84 32.3883 60 19.5272 60 26.1479 75 21.7204 70 32.9381 63 8.01613 15 31.1194 60 20.3614 60
+90 31.084 84 30.4131 110 18.6679 60 25.1527 76 20.4819 70 30.4641 63 9.2766 15 28.8627 60 19.2824 60
+100 30.3862 84 29.4583 110 19.1063 60 25.1244 76 20.3456 66 29.6188 63 9.7 15 28.1712 61 19.3715 60
+110 30.0462 84 29.201 110 19.3059 60 25.292 76 20.531 64 29.473 63 9.61983 15 28.0969 61 19.6015 60
+120 30.2609 84 29.1729 110 19.6075 60 25.8247 76 20.9706 64 29.5599 58 9.42969 15 28.3333 61 19.9651 59
+130 30.4065 84 29.4439 110 19.9823 60 26.1575 76 21.337 64 29.7703 59 9.30534 15 28.3923 61 20.2098 59
+140 31.5703 84 30.2382 110 20.6844 60 26.6517 76 22.108 64 30.5852 59 9.20155 15 29.1797 61 20.9638 59
+150 31.5256 84 30.2134 110 20.7074 59 26.3834 76 22.0773 64 30.4897 59 9.1875 15 29.2295 59 21.0315 60
+160 31.4882 84 30.1028 110 20.9243 59 26.6656 76 22.1082 64 30.1196 59 9.19841 15 28.976 59 20.9447 60
+170 32.1344 84 30.7016 110 21.4568 59 27.2638 76 22.7931 64 30.6915 59 9.31452 15 29.7397 59 21.1256 60
+180 31.844 84 30.4669 110 21.4932 59 27.5026 76 22.9104 64 30.6006 59 9.40602 16 30.0129 58 21.4436 60
+190 31.5413 84 30.2595 110 21.689 59 27.8808 76 22.9286 65 30.2564 59 9.52857 16 29.6914 58 21.3814 60
+200 31.1952 84 29.7851 110 21.6853 59 27.5146 78 22.8207 68 30.0056 59 9.5034 16 29.3549 58 21.3054 60
+210 31.4574 84 29.8043 110 22.1165 59 27.9196 81 23.2728 74 30.2525 60 9.57333 16 29.5708 59 21.4941 61
+220 31.8269 84 30.5192 110 22.9848 59 28.8865 81 24.0765 74 30.8981 60 9.5102 16 30.2984 59 22.3527 61
+230 31.5512 84 30.0251 110 22.5201 59 28.8587 81 23.7902 74 30.5061 60 9.39865 16 29.9299 59 22.0098 61
+240 31.2983 80 29.7576 110 22.206 59 28.8273 81 23.6132 74 30.2799 60 9.26797 16 29.7122 59 21.6016 61
+250 31.4814 80 29.9933 110 22.0999 60 28.7616 81 23.4113 74 30.411 60 9.27703 16 29.9852 59 21.6262 61
+260 32.1889 80 30.5656 110 22.4732 60 29.1328 81 24.203 74 31.0174 60 9.32867 16 30.6961 59 22.1537 61
+270 32.5857 80 31.2177 110 22.8694 60 29.8916 81 24.8836 74 31.5432 60 9.23239 16 31.3739 60 22.8872 60
+280 32.5164 80 31.2101 110 23.2133 60 30.3121 81 24.9781 74 31.6349 60 9.02055 16 31.4686 60 23.1714 60
+290 32.4215 80 31.3172 110 22.9974 60 30.0605 80 24.9599 73 31.6206 60 9.00709 16 31.4844 60 23.1746 60
+300 32.0095 80 31.1219 110 22.7014 60 29.5739 83 24.6572 78 31.3163 60 8.92715 16 30.9215 60 22.7196 60
Added: development/tests/hoarding_collect_internal_300u/expected/data/resource.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/resource.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/resource.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,46 @@
+# Avida resource data
+# Mon Apr 20 15:42:03 2009
+# First column gives the current update, all further columns give the quantity
+# of the particular resource at that update.
+# 1: Update
+# 2: resNOT
+# 3: resNAND
+# 4: resAND
+# 5: resORN
+# 6: resOR
+# 7: resANDN
+# 8: resNOR
+# 9: resXOR
+# 10: resEQU
+
+0 40.674772 52.826657 48.072066 63.072185 58.693057 61.505473 63.941590 63.611032 63.566650
+10 36.5427 39.3121 16.9546 29.8021 16.5729 37.0416 41.445 36.3153 21.6218
+20 40.064 41.1746 19.8388 30.8799 20.7245 40.8579 50.9474 41.5359 27.4887
+30 33.2441 37.0214 20.2125 28.3397 20.289 36.7492 40.3292 36.0783 25.6005
+40 41.1553 44.48 24.7205 37.8171 25.6777 45.0643 79.7729 46.5473 32.8205
+50 37.8119 37.5189 23.2515 29.1222 24.0726 39.0438 41.9733 39.9615 30.2046
+60 37.3575 40.1449 23.7069 29.3879 24.8205 40.5289 58.2721 39.1694 29.0737
+70 36.1872 40.3915 24.6316 30.9394 25.7398 41.0348 69.096 41.1232 31.5197
+80 34.0276 40.1013 24.0301 30.2824 25.1317 39.4651 72.1453 40.4723 30.5121
+90 33.5563 38.1076 25.0324 28.1363 24.7603 37.5512 67.2583 36.7875 29.3555
+100 36.5244 41.5284 23.6412 30.6987 24.6785 41.1028 82.7284 41.4077 30.8857
+110 42.5646 57.2268 27.924 27.9815 25.4241 55.6242 89.5554 56.0335 30.8686
+120 38.252 40.4777 27.483 28.9756 25.7088 38.8259 63.0639 39.5441 29.7022
+130 34.8825 35.44 24.4564 29.259 26.2512 37.1311 65.5649 34.8307 30.1016
+140 33.4396 34.4837 25.7591 27.3456 25.821 36.5748 53.9427 37.1852 29.6104
+150 32.7285 34.1308 25.3646 27.4176 24.3784 34.3284 61.7217 35.2865 29.7789
+160 33.5805 33.6548 25.0965 28.5613 26.6012 34.4302 47.5886 34.723 30.2798
+170 36.6539 40.6148 24.5169 29.294 25.5114 39.9089 131.067 41.404 33.5017
+180 42.2624 42.3065 29.1893 29.7558 29.3852 42.928 91.796 43.546 32.4975
+190 34.949 37.2156 24.129 28.8282 26.4527 36.3144 89.8872 38.1571 30.7393
+200 32.5616 35.2531 24.9564 28.4397 27.2315 36.3664 68.944 36.2439 29.8067
+210 36.239 38.4186 27.57 29.3057 26.1544 39.8129 78.6737 39.6436 30.3421
+220 34.4917 39.5585 26.9585 30.5339 27.4186 42.1365 142.288 39.6216 33.8213
+230 34.2904 36.2921 25.0244 30.079 27.5359 38.1808 154.654 37.4294 30.3212
+240 35.1905 38.2034 27.0752 27.2132 27.754 36.4087 54.3838 37.251 32.2651
+250 34.8501 36.8362 25.2966 27.8671 26.2756 36.5078 69.0913 36.4123 29.3503
+260 35.9892 38.4414 25.3511 29.3181 26.7099 37.3426 75.7507 38.7023 31.2108
+270 35.0233 38.2584 27.6413 28.7482 28.3643 35.9963 50.67 36.1838 31.5487
+280 39.1742 35.2135 27.1999 27.5432 25.9328 37.6718 62.796 52.4266 31.4584
+290 35.4073 35.808 25.7784 27.1262 25.5211 34.2153 83.9823 36.3898 29.8749
+300 33.1973 34.5669 26.9932 26.7895 25.5896 35.6292 103.33 35.2514 29.1355
Added: development/tests/hoarding_collect_internal_300u/expected/data/stats.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/stats.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/stats.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,46 @@
+# Generic Statistics Data
+# Mon Apr 20 15:42:03 2009
+# 1: update
+# 2: average inferiority (energy)
+# 3: ave probability of any mutations in genome
+# 4: probability of any mutations in dom genome
+# 5: log(average fidelity)
+# 6: log(dominant fidelity)
+# 7: change in number of genotypes
+# 8: genotypic entropy
+# 9: species entropy
+# 10: depth of most reacent coalescence
+# 11: Total number of resamplings this generation
+# 12: Total number of organisms that failed to resample this generation
+
+0 0.000000 0.894857 0.729051 2.252433 1.305826 3472 8.147776 0.000000 0 0 0
+10 0 0.894857 0.729051 2.25243 1.30583 0 8.14778 0 0 0 0
+20 0 0.898942 0.729051 2.29206 1.30583 0 8.14817 0 1 0 0
+30 0 0.900568 0.729051 2.30828 1.30583 0 8.14828 0 1 0 0
+40 0 0.903355 0.729051 2.33671 1.30583 -1 8.14799 0 1 0 0
+50 0 0.906994 0.729051 2.37509 1.30583 0 8.14303 0 1 0 0
+60 0 0.907534 0.729051 2.38092 1.30583 0 8.14587 0 1 0 0
+70 0 0.909333 0.73488 2.40056 1.32757 3 8.14698 0 0 0 0
+80 0 0.910077 0.73488 2.4088 1.32757 1 8.14759 0 0 0 0
+90 1.07992 0.910604 0.73488 2.41467 1.32757 1 8.14679 0 0 0 0
+100 1.01018 0.911465 0.73488 2.42436 1.32757 2 8.14812 0 0 0 0
+110 0.976942 0.912849 0.73488 2.44011 1.32757 0 8.14793 0 0 0 0
+120 0.956442 0.913775 0.73488 2.45079 1.32757 -2 8.14406 0 0 0 0
+130 0.926251 0.914986 0.73488 2.46494 1.32757 1 8.14475 0 0 0 0
+140 0.872409 0.917181 0.73488 2.49109 1.32757 1 8.15121 0 0 0 0
+150 0.5513 0.917765 0.751623 2.49818 1.39281 -2 8.15195 0 0 0 0
+160 0.535907 0.918605 0.751623 2.50845 1.39281 0 8.15135 0 0 0 0
+170 0.502263 0.920228 0.751623 2.52858 1.39281 1 8.153 0 0 0 0
+180 0.464139 0.920796 0.751623 2.53573 1.39281 -1 8.1545 0 0 0 0
+190 0.44758 0.920679 0.751623 2.53425 1.39281 -1 8.15439 0 0 0 0
+200 0.437862 0.920694 0.751623 2.53444 1.39281 -1 8.15206 0 0 0 0
+210 0.418382 0.92136 0.751623 2.54287 1.39281 1 8.14929 0 0 0 0
+220 0.376597 0.923015 0.751623 2.56414 1.39281 0 8.15102 0 0 0 0
+230 0.367043 0.923455 0.751623 2.56988 1.39281 0 8.15094 0 0 0 0
+240 0.498077 0.923197 0.751623 2.56651 1.39281 0 8.149 0 0 0 0
+250 0.519767 0.923135 0.751623 2.56571 1.39281 -1 8.14729 0 0 0 0
+260 0.481035 0.924597 0.751623 2.58491 1.39281 2 8.14863 0 0 0 0
+270 0.447468 0.925766 0.751623 2.60053 1.39281 1 8.15069 0 0 0 0
+280 0.427467 0.926288 0.751623 2.60758 1.39281 -2 8.15192 0 0 0 0
+290 0.427632 0.926517 0.751623 2.61071 1.39281 -2 8.15239 0 0 0 0
+300 0.429125 0.926169 0.751623 2.60598 1.39281 -1 8.15336 0 0 0 0
Added: development/tests/hoarding_collect_internal_300u/expected/data/tasks.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/tasks.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/tasks.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,46 @@
+# Avida tasks data
+# Mon Apr 20 15:42:03 2009
+# First column gives the current update, next columns give the number
+# of organisms that have the particular task as a component of their merit
+# 1: Update
+# 2: Not
+# 3: Nand
+# 4: And
+# 5: OrNot
+# 6: Or
+# 7: AndNot
+# 8: Nor
+# 9: Xor
+# 10: Equals
+
+0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0
+20 108 108 112 112 112 108 2 108 112
+30 144 146 152 152 152 144 2 144 152
+40 177 177 197 197 197 175 4 173 197
+50 218 218 322 324 324 216 5 213 320
+60 250 250 542 544 544 248 5 245 540
+70 337 316 730 731 731 315 14 313 726
+80 462 430 901 917 917 429 62 427 912
+90 525 494 982 1023 1021 490 94 488 1016
+100 590 563 1031 1095 1093 559 120 555 1089
+110 626 598 1059 1124 1122 592 121 588 1116
+120 641 611 1068 1135 1134 608 128 600 1126
+130 663 633 1085 1153 1152 634 131 622 1142
+140 698 663 1122 1189 1188 666 129 651 1176
+150 707 669 1136 1203 1204 672 128 658 1193
+160 719 679 1161 1228 1224 683 126 668 1216
+170 736 693 1188 1255 1247 695 124 680 1240
+180 761 716 1216 1287 1277 715 133 699 1268
+190 772 732 1233 1310 1295 730 140 713 1285
+200 788 746 1245 1324 1308 744 147 727 1298
+210 797 754 1244 1327 1310 750 150 734 1301
+220 817 775 1267 1350 1330 770 147 754 1321
+230 824 776 1273 1353 1333 773 148 756 1319
+240 826 778 1273 1358 1332 770 153 754 1322
+250 821 769 1269 1350 1325 761 148 745 1317
+260 836 783 1289 1364 1340 777 143 760 1333
+270 866 809 1313 1386 1363 807 142 789 1355
+280 888 833 1330 1403 1380 830 146 811 1372
+290 886 826 1335 1405 1374 823 141 803 1369
+300 890 825 1342 1415 1379 823 151 803 1373
Added: development/tests/hoarding_collect_internal_300u/expected/data/tasks_quality.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/tasks_quality.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/tasks_quality.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,54 @@
+# Avida tasks quality data
+# Mon Apr 20 15:42:03 2009
+# First column gives the current update, rest give average and max task quality
+# 1: Update
+# 2: Not Average
+# 3: Not Max
+# 4: Nand Average
+# 5: Nand Max
+# 6: And Average
+# 7: And Max
+# 8: OrNot Average
+# 9: OrNot Max
+# 10: Or Average
+# 11: Or Max
+# 12: AndNot Average
+# 13: AndNot Max
+# 14: Nor Average
+# 15: Nor Max
+# 16: Xor Average
+# 17: Xor Max
+# 18: Equals Average
+# 19: Equals Max
+
+0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 54.787 65 54.3981 65 53.6161 65 108.777 130 54.4911 65 54.1296 65 1 1 54.2963 65 53.4732 65
+30 55.3611 65 54.2534 65 54.3289 65 109.441 130 54.9276 65 54.6597 65 1 1 54.8472 65 54.1118 65
+40 55.1017 108 53.4746 65 53.4162 65 110.574 161 56.6142 108 53.9714 65 2 3 54.4798 65 53.1675 65
+50 52.8716 108 51.4404 65 81.5155 182 79.8889 161 83.037 182 51.7824 65 1.4 3 52.4413 65 60.2313 91
+60 49.104 112 47.8 110 101.351 182 50.0662 161 102.028 182 47.2944 65 1.4 3 47.8327 65 62.5778 91
+70 43.632 112 43.4525 110 99.7014 182 41.8728 161 100.083 182 42.6127 65 6.14286 9 42.9073 65 59.8127 91
+80 37.4805 127 37.4 110 91.7891 184 37.9902 161 90.8168 183 36.1888 65 8.95161 16 36.356 65 54.2511 91
+90 35.5543 127 36.9636 659 88.5346 184 36.8788 206 86.2547 183 33.4388 64 10.3723 16 33.541 65 51.5049 91
+100 34.9678 127 35.5115 659 85.4869 184 37.3361 206 82.1153 183 32.8909 146 10.9917 16 32.5766 65 49.6281 91
+110 34.6821 127 35.1304 659 83.6789 184 37.8407 206 80.434 183 32.7635 146 10.8678 16 32.4626 65 48.9937 91
+120 34.7613 127 35.0704 659 82.5974 182 38.5075 206 79.4365 182 33.6579 308 10.6641 16 32.4917 65 48.6146 91
+130 35.0015 127 35.2844 659 81.6037 182 39.3252 206 78.4141 182 35.6861 342 10.5038 16 32.7331 65 48.3818 91
+140 36.0673 127 34.9804 659 81.467 182 40.635 206 78.3746 182 36.7838 342 10.3643 16 33.7081 65 48.8299 91
+150 36.0368 127 35.0568 659 82.2289 182 40.8238 206 78.8306 182 36.8378 342 10.4688 16 33.772 65 49.1006 91
+160 36.3213 127 34.8218 659 82.1189 182 41.1311 206 78.8701 182 36.8082 342 10.6032 16 33.5554 64 49.0938 91
+170 37.2269 164 35.5397 659 82.431 182 42.2757 206 79.4298 182 37.5871 342 10.7177 16 34.425 64 49.5992 91
+180 37.0026 164 35.514 659 82.1711 182 42.4491 206 79.0908 182 37.6531 342 10.7895 16 34.5737 64 49.5055 91
+190 36.5803 164 35.2719 659 81.4282 182 42.6443 206 78.2116 182 36.9384 342 10.95 16 34.2258 64 49.0669 91
+200 36.3972 164 34.9732 659 80.388 182 42.5431 206 77.2148 182 36.1196 342 10.8095 16 33.8019 64 48.51 91
+210 36.5997 164 35.4178 659 80.3392 182 43.1304 206 77.0008 182 36.2813 342 11.08 16 33.9755 64 48.4543 91
+220 37.1493 164 36.1987 659 79.4665 182 45.0104 206 76.5301 182 37.0169 342 11.0612 16 34.7878 64 48.5602 91
+230 37.1954 164 35.7526 659 79.4627 182 44.6881 189 76.5431 182 36.9573 342 10.9527 16 34.3214 64 48.4139 91
+240 36.9262 164 35.3458 659 79.9788 182 44.0847 189 77.0143 182 36.6766 342 10.7908 16 34.0358 64 48.3048 91
+250 37.078 164 35.6307 659 80.7928 182 43.7815 189 77.7721 182 36.9501 342 10.7838 16 34.3248 64 48.6644 91
+260 37.6986 164 36.2874 659 80.9527 218 44.5594 189 77.759 182 37.9524 342 10.8741 16 35.0539 64 48.9055 91
+270 38.1894 164 37.0828 659 80.3823 182 45.6335 189 77.3676 182 38.8538 342 10.7676 16 35.7655 64 49.0967 91
+280 38.0394 164 37.1369 659 79.5925 182 46.1953 189 76.6486 182 39.5229 342 10.5342 16 35.9186 64 48.8936 91
+290 37.746 164 37.0969 659 80.024 182 46.4847 197 77.2846 182 39.4714 342 10.4823 16 35.8904 64 49.0906 91
+300 37.1438 164 36.6667 659 79.9948 182 46.3859 314 77.0964 182 38.932 342 10.457 16 35.3325 64 48.8594 91
Added: development/tests/hoarding_collect_internal_300u/expected/data/time.dat
===================================================================
--- development/tests/hoarding_collect_internal_300u/expected/data/time.dat (rev 0)
+++ development/tests/hoarding_collect_internal_300u/expected/data/time.dat 2009-04-20 19:45:47 UTC (rev 3215)
@@ -0,0 +1,38 @@
+# Avida time data
+# Mon Apr 20 15:42:03 2009
+# 1: update
+# 2: avida time
+# 3: average generation
+# 4: num_executed?
+
+0 0.000000 0.000000 105270
+10 0.000804863 0 105270
+20 0.00156466 0.0319179 105270
+30 0.00212404 0.0433295 105240
+40 0.00266133 0.0749929 105240
+50 0.00312254 0.147968 104820
+60 0.00356408 0.214122 104940
+70 0.00399405 0.305698 105150
+80 0.00438125 0.390723 105420
+90 0.00474918 0.441277 105240
+100 0.00511205 0.506113 105420
+110 0.00544779 0.559886 105480
+120 0.00577337 0.596061 105150
+130 0.00609471 0.640696 105090
+140 0.00639567 0.728048 105540
+150 0.00668388 0.782547 105600
+160 0.00697114 0.844318 105600
+170 0.00725287 0.925915 105660
+180 0.00752088 1.01617 105810
+190 0.00778059 1.0706 105840
+200 0.0080411 1.11439 105720
+210 0.00829967 1.1751 105510
+220 0.00854689 1.26419 105720
+230 0.00878331 1.33712 105630
+240 0.00902248 1.38105 105390
+250 0.00925978 1.41717 105240
+260 0.00949449 1.50299 105330
+270 0.0097189 1.59886 105420
+280 0.00993465 1.66922 105720
+290 0.0101487 1.71839 105630
+300 0.0103648 1.75462 105660
More information about the Avida-cvs
mailing list