[Avida-cvs] [Avida2-svn] r311 - in trunk/source: main tools

[huangw10@myxo.css.msu.edu]

Author: huangw10
Date: 2005-09-14 10:20:16 -0400 (Wed, 14 Sep 2005)
New Revision: 311

Modified:
   trunk/source/main/analyze.hh
   trunk/source/tools/tArray.hh
   trunk/source/tools/tMatrix.hh
Log:
commit tMatrix.hh

Modified: trunk/source/main/analyze.hh
===================================================================
--- trunk/source/main/analyze.hh	2005-09-14 14:08:20 UTC (rev 310)
+++ trunk/source/main/analyze.hh	2005-09-14 14:20:16 UTC (rev 311)
@@ -155,8 +155,8 @@
   // Population Analysis Commands...
   void CommandPrintPhenotypes(cString cur_string);
   void CommandPrintDiversity(cString cur_string);
+  void PhyloCommunityComplexity(cString cur_string);
   void CommunityComplexity(cString cur_string);
-  void CharlesCommunityComplexity(cString cur_string);
 
   // Individual Organism Analysis...
   void CommandLandscape(cString cur_string);

Modified: trunk/source/tools/tArray.hh
===================================================================
--- trunk/source/tools/tArray.hh	2005-09-14 14:08:20 UTC (rev 310)
+++ trunk/source/tools/tArray.hh	2005-09-14 14:20:16 UTC (rev 311)
@@ -75,10 +75,15 @@
   }
 
   // Copy constructor
-  explicit tArray(const tArray & rhs) : data(NULL), size(0) {
+  //explicit tArray(const tArray & rhs) : data(NULL), size(0) {
+  //  this->operator=(rhs);
+  //}
+
+  tArray(const tArray & rhs) : data(NULL), size(0) {
     this->operator=(rhs);
   }
 
+
   // Destructor
   virtual ~tArray() {
     if (data != NULL) delete [] data;

Modified: trunk/source/tools/tMatrix.hh
===================================================================
--- trunk/source/tools/tMatrix.hh	2005-09-14 14:08:20 UTC (rev 310)
+++ trunk/source/tools/tMatrix.hh	2005-09-14 14:20:16 UTC (rev 311)
@@ -128,8 +128,11 @@
   }
 
   // Copy constructor
-  //  explicit tMatrix(const tMatrix<T> & rhs) : data(NULL), num_rows(0) {
-  tMatrix(const tMatrix<T> & rhs) : data(NULL), num_rows(0) {
+  //explicit tMatrix(const tMatrix & rhs) : data(NULL), num_rows(0) {
+  //  this->operator=(rhs);
+  //}
+
+  tMatrix(const tMatrix & rhs) : data(NULL), num_rows(0) {
     this->operator=(rhs);
   }