[Avida-SVN] r1960 - in development/source: analyze tools

[matt at myxo.css.msu.edu]

Author: matt
Date: 2007-08-18 11:49:29 -0400 (Sat, 18 Aug 2007)
New Revision: 1960

Modified:
   development/source/analyze/cAnalyze.cc
   development/source/tools/tList.h
Log:
Repair mutation reversion function.

Modified: development/source/analyze/cAnalyze.cc
===================================================================
--- development/source/analyze/cAnalyze.cc	2007-08-18 04:00:42 UTC (rev 1959)
+++ development/source/analyze/cAnalyze.cc	2007-08-18 15:49:29 UTC (rev 1960)
@@ -7014,13 +7014,13 @@
 		if (true)
 		{
 			FOT << genotype->GetID()			<< " "
-          << genotype->GetFitness()		<< " "
-          << genotype->GetUpdateBorn() << " "
-          << genotype->GetParentDist() << " "
-          << parent_genotype->GetID()				<< " "
-          << parent_genotype->GetFitness()		<< " "
-          << parent_genotype->GetUpdateBorn()	<< " ";
-          
+      << genotype->GetFitness()		<< " "
+      << genotype->GetUpdateBorn() << " "
+      << genotype->GetParentDist() << " "
+      << parent_genotype->GetID()				<< " "
+      << parent_genotype->GetFitness()		<< " "
+      << parent_genotype->GetUpdateBorn()	<< " ";
+      
 			int cum_dist = 0;
 			cString str_parent = parent_genotype->GetSequence();
 			cString str_other  = "";

Modified: development/source/tools/tList.h
===================================================================
--- development/source/tools/tList.h	2007-08-18 04:00:42 UTC (rev 1959)
+++ development/source/tools/tList.h	2007-08-18 15:49:29 UTC (rev 1960)
@@ -94,6 +94,7 @@
 public:
     explicit tListIterator(tList<T> & _list);
   explicit tListIterator(tList<T> & _list, tListNode<T> * start_node);
+  explicit tListIterator(tListIterator<T>& _tli);
   ~tListIterator();
   
   void Set(tListNode<T> * in_node) { node = in_node; }
@@ -561,6 +562,14 @@
   list.AddIterator(this);
 }
 
+template <class T> tListIterator<T>::tListIterator(tListIterator<T> & _tli)
+:list(_tli.list), node(_tli.node)
+{
+	list.AddIterator(this);
+}
+
+
+
 template <class T> tListIterator<T>::~tListIterator()
 {
   list.RemoveIterator(this);