[Avida-cvs] [Avida2-svn] r322 - in branches/developers/matt-hcopy-hack/source: main tools

[matt@myxo.css.msu.edu]

Author: matt
Date: 2005-09-21 16:34:50 -0400 (Wed, 21 Sep 2005)
New Revision: 322

Modified:
   branches/developers/matt-hcopy-hack/source/main/analyze.cc
   branches/developers/matt-hcopy-hack/source/main/genotype.cc
   branches/developers/matt-hcopy-hack/source/main/inject_genotype.cc
   branches/developers/matt-hcopy-hack/source/tools/functions.hh
   branches/developers/matt-hcopy-hack/source/tools/tDictionary.hh
Log:
Various updates to get non gcc2 compilers to work.  
Code compiles, but memory management problems.
Set env. variable MALLOC_CHECK_ 1 for executable to work.



Modified: branches/developers/matt-hcopy-hack/source/main/analyze.cc
===================================================================
--- branches/developers/matt-hcopy-hack/source/main/analyze.cc	2005-09-19 20:57:58 UTC (rev 321)
+++ branches/developers/matt-hcopy-hack/source/main/analyze.cc	2005-09-21 20:34:50 UTC (rev 322)
@@ -2409,8 +2409,9 @@
       //mrr
       if (file_type == FILE_TYPE_HTML) fp << "<td align=center>";
       fp << genotype->GetChildGenome()[line_num].GetMeta() << " ";
+      if (file_type == FILE_TYPE_HTML) fp << "<td align=center>";
+      fp << test_genotype.GetFitness() << " "; 
       
-      
       // Print the individual columns...
       output_it.Reset();
       tDataEntryCommand<cAnalyzeGenotype> * data_command = NULL;

Modified: branches/developers/matt-hcopy-hack/source/main/genotype.cc
===================================================================
--- branches/developers/matt-hcopy-hack/source/main/genotype.cc	2005-09-19 20:57:58 UTC (rev 321)
+++ branches/developers/matt-hcopy-hack/source/main/genotype.cc	2005-09-21 20:34:50 UTC (rev 322)
@@ -113,7 +113,7 @@
   assert( tmp_sum_merit.Sum() >= 0 && tmp_sum_fitness.Sum() >= 0 );
 
   return ret_value;
-};
+}
 
 void cGenotype::SetParent(cGenotype * parent, cGenotype * parent2)
 {

Modified: branches/developers/matt-hcopy-hack/source/main/inject_genotype.cc
===================================================================
--- branches/developers/matt-hcopy-hack/source/main/inject_genotype.cc	2005-09-19 20:57:58 UTC (rev 321)
+++ branches/developers/matt-hcopy-hack/source/main/inject_genotype.cc	2005-09-21 20:34:50 UTC (rev 322)
@@ -105,7 +105,7 @@
   assert( birth_data.update_born >= -1);
 
   return ret_value;
-};
+}
 
 void cInjectGenotype::SetParent(cInjectGenotype * parent)
 {

Modified: branches/developers/matt-hcopy-hack/source/tools/functions.hh
===================================================================
--- branches/developers/matt-hcopy-hack/source/tools/functions.hh	2005-09-19 20:57:58 UTC (rev 321)
+++ branches/developers/matt-hcopy-hack/source/tools/functions.hh	2005-09-21 20:34:50 UTC (rev 322)
@@ -53,7 +53,7 @@
     in2 = tmp;
   }
   
-};
+}
 
 inline bool ToggleBool(bool & in_bool)
 {

Modified: branches/developers/matt-hcopy-hack/source/tools/tDictionary.hh
===================================================================
--- branches/developers/matt-hcopy-hack/source/tools/tDictionary.hh	2005-09-19 20:57:58 UTC (rev 321)
+++ branches/developers/matt-hcopy-hack/source/tools/tDictionary.hh	2005-09-21 20:34:50 UTC (rev 322)
@@ -57,7 +57,8 @@
 #ifndef TLIST_HH
 #include "tList.hh"
 #endif
-
+#include <iostream>
+using namespace std;
 #define DICTIONARY_HASH_DEFAULT 23
 #define DICTIONARY_HASH_MEDIUM  331
 #define DICTIONARY_HASH_LARGE   2311