[Avida-cvs] [Avida2-svn] r386 - in development/source: analyze event main support testsuites/functional_testsuites/default.md5sum testsuites/functional_testsuites/default.tail testsuites/functional_testsuites/default.tail.disabled testsuites/functional_testsuites/tedious.tail.disabled
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed Nov 9 18:28:28 PST 2005
Author: brysonda
Date: 2005-11-09 21:28:28 -0500 (Wed, 09 Nov 2005)
New Revision: 386
Modified:
development/source/analyze/cAnalyzeUtil.cc
development/source/analyze/cAnalyzeUtil.h
development/source/event/cEventManager.cc
development/source/main/cAvidaConfig.h
development/source/main/cFitnessMatrix.cc
development/source/main/cStats.cc
development/source/main/cStats.h
development/source/support/avida.cfg
development/source/support/genesis
development/source/support/genesis.4stack
development/source/support/genesis.smt
development/source/testsuites/functional_testsuites/default.md5sum/genesis
development/source/testsuites/functional_testsuites/default.tail.disabled/genesis
development/source/testsuites/functional_testsuites/default.tail/genesis
development/source/testsuites/functional_testsuites/tedious.tail.disabled/genesis
Log:
Convert over additional output files to use the data manager. Remove unused config parameter.
Modified: development/source/analyze/cAnalyzeUtil.cc
===================================================================
--- development/source/analyze/cAnalyzeUtil.cc 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/analyze/cAnalyzeUtil.cc 2005-11-10 02:28:28 UTC (rev 386)
@@ -446,8 +446,8 @@
* histograms.
**/
-void cAnalyzeUtil::PrintDetailedFitnessData(cWorld* world, ofstream &datafp,
- ofstream & hist_fp, ofstream & histo_testCPU_fp, bool save_max_f_genotype,
+void cAnalyzeUtil::PrintDetailedFitnessData(cWorld* world, cString& datafn,
+ cString& hist_fn, cString& histo_testCPU_fn, bool save_max_f_genotype,
bool print_fitness_histo, double hist_fmax, double hist_fstep)
{
cPopulation* pop = &world->GetPopulation();
@@ -521,14 +521,15 @@
max_f_name.Set("%03d-no_name-u%i", max_f_genotype->GetLength(),
update );
- datafp << update << " " // 1 update
- << generation << " " // 2 generation
- << fave/ (double) n << " " // 3 average fitness
- << fave_testCPU/ (double) n << " " // 4 average test fitness
- << n << " " // 5 organism total
- << max_fitness << " " // 6 maximum fitness
- << max_f_name() << " " // 7 maxfit genotype name
- << endl;
+ world->GetDataFileOFStream(datafn)
+ << update << " " // 1 update
+ << generation << " " // 2 generation
+ << fave/ (double) n << " " // 3 average fitness
+ << fave_testCPU/ (double) n << " " // 4 average test fitness
+ << n << " " // 5 organism total
+ << max_fitness << " " // 6 maximum fitness
+ << max_f_name() << " " // 7 maxfit genotype name
+ << endl;
if (save_max_f_genotype) {
char filename[40];
@@ -537,24 +538,26 @@
}
if (print_fitness_histo) {
- hist_fp << update << " " // 1 update
+ ofstream& hist_fp = world->GetDataFileOFStream(hist_fn);
+ hist_fp
+ << update << " " // 1 update
<< generation << " " // 2 generation
<< fave/ (double) n << " "; // 3 average fitness
// now output the fitness histo
vector<int>::const_iterator it = histo.begin();
- for ( ; it != histo.end(); it++ )
- hist_fp << (double) (*it) / (double) nhist_tot << " ";
+ for ( ; it != histo.end(); it++ ) hist_fp << (double) (*it) / (double) nhist_tot << " ";
hist_fp << endl;
- histo_testCPU_fp << update << " " // 1 update
- << generation << " " // 2 generation
- << fave_testCPU/ (double) n << " "; // 3 average fitness
+ ofstream& histo_testCPU_fp = world->GetDataFileOFStream(histo_testCPU_fn);
+ histo_testCPU_fp
+ << update << " " // 1 update
+ << generation << " " // 2 generation
+ << fave_testCPU/ (double) n << " "; // 3 average fitness
// now output the fitness histo
it = histo_testCPU.begin();
- for ( ; it != histo_testCPU.end(); it++ )
- histo_testCPU_fp << (double) (*it) / (double) nhist_tot_testCPU << " ";
+ for (; it != histo_testCPU.end(); it++) histo_testCPU_fp << (double) (*it) / (double) nhist_tot_testCPU << " ";
histo_testCPU_fp << endl;
}
}
Modified: development/source/analyze/cAnalyzeUtil.h
===================================================================
--- development/source/analyze/cAnalyzeUtil.h 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/analyze/cAnalyzeUtil.h 2005-11-10 02:28:28 UTC (rev 386)
@@ -14,6 +14,7 @@
class cInstSet;
class cPopulation;
class cWorld;
+class cString;
// This is a static class used to do various forms of complex analysis
// on genomes.
@@ -47,8 +48,8 @@
double sample_prob=1, bool landscape=false,
bool save_genotype=false);
- static void PrintDetailedFitnessData(cWorld* world, std::ofstream & datafp,
- std::ofstream & histofp, std::ofstream & histo_testCPU_fp, bool save_max_f_genotype,
+ static void PrintDetailedFitnessData(cWorld* world, cString& datafn,
+ cString& histofn, cString& histo_testCPU_fn, bool save_max_f_genotype,
bool print_fitness_histo, double hist_fmax, double hist_fstep);
static void PrintGeneticDistanceData(cWorld* world, std::ofstream & fp,
Modified: development/source/event/cEventManager.cc
===================================================================
--- development/source/event/cEventManager.cc 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/event/cEventManager.cc 2005-11-10 02:28:28 UTC (rev 386)
@@ -2550,14 +2550,7 @@
}
///// print_detailed_fitness_data /////
void Process(){
- static ofstream datafile(filename());
- static ofstream histofile;
- static ofstream histofile_testCPU;
- if (print_fitness_histo && !histofile.is_open()){
- histofile.open(filename2());
- histofile_testCPU.open(filename3());
- }
- cAnalyzeUtil::PrintDetailedFitnessData(m_world, datafile, histofile, histofile_testCPU, save_max_f_genotype, print_fitness_histo, hist_fmax, hist_fstep );
+ cAnalyzeUtil::PrintDetailedFitnessData(m_world, filename, filename2, filename3, save_max_f_genotype, print_fitness_histo, hist_fmax, hist_fstep );
}
};
Modified: development/source/main/cAvidaConfig.h
===================================================================
--- development/source/main/cAvidaConfig.h 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/main/cAvidaConfig.h 2005-11-10 02:28:28 UTC (rev 386)
@@ -255,7 +255,6 @@
CONFIG_ADD_VAR(LOG_GENOTYPES, int, 0, "0 = off, 1 = print ALL, 2 = print threshold ONLY.");
CONFIG_ADD_VAR(LOG_THRESHOLD, bool, 0, "0/1 (off/on) toggle to print file.");
CONFIG_ADD_VAR(LOG_SPECIES, bool, 0, "0/1 (off/on) toggle to print file.");
- CONFIG_ADD_VAR(LOG_LANDSCAPE, bool, 0, "0/1 (off/on) toggle to print file.");
CONFIG_ADD_GROUP(LINEAGE_GROUP, "Lineage\nNOTE: This should probably be called \"Clade\"\nThis one can slow down avida a lot. It is used to get an idea of how\noften an advantageous mutation arises, and where it goes afterwards.\nLineage creation options are. Works only when LOG_LINEAGES is set to 1.\n 0 = manual creation (on inject, use successive integers as lineage labels).\n 1 = when a child's (potential) fitness is higher than that of its parent.\n 2 = when a child's (potential) fitness is higher than max in population.\n 3 = when a child's (potential) fitness is higher than max in dom. lineage\n*and* the child is in the dominant lineage, or (2)\n 4 = when a child's (potential) fitness is higher than max in dom. lineage\n(and that of its own lineage)\n 5 = same as child's (potential) fitness is higher than that of the\n currently dominant organism, and also than that of any organism\n currently in the same lineage.\n 6 = when a child's (potential) f!
itness is higher than any organism\n currently in the same lineage.\n 7 = when a child's (potential) fitness is higher than that of any\n organism in its line of descent");
CONFIG_ADD_VAR(LOG_LINEAGES, bool, 0, "");
Modified: development/source/main/cFitnessMatrix.cc
===================================================================
--- development/source/main/cFitnessMatrix.cc 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/main/cFitnessMatrix.cc 2005-11-10 02:28:28 UTC (rev 386)
@@ -617,53 +617,22 @@
m_fitness_threshhold = m_start_genotype.GetFitness() * m_fitness_threshold_ratio;
- /* open files for output */
-
- ofstream log_file("fitness_matrix.log");
- ofstream genotype_file("found_genotypes.dat");
- ofstream fit_vect_file("fitness_vect.dat");
-
- ofstream ham_vect_file;
- if (write_ham_vector)
- ham_vect_file.open("hamming_vect.dat");
- ofstream full_vect_file;
- if (write_full_vector)
- full_vect_file.open("full_vect.dat");
-
-
/* do the depth first search */
+ CollectData(m_world->GetDataFileOFStream("fitness_matrix.log"));
+ PrintGenotypes(m_world->GetDataFileOFStream("found_genotypes.dat"));
- CollectData(log_file);
- PrintGenotypes(genotype_file);
- genotype_file.close();
-
-
/* diagonalize transition matrices at different copy error rates */
-
for (double error = m_error_rate_min; error <= m_error_rate_max; error += m_error_rate_step)
- {
- vector<double> dataVect;
+ {
+ vector<double> dataVect;
+ double avg_fitness = Diagonalize(dataVect, m_ham_thresh, error, log_file);
- double avg_fitness = Diagonalize(dataVect, m_ham_thresh, error, log_file);
+ PrintFitnessVector(m_world->GetDataFileOFStream("fitness_vect.dat"), dataVect, error, avg_fitness, output_start, output_step);
- PrintFitnessVector(fit_vect_file, dataVect, error, avg_fitness, output_start, output_step);
-
- if ( write_ham_vector )
- PrintHammingVector(ham_vect_file, dataVect, error, avg_fitness);
-
- if ( write_full_vector )
- PrintFullVector(full_vect_file, dataVect, error, avg_fitness);
-
- }
-
-
- /* close remaining files */
-
- log_file.close();
- fit_vect_file.close();
- if ( write_ham_vector )
- ham_vect_file.close();
- if ( write_full_vector )
- full_vect_file.close();
+ if (write_ham_vector)
+ PrintHammingVector(m_world->GetDataFileOFStream("hamming_vect.dat"), dataVect, error, avg_fitness);
+ if (write_full_vector)
+ PrintFullVector(m_world->GetDataFileOFStream("full_vect.dat"), dataVect, error, avg_fitness);
+ }
}
Modified: development/source/main/cStats.cc
===================================================================
--- development/source/main/cStats.cc 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/main/cStats.cc 2005-11-10 02:28:28 UTC (rev 386)
@@ -83,23 +83,6 @@
, tot_lineages(0)
, tot_executed(0)
{
- // Open log files.
-
- if (m_world->GetConfig().LOG_CREATURES.Get()) fp_creature_log.open("creature.log");
- else fp_creature_log.close();
-
- if (m_world->GetConfig().LOG_GENOTYPES.Get()) fp_genotype_log.open("genotype.log");
- else fp_genotype_log.close();
-
- if (m_world->GetConfig().LOG_THRESHOLD.Get()) fp_threshold_log.open("threshold.log");
- else fp_threshold_log.close();
-
- if (m_world->GetConfig().LOG_SPECIES.Get()) fp_species_log.open("species.log");
- else fp_species_log.close();
-
- if (m_world->GetConfig().LOG_LINEAGES.Get()) fp_lineage_log.open("lineage.log");
- else fp_lineage_log.close();
-
task_cur_count.Resize( m_world->GetNumTasks() );
task_last_count.Resize( m_world->GetNumTasks() );
task_exe_count.Resize( m_world->GetNumTasks() );
@@ -216,18 +199,6 @@
data_manager.Add("max_merit", "Maximum Merit in Population", &cStats::GetMaxMerit);
}
-cStats::~cStats()
-{
- cout << "Closing stats object..."<<endl;
-
- // Close all the statistics files.
- fp_creature_log.close();
- fp_genotype_log.close();
- fp_threshold_log.close();
- fp_species_log.close();
- fp_lineage_log.close();
-}
-
void cStats::ZeroTasks()
{
for( int i=0; i < task_cur_count.GetSize(); i++ ){
@@ -279,10 +250,10 @@
{
tot_organisms++;
num_births++;
- if (fp_creature_log.good() == true) {
- fp_creature_log << GetUpdate() << " "
- << cell_id << " "
- << genotype_id << endl;
+
+ if (m_world->GetConfig().LOG_CREATURES.Get()) {
+ m_world->GetDataFileOFStream("creature.log") << GetUpdate() << " "
+ << cell_id << " " << genotype_id << endl;
}
if (breed_true == true) num_breed_true++;
@@ -305,17 +276,18 @@
int parent_dist, int depth, int max_abundance, int parasite_abundance,
int age, int length)
{
- if (fp_genotype_log.good() &&
- (!m_world->GetConfig().LOG_THRESHOLD.Get() || max_abundance > 2)) {
+ if (m_world->GetConfig().LOG_GENOTYPES.Get() &&
+ (m_world->GetConfig().LOG_GENOTYPES.Get() != 2 || max_abundance > 2)) {
const int update_born = cStats::GetUpdate() - age + 1;
- fp_genotype_log << id_num << " " // 1
- << update_born << " " // 2
- << parent_id << " " // 3
- << parent_dist << " " // 4
- << depth << " " // 5
- << max_abundance << " " // 6
- << age << " " // 7
- << length << endl; // 8
+ m_world->GetDataFileOFStream("genotype.log")
+ << id_num << " " // 1
+ << update_born << " " // 2
+ << parent_id << " " // 3
+ << parent_dist << " " // 4
+ << depth << " " // 5
+ << max_abundance << " " // 6
+ << age << " " // 7
+ << length << endl; // 8
}
(void) parasite_abundance; // Not used now, but maybe in future.
@@ -325,11 +297,12 @@
{
num_threshold++;
tot_threshold++;
- if( fp_threshold_log.good() )
- fp_threshold_log << cStats::GetUpdate() << " " // 1
- << id_num << " " // 2
- << species_num << " " // 3
- << name << endl; // 4
+ if (m_world->GetConfig().LOG_THRESHOLD.Get())
+ m_world->GetDataFileOFStream("threshold.log")
+ << cStats::GetUpdate() << " " // 1
+ << id_num << " " // 2
+ << species_num << " " // 3
+ << name << endl; // 4
}
void cStats::RemoveThreshold(int id_num)
@@ -349,13 +322,14 @@
int max_gen_abundance, int max_abundance, int age)
{
num_species--;
- if( fp_species_log.good() )
- fp_species_log << cStats::GetUpdate() << " " // 1
- << id_num << " " // 2
- << parent_id << " " // 3
- << max_gen_abundance << " " // 4
- << max_abundance << " " // 5
- << age << endl; // 6
+ if (m_world->GetConfig().LOG_SPECIES.Get())
+ m_world->GetDataFileOFStream("species.log")
+ << cStats::GetUpdate() << " " // 1
+ << id_num << " " // 2
+ << parent_id << " " // 3
+ << max_gen_abundance << " " // 4
+ << max_abundance << " " // 5
+ << age << endl; // 6
}
void cStats::AddLineage()
@@ -403,39 +377,26 @@
int total_CPUs, int total_genotypes, double fitness,
double lineage_stat1, double lineage_stat2 )
{
- static bool msg_printed = false;
+ num_lineages--;
+ if (m_world->GetConfig().LOG_LINEAGES.Get()) {
+ cDataFile& lineage_log = m_world->GetDataFile("lineage.log");
- if ( !msg_printed ){
- if( fp_lineage_log.good() )
- fp_lineage_log << "# (1) lineage id "
- << "(2) parent lineage id "
- << "(3) initial fitness "
- << "(4) total number of creatures "
- << "(5) total number of genotypes "
- << "(6) update born "
- << "(7) update extinct "
- << "(8) generation born "
- << "(9) generation extinct"
- << "(10) lineage stat1"
- << "(11) lineage stat2 [10, 11 depend on lineage creation method chosen]"
- << endl;
- msg_printed = true;
+ lineage_log.WriteComment("(1) lineage id (2) parent lineage id (3) initial fitness (4) total number of creatures (5) total number of genotypes (6) update born (7) update extinct (8) generation born (9) generation extinct (10) lineage stat1 (11) lineage stat2 [10, 11 depend on lineage creation method chosen]");
+ lineage_log.Endl();
+
+ lineage_log.GetOFStream()
+ << id_num << " " // 1
+ << parent_id << " " // 2
+ << fitness << " " // 3
+ << total_CPUs << " " // 4
+ << total_genotypes << " " // 5
+ << update_born << " " // 6
+ << cStats::GetUpdate() << " " // 7
+ << generation_born << " " // 8
+ << SumGeneration().Average() << " " // 9
+ << lineage_stat1 << " " // 10
+ << lineage_stat2 << " " << endl;
}
-
- num_lineages--;
- if( fp_lineage_log.good() ) {
- fp_lineage_log << id_num << " " // 1
- << parent_id << " " // 2
- << fitness << " " // 3
- << total_CPUs << " " // 4
- << total_genotypes << " " // 5
- << update_born << " " // 6
- << cStats::GetUpdate() << " " // 7
- << generation_born << " " // 8
- << SumGeneration().Average() << " " // 9
- << lineage_stat1 << " " // 10
- << lineage_stat2 << " " << endl;
- }
}
Modified: development/source/main/cStats.h
===================================================================
--- development/source/main/cStats.h 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/main/cStats.h 2005-11-10 02:28:28 UTC (rev 386)
@@ -59,13 +59,6 @@
// The data manager handles printing user-formated output files.
tDataManager<cStats> data_manager;
- std::ofstream fp_creature_log;
- std::ofstream fp_genotype_log;
- std::ofstream fp_threshold_log;
- std::ofstream fp_species_log;
- std::ofstream fp_lineage_log;
-
-
//// By Creature Sums //// (Cleared and resummed by population each update)
cDoubleSum sum_merit;
cDoubleSum sum_mem_size;
@@ -230,15 +223,13 @@
public:
cStats(cWorld* world);
- ~cStats();
+ ~cStats() { ; }
void SetupPrintDatabase();
-
void ProcessUpdate();
// GLOBAL STATS
-
inline void SetCurrentUpdate(int new_update) {
current_update = new_update;
sub_update = 0;
@@ -305,23 +296,15 @@
void SetDomGeneDepth(int in_depth) { dom_gene_depth = in_depth; }
void SetDomSequence(const cString & in_seq) { dom_sequence = in_seq; }
- void SetDomInjGenotype(cInjectGenotype * in_inj_genotype)
- {dom_inj_genotype = in_inj_genotype;}
- void SetDomInjSize(int in_inj_size)
- {dom_inj_size = in_inj_size;}
- void SetDomInjID(int in_inj_ID)
- {dom_inj_genotype_id = in_inj_ID;}
- void SetDomInjName(const cString & in_name)
- {dom_inj_name = in_name;}
- void SetDomInjBirths(int in_births)
- {dom_inj_births=in_births;}
- void SetDomInjAbundance(int in_inj_abundance)
- {dom_inj_abundance=in_inj_abundance;}
- void SetDomInjSequence(const cString & in_inj_sequence)
- {dom_inj_sequence = in_inj_sequence;}
+ void SetDomInjGenotype(cInjectGenotype * in_inj_genotype) { dom_inj_genotype = in_inj_genotype; }
+ void SetDomInjSize(int in_inj_size) { dom_inj_size = in_inj_size; }
+ void SetDomInjID(int in_inj_ID) { dom_inj_genotype_id = in_inj_ID; }
+ void SetDomInjName(const cString & in_name) { dom_inj_name = in_name; }
+ void SetDomInjBirths(int in_births) { dom_inj_births = in_births; }
+ void SetDomInjAbundance(int in_inj_abundance) { dom_inj_abundance = in_inj_abundance; }
+ void SetDomInjSequence(const cString & in_inj_sequence) { dom_inj_sequence = in_inj_sequence; }
void SetGenoMapElement(int i, int in_geno) { genotype_map[i] = in_geno; }
- // Generic data
void SetCoalescentGenotypeDepth(int in_depth) {coal_depth = in_depth;}
inline void SetNumGenotypes(int new_genotypes);
@@ -334,28 +317,18 @@
inline void SetNumMultiThreadCreatures(int in_num_multi_thread_creatures);
inline void SetNumModified(int in_num_modified);
- inline void SetMaxFitness(double in_max_fitness)
- { max_fitness = in_max_fitness; }
- inline void SetMaxMerit(double in_max_merit)
- { max_merit = in_max_merit; }
- inline void SetMaxGestationTime(int in_max_gestation_time)
- { max_gestation_time = in_max_gestation_time; }
- inline void SetMaxGenomeLength(int in_max_genome_length)
- { max_genome_length = in_max_genome_length; }
+ void SetMaxFitness(double in_max_fitness) { max_fitness = in_max_fitness; }
+ void SetMaxMerit(double in_max_merit) { max_merit = in_max_merit; }
+ void SetMaxGestationTime(int in_max_gestation_time) { max_gestation_time = in_max_gestation_time; }
+ void SetMaxGenomeLength(int in_max_genome_length) { max_genome_length = in_max_genome_length; }
- inline void SetMinFitness(double in_min_fitness)
- { min_fitness = in_min_fitness; }
- inline void SetMinMerit(double in_min_merit)
- { min_merit = in_min_merit; }
- inline void SetMinGestationTime(int in_min_gestation_time)
- { min_gestation_time = in_min_gestation_time; }
- inline void SetMinGenomeLength(int in_min_genome_length)
- { min_genome_length = in_min_genome_length; }
+ void SetMinFitness(double in_min_fitness) { min_fitness = in_min_fitness; }
+ void SetMinMerit(double in_min_merit) { min_merit = in_min_merit; }
+ void SetMinGestationTime(int in_min_gestation_time) { min_gestation_time = in_min_gestation_time; }
+ void SetMinGenomeLength(int in_min_genome_length) { min_genome_length = in_min_genome_length; }
- inline void SetEntropy(double in_entropy)
- { entropy = in_entropy; }
- inline void SetSpeciesEntropy(double in_ent)
- { species_entropy = in_ent; }
+ void SetEntropy(double in_entropy) { entropy = in_entropy; }
+ void SetSpeciesEntropy(double in_ent) { species_entropy = in_ent; }
cDoubleSum & SumFitness() { return sum_fitness; }
cDoubleSum & SumGestation() { return sum_gestation; }
Modified: development/source/support/avida.cfg
===================================================================
--- development/source/support/avida.cfg 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/support/avida.cfg 2005-11-10 02:28:28 UTC (rev 386)
@@ -162,7 +162,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
### LINEAGE_GROUP ###
# Lineage
@@ -184,5 +183,5 @@
# currently in the same lineage.
# 7 = when a child's (potential) fitness is higher than that of any
# organism in its line of descent
-LOG_LINEAGES 0 #
-LINEAGE_CREATION_METHOD 0 #
+LOG_LINEAGES 1 #
+LINEAGE_CREATION_METHOD 1 #
Modified: development/source/support/genesis
===================================================================
--- development/source/support/genesis 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/support/genesis 2005-11-10 02:28:28 UTC (rev 386)
@@ -137,7 +137,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
Modified: development/source/support/genesis.4stack
===================================================================
--- development/source/support/genesis.4stack 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/support/genesis.4stack 2005-11-10 02:28:28 UTC (rev 386)
@@ -138,7 +138,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
Modified: development/source/support/genesis.smt
===================================================================
--- development/source/support/genesis.smt 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/support/genesis.smt 2005-11-10 02:28:28 UTC (rev 386)
@@ -139,7 +139,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
Modified: development/source/testsuites/functional_testsuites/default.md5sum/genesis
===================================================================
--- development/source/testsuites/functional_testsuites/default.md5sum/genesis 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/testsuites/functional_testsuites/default.md5sum/genesis 2005-11-10 02:28:28 UTC (rev 386)
@@ -136,7 +136,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
Modified: development/source/testsuites/functional_testsuites/default.tail/genesis
===================================================================
--- development/source/testsuites/functional_testsuites/default.tail/genesis 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/testsuites/functional_testsuites/default.tail/genesis 2005-11-10 02:28:28 UTC (rev 386)
@@ -136,7 +136,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
Modified: development/source/testsuites/functional_testsuites/default.tail.disabled/genesis
===================================================================
--- development/source/testsuites/functional_testsuites/default.tail.disabled/genesis 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/testsuites/functional_testsuites/default.tail.disabled/genesis 2005-11-10 02:28:28 UTC (rev 386)
@@ -136,7 +136,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
Modified: development/source/testsuites/functional_testsuites/tedious.tail.disabled/genesis
===================================================================
--- development/source/testsuites/functional_testsuites/tedious.tail.disabled/genesis 2005-11-10 00:01:25 UTC (rev 385)
+++ development/source/testsuites/functional_testsuites/tedious.tail.disabled/genesis 2005-11-10 02:28:28 UTC (rev 386)
@@ -136,7 +136,6 @@
LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
-LOG_LANDSCAPE 0 # 0/1 (off/on) toggle to print file.
LOG_LINEAGES 0 # 0/1 (off/on) to log advantageous mutations
# This one can slow down avida a lot. It is used to get an idea of how
More information about the Avida-cvs
mailing list