[Avida-SVN] r2236 - / extras/source/testsuites

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2007-12-19 16:39:18 -0500 (Wed, 19 Dec 2007)
New Revision: 2236

Modified:
   /
   extras/source/testsuites/nTreeStats.cpp
Log:
 r2287 at vallista:  kaben | 2007-12-19 13:42:37 -0800
 Repair broken merge of testsuites. These are the correct files; files in repo are bad.
 
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/xcode-test:1653
c457ea80-0a68-11dc-9323-a45eea2efad5:/private:2284
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/xcode-test:1653
c457ea80-0a68-11dc-9323-a45eea2efad5:/private:2287

Modified: extras/source/testsuites/nTreeStats.cpp
===================================================================
--- extras/source/testsuites/nTreeStats.cpp	2007-12-19 20:54:40 UTC (rev 2235)
+++ extras/source/testsuites/nTreeStats.cpp	2007-12-19 21:39:18 UTC (rev 2236)
@@ -417,7 +417,7 @@
     analyze_cfg_file.close();
   }
   /* Generate fake data files containing hand-crafted tree. */
-  void GenerateGammaDetail_PhyloDepth(const cString &detail_fake_filename) {
+  void GenerateGammaDetail(const cString &detail_fake_filename) {
     std::ofstream detail_file(detail_fake_filename);
     detail_file << "#filetype genotype_data" << endl;
     detail_file << "#format id parent_id depth" << endl;
@@ -439,28 +439,6 @@
     detail_file << "# Tests for GabeYedidGammaStatistic." << endl;
     detail_file.close();
   }  
-  void GenerateGammaDetail_UpdateBorn(const cString &detail_fake_filename) {
-    std::ofstream detail_file(detail_fake_filename);
-    detail_file << "#filetype genotype_data" << endl;
-    detail_file << "#format id parent_id update_born" << endl;
-    detail_file << "" << endl;
-    detail_file << "#  1: ID" << endl;
-    detail_file << "#  2: parent ID" << endl;
-    detail_file << "#  3: update born" << endl;
-    detail_file << "" << endl;
-    detail_file << "100 -1 32 #" << endl;
-    detail_file << "150 -1 32 #" << endl;
-    detail_file << "600 500 600 #" << endl;
-    detail_file << "200 100 300 #" << endl;
-    detail_file << "500 300 585 #" << endl;
-    detail_file << "700 500 600 #" << endl;
-    detail_file << "300 100 471 #" << endl;
-    detail_file << "400 100 520 #" << endl;
-    detail_file << "450 200 520 #" << endl;
-    detail_file << "# This file was autogenerated to test Avida." << endl;
-    detail_file << "# Tests for GabeYedidGammaStatistic." << endl;
-    detail_file.close();
-  }  
 }
 
 /* Unit tests. */
@@ -470,7 +448,7 @@
     cString analyze_cfg_filename("./cAnalyze_Brainstorm_GabeYedidGammaStatistic_analyze.cfg");    
     cString detail_fake_filename("./detail-fake.pop");
     nTreeStats::GenerateStandardCfgs(avida_cfg_filename, analyze_cfg_filename);
-    nTreeStats::GenerateGammaDetail_PhyloDepth(detail_fake_filename);
+    nTreeStats::GenerateGammaDetail(detail_fake_filename);
     
     cAnalyzeTestFixture atf;
     /* Set Avida command-line args. */
@@ -543,7 +521,9 @@
     }
     
     /* Sort gen_array by phylogenetic depth. */
-    agts.QSortGenotypes();
+    {
+      agts.QSortGenotypes();
+    }
     /* TESTS: Verify final order of loaded genotypes. */
     if(true) {
       TEST(agts.m_gen_array[0]->GetDepth() == 32);
@@ -626,7 +606,7 @@
 /* Functional tests. */
 namespace cAnalyze_FunctionalTest_GabeYedidGammaStatistic_Demo1 {
   /* Generate fake data files containing hand-crafted tree. */
-  void GenerateGammaDetail_PhyloDepth_Demo1(const cString &detail_fake_filename) {
+  void GenerateGammaDetail_Demo1(const cString &detail_fake_filename) {
     std::ofstream detail_file(detail_fake_filename);
     detail_file << "#filetype genotype_data" << endl;
     detail_file << "#format id parent_id depth" << endl;
@@ -650,7 +630,7 @@
     cString analyze_cfg_filename("./cAnalyze_Brainstorm_GabeYedidGammaStatistic_analyze.cfg");    
     cString detail_fake_filename("./detail-fake.pop");
     nTreeStats::GenerateStandardCfgs(avida_cfg_filename, analyze_cfg_filename);
-    GenerateGammaDetail_PhyloDepth_Demo1(detail_fake_filename);
+    GenerateGammaDetail_Demo1(detail_fake_filename);
     
     cAnalyzeTestFixture atf;
     /* Set Avida command-line args. */
@@ -716,7 +696,7 @@
 }
 namespace cAnalyze_FunctionalTest_GabeYedidGammaStatistic_Demo2 {
   /* Generate fake data files containing hand-crafted tree. */
-  void GenerateGammaDetail_PhyloDepth_Demo1(const cString &detail_fake_filename) {
+  void GenerateGammaDetail_Demo1(const cString &detail_fake_filename) {
     std::ofstream detail_file(detail_fake_filename);
     detail_file << "#filetype genotype_data" << endl;
     detail_file << "#format id parent_id depth" << endl;
@@ -740,7 +720,7 @@
     cString analyze_cfg_filename("./cAnalyze_Brainstorm_GabeYedidGammaStatistic_analyze.cfg");    
     cString detail_fake_filename("./detail-fake.pop");
     nTreeStats::GenerateStandardCfgs(avida_cfg_filename, analyze_cfg_filename);
-    GenerateGammaDetail_PhyloDepth_Demo1(detail_fake_filename);
+    GenerateGammaDetail_Demo1(detail_fake_filename);
     
     cAnalyzeTestFixture atf;
     /* Set Avida command-line args. */