[Avida-cvs] [Avida2-svn] r313 - trunk/source/main

[ofria@myxo.css.msu.edu]

Author: ofria
Date: 2005-09-15 19:16:19 -0400 (Thu, 15 Sep 2005)
New Revision: 313

Modified:
   trunk/source/main/analyze.cc
   trunk/source/main/genebank.cc
Log:
Setup all genotype detail files to be lists a filetype 'genotype_data'.
Removed verbose comments about resource levels every time a test CPU is run.


Modified: trunk/source/main/analyze.cc
===================================================================
--- trunk/source/main/analyze.cc	2005-09-15 20:26:29 UTC (rev 312)
+++ trunk/source/main/analyze.cc	2005-09-15 23:16:19 UTC (rev 313)
@@ -834,7 +834,8 @@
   input_file.Close();
   
   const cString filetype = input_file.GetFiletype();
-  if (filetype != "population_data") {
+  if (filetype != "population_data" &&  // Depricated
+      filetype != "genotype_data") {
     cerr << "Error: Cannot load files of type \"" << filetype << "\"." << endl;
     exit(1);
   }
@@ -2742,9 +2743,9 @@
     vector<bool> one_line_neutral(num_insts, false);
     vector< vector<bool> > neutral_mut(length_genome, one_line_neutral);
     vector< vector<bool> > alive_mut(length_genome, one_line_neutral);
-    if (verbose == true) {
-      PrintTestCPUResources("");
-    }
+//     if (verbose == true) {
+//       PrintTestCPUResources("");
+//     }
 
     genotype->Recalculate();
     double base_fitness = genotype->GetFitness();
@@ -2991,9 +2992,9 @@
     // Point mutation at all lines of code to look for neutral mutation
     cout << "Test point mutation for genotype " << genotype->GetID() << endl;
     tMatrix<double> prob(length_genome, num_insts);
-    if (verbose == true) {
-      PrintTestCPUResources("");
-    }
+//     if (verbose == true) {
+//       PrintTestCPUResources("");
+//     }
 
     genotype->Recalculate();
     double base_fitness = genotype->GetFitness();
@@ -6153,9 +6154,9 @@
     
     // If the previous genotype was the parent of this one, pass in a pointer
     // to it for improved recalculate (such as distance to parent, etc.)
-    if (verbose == true) {
-      PrintTestCPUResources("");
-    }
+//     if (verbose == true) {
+//       PrintTestCPUResources("");
+//     }
     if (last_genotype != NULL &&
         genotype->GetParentID() == last_genotype->GetID()) {
       genotype->Recalculate(last_genotype);

Modified: trunk/source/main/genebank.cc
===================================================================
--- trunk/source/main/genebank.cc	2005-09-15 20:26:29 UTC (rev 312)
+++ trunk/source/main/genebank.cc	2005-09-15 23:16:19 UTC (rev 313)
@@ -532,7 +532,7 @@
   }
   
   // Print all of the header information...
-  fp << "#filetype population_data" << endl
+  fp << "#filetype genotype_data" << endl
      << "#format ";
 
   if (print_id == true) fp << "id ";
@@ -707,7 +707,7 @@
 
 void cGenebank::DumpDetailHeading (ofstream & fp)
 {
-  fp << "#filetype population_data" << endl
+  fp << "#filetype genotype_data" << endl
      << "#format id parent_id parent_dist num_cpus total_cpus length merit gest_time fitness update_born update_dead depth sequence" << endl
      << endl
      << "#  1: ID" << endl
@@ -727,7 +727,7 @@
 
 void cGenebank::DumpDetailSexHeading (ofstream & fp)
 {
-  fp << "#filetype population_data" << endl
+  fp << "#filetype genotype_data" << endl
      << "#format id parent_id parent2_id parent_dist num_cpus total_cpus length merit gest_time fitness update_born update_dead depth sequence" << endl
      << endl
      << "#  1: ID" << endl