[Avida-SVN] r2228 - / development/source/analyze
kaben at myxo.css.msu.edu
kaben at myxo.css.msu.edu
Wed Dec 19 12:20:15 PST 2007
Author: kaben
Date: 2007-12-19 15:20:14 -0500 (Wed, 19 Dec 2007)
New Revision: 2228
Modified:
/
development/source/analyze/cAnalyze.cc
Log:
r2187 at vallista: kaben | 2007-11-04 21:25:00 -0800
Changed my signature to '@kgn' in some comments to conform with Charles' style.
Property changes on:
___________________________________________________________________
Name: svk:merge
- 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/xcode-test:1653
c457ea80-0a68-11dc-9323-a45eea2efad5:/private:2186
+ 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/xcode-test:1653
c457ea80-0a68-11dc-9323-a45eea2efad5:/private:2187
Modified: development/source/analyze/cAnalyze.cc
===================================================================
--- development/source/analyze/cAnalyze.cc 2007-12-19 20:20:06 UTC (rev 2227)
+++ development/source/analyze/cAnalyze.cc 2007-12-19 20:20:14 UTC (rev 2228)
@@ -7737,7 +7737,7 @@
/*
- kgn at FIXME
+ FIXME at kgn
Must categorize COMPETE command.
*/
/* Arguments to COMPETE: */
@@ -7805,7 +7805,7 @@
cCPUTestInfo test_info;
/*
- kgn at FIXME
+ FIXME at kgn
This should be settable by an optional argument.
*/
test_info.UseRandomInputs(true);
@@ -7816,13 +7816,13 @@
genotype->Recalculate(m_world->GetDefaultContext(), &test_info, NULL);
if(genotype->GetViable()){
/*
- kgn at FIXME
+ FIXME at kgn
- HACK : multiplication by 1000 because merits less than 1 are truncated
to zero.
*/
fitness_array[array_pos] = genotype->GetFitness() * 1000.;
/*
- kgn at FIXME
+ FIXME at kgn
- Need to note somewhere that we are using first descendent of the
parent, if the parent is viable, so that genome of first descendent may
differ from that of parent.
More information about the Avida-cvs
mailing list