[Avida-SVN] r1408 - in development/source: actions tools

[matt at myxo.css.msu.edu]

Author: matt
Date: 2007-03-18 22:18:38 -0400 (Sun, 18 Mar 2007)
New Revision: 1408

Modified:
   development/source/actions/PrintActions.cc
   development/source/tools/tArray.h
Log:
Removing new tArray constructor for apparent incompatibility issues; reverting an action to use previous tArray methods. 

Modified: development/source/actions/PrintActions.cc
===================================================================
--- development/source/actions/PrintActions.cc	2007-03-19 01:47:12 UTC (rev 1407)
+++ development/source/actions/PrintActions.cc	2007-03-19 02:18:38 UTC (rev 1408)
@@ -881,8 +881,11 @@
 			}
 			
 			const int gen_size = aligned[0].GetSize();
-			tArray<double> site_entropy(gen_size, 0.0);
-			tArray<int> inst_count( (m_use_gap) ? num_insts + 1 : num_insts, 0);  //Add an extra place if we're using gaps
+			tArray<double> site_entropy(gen_size);
+			site_entropy.SetAll(0.0);
+			
+			tArray<int> inst_count( (m_use_gap) ? num_insts + 1 : num_insts);  //Add an extra place if we're using gaps
+			inst_count.SetAll(0);
 			for (int pos = 0; pos < gen_size; pos++)
 			{
 				inst_count.SetAll(0);  //Reset the counter for each aligned position

Modified: development/source/tools/tArray.h
===================================================================
--- development/source/tools/tArray.h	2007-03-19 01:47:12 UTC (rev 1407)
+++ development/source/tools/tArray.h	2007-03-19 02:18:38 UTC (rev 1408)
@@ -49,7 +49,7 @@
 
 public:
   explicit tArray(const int size = 0) : m_data(NULL), m_size(0) { ResizeClear(size); }
-  explicit tArray(const int size = 0, const T& init_val) : m_data(NULL), m_size(0) { Resize(size, init_val); }
+  //explicit tArray(const int size = 0, const T& init_val) : m_data(NULL), m_size(0) { Resize(size, init_val); }
 	tArray(const tArray& rhs) : m_data(NULL), m_size(0) { this->operator=(rhs); }
 
   ~tArray() { delete [] m_data; }