[Avida-SVN] r3233 - in branches/goings: . source/classification source/cpu source/main source/tools

goingssh at myxo.css.msu.edu goingssh at myxo.css.msu.edu
Tue May 12 13:32:21 PDT 2009


Author: goingssh
Date: 2009-05-12 16:32:21 -0400 (Tue, 12 May 2009)
New Revision: 3233

Modified:
   branches/goings/Avida.sln
   branches/goings/Avida.vcproj
   branches/goings/source/classification/cClassificationManager.cc
   branches/goings/source/classification/cGenotype.cc
   branches/goings/source/classification/cGenotype.h
   branches/goings/source/cpu/cHardwareBase.cc
   branches/goings/source/main/cAvidaConfig.h
   branches/goings/source/main/cPhenotype.cc
   branches/goings/source/main/cPopulation.cc
   branches/goings/source/tools/cMerit.h
Log:
Added fitness sharing code

Modified: branches/goings/Avida.sln
===================================================================
--- branches/goings/Avida.sln	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/Avida.sln	2009-05-12 20:32:21 UTC (rev 3233)
@@ -1,23 +1,80 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Avida", "Avida.vcproj", "{E1C1D683-833F-40D9-A952-CEC54FE40EFC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", ".\ALL_BUILD.vcproj", "{08B649F7-2C22-4A22-A7CB-B227102ACCC7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA} = {4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D} = {260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677} = {BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}
+	EndProjectSection
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{9E776A2E-5D27-4900-9856-F5AF0C8FC84A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", ".\INSTALL.vcproj", "{EE73950F-F4A8-4E5C-92B4-D9DFD79352FD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7} = {08B649F7-2C22-4A22-A7CB-B227102ACCC7}
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA} = {4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}
+	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", ".\ZERO_CHECK.vcproj", "{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avida", ".\avida.vcproj", "{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677} = {BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA} = {4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avidacore", ".\avidacore.vcproj", "{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}"
+	ProjectSection(ProjectDependencies) = postProject
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA} = {4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
+		MinSizeRel|Win32 = MinSizeRel|Win32
+		RelWithDebInfo|Win32 = RelWithDebInfo|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E1C1D683-833F-40D9-A952-CEC54FE40EFC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E1C1D683-833F-40D9-A952-CEC54FE40EFC}.Debug|Win32.Build.0 = Debug|Win32
-		{E1C1D683-833F-40D9-A952-CEC54FE40EFC}.Release|Win32.ActiveCfg = Release|Win32
-		{E1C1D683-833F-40D9-A952-CEC54FE40EFC}.Release|Win32.Build.0 = Release|Win32
-		{9E776A2E-5D27-4900-9856-F5AF0C8FC84A}.Debug|Win32.ActiveCfg = Debug
-		{9E776A2E-5D27-4900-9856-F5AF0C8FC84A}.Release|Win32.ActiveCfg = Release
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.Debug|Win32.Build.0 = Debug|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.Release|Win32.ActiveCfg = Release|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.Release|Win32.Build.0 = Release|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{08B649F7-2C22-4A22-A7CB-B227102ACCC7}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{EE73950F-F4A8-4E5C-92B4-D9DFD79352FD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EE73950F-F4A8-4E5C-92B4-D9DFD79352FD}.Release|Win32.ActiveCfg = Release|Win32
+		{EE73950F-F4A8-4E5C-92B4-D9DFD79352FD}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{EE73950F-F4A8-4E5C-92B4-D9DFD79352FD}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.Debug|Win32.Build.0 = Debug|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.Release|Win32.ActiveCfg = Release|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.Release|Win32.Build.0 = Release|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{4C8DCFE4-D4A0-421D-A0C0-BDE023FDDEBA}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.Debug|Win32.Build.0 = Debug|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.Release|Win32.ActiveCfg = Release|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.Release|Win32.Build.0 = Release|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.Debug|Win32.Build.0 = Debug|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.Release|Win32.ActiveCfg = Release|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.Release|Win32.Build.0 = Release|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.MinSizeRel|Win32.ActiveCfg = MinSizeRel|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.MinSizeRel|Win32.Build.0 = MinSizeRel|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.RelWithDebInfo|Win32.ActiveCfg = RelWithDebInfo|Win32
+		{BDCCEEFA-8177-4D5F-AA74-4C17EB92D677}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
 EndGlobal

Modified: branches/goings/Avida.vcproj
===================================================================
--- branches/goings/Avida.vcproj	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/Avida.vcproj	2009-05-12 20:32:21 UTC (rev 3233)
@@ -1,1753 +1,316 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding = "Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="Avida"
-	ProjectGUID="{E1C1D683-833F-40D9-A952-CEC54FE40EFC}"
-	RootNamespace="Avida"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
+	Name="avida"
+	ProjectGUID="{260D06F7-2BB8-48C5-8C67-0D9E0FA1A07D}"
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="Win32"
-		/>
+			Name="Win32"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			IntermediateDirectory="avida.dir\Debug"
 			ConfigurationType="1"
-			>
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCCLCompilerTool"
+				AdditionalOptions=" /Zm1000"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				BasicRuntimeChecks="3"
+				CompileAs="2"
+				DebugInformationFormat="3"
+				ExceptionHandling="1"
+				InlineFunctionExpansion="0"
+				Optimization="0"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,CMAKE_INTDIR=\&quot;Debug\&quot;"
+				AssemblerListingLocation="Debug"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/Debug/avida.pdb"
+/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,CMAKE_INTDIR=\&quot;Debug\&quot;"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
 				Name="VCMIDLTool"
-			/>
+				PreprocessorDefinitions="WIN32,_WINDOWS,_DEBUG,CMAKE_INTDIR=\&quot;Debug\&quot;"
+				MkTypLibCompatible="FALSE"
+				TargetEnvironment="1"
+				GenerateStublessProxies="TRUE"
+				TypeLibraryName="$(InputName).tlb"
+				OutputDirectory="$(IntDir)"
+				HeaderFileName="$(InputName).h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)source\tools&quot;;&quot;$(ProjectDir)source\targets\avida-viewer&quot;;&quot;$(ProjectDir)source\platform\msvc2005&quot;;&quot;$(ProjectDir)source\platform\msvc2005\pdcurses&quot;;&quot;$(ProjectDir)source\main&quot;;&quot;$(ProjectDir)source\drivers&quot;;&quot;$(ProjectDir)source\cpu&quot;;&quot;$(ProjectDir)source\classification&quot;;&quot;$(ProjectDir)source\analyze&quot;;&quot;$(ProjectDir)source\actions&quot;;&quot;$(ProjectDir)source&quot;;&quot;$(ProjectDir)source\platform&quot;"
-				PreprocessorDefinitions="NOMACROS;DEBUG;WIN32;_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				ForcedIncludeFiles=""
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  lib\Debug\avidacore.lib "
+				OutputFile="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\Debug\avida.exe"
+				Version="0.0"
+				GenerateManifest="TRUE"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="true"
+				AdditionalLibraryDirectories=""
+				ProgramDataBaseFile="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/Debug/avida.pdb"
+				GenerateDebugInformation="TRUE"
 				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
+				ImportLibrary="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\Debug\avida.lib"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="avida.dir\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCCLCompilerTool"
+				AdditionalOptions=" /Zm1000"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				CompileAs="2"
+				ExceptionHandling="1"
+				InlineFunctionExpansion="2"
+				Optimization="2"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;Release\&quot;"
+				AssemblerListingLocation="Release"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/Release/avida.pdb"
+/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;Release\&quot;"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;Release\&quot;"
+				MkTypLibCompatible="FALSE"
+				TargetEnvironment="1"
+				GenerateStublessProxies="TRUE"
+				TypeLibraryName="$(InputName).tlb"
+				OutputDirectory="$(IntDir)"
+				HeaderFileName="$(InputName).h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /STACK:10000000 /machine:I386"
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  lib\Release\avidacore.lib "
+				OutputFile="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\Release\avida.exe"
+				Version="0.0"
+				GenerateManifest="TRUE"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				ProgramDataBaseFile="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/Release/avida.pdb"
+				SubSystem="1"
+				ImportLibrary="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\Release\avida.lib"/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="MinSizeRel|Win32"
+			OutputDirectory="MinSizeRel"
+			IntermediateDirectory="avida.dir\MinSizeRel"
 			ConfigurationType="1"
-			>
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
 			<Tool
-				Name="VCPreBuildEventTool"
-			/>
+				Name="VCCLCompilerTool"
+				AdditionalOptions=" /Zm1000"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				CompileAs="2"
+				ExceptionHandling="1"
+				InlineFunctionExpansion="1"
+				Optimization="1"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
+				AssemblerListingLocation="MinSizeRel"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/MinSizeRel/avida.pdb"
+/>
 			<Tool
-				Name="VCCustomBuildTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
 				Name="VCMIDLTool"
-			/>
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;MinSizeRel\&quot;"
+				MkTypLibCompatible="FALSE"
+				TargetEnvironment="1"
+				GenerateStublessProxies="TRUE"
+				TypeLibraryName="$(InputName).tlb"
+				OutputDirectory="$(IntDir)"
+				HeaderFileName="$(InputName).h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"/>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)source\tools&quot;;&quot;$(ProjectDir)source\targets\avida-viewer&quot;;&quot;$(ProjectDir)source\platform\msvc2005&quot;;&quot;$(ProjectDir)source\platform\msvc2005\pdcurses&quot;;&quot;$(ProjectDir)source\main&quot;;&quot;$(ProjectDir)source\drivers&quot;;&quot;$(ProjectDir)source\cpu&quot;;&quot;$(ProjectDir)source\classification&quot;;&quot;$(ProjectDir)source\analyze&quot;;&quot;$(ProjectDir)source\actions&quot;;&quot;$(ProjectDir)source&quot;;&quot;$(ProjectDir)source\platform&quot;"
-				PreprocessorDefinitions="NOMACROS;NDEBUG;WIN32;_WIN32"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableEnhancedInstructionSet="1"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				ForcedIncludeFiles=""
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
 				Name="VCLinkerTool"
-				Version="2.6.2"
+				AdditionalOptions=" /STACK:10000000 /machine:I386"
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  lib\MinSizeRel\avidacore.lib "
+				OutputFile="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\MinSizeRel\avida.exe"
+				Version="0.0"
+				GenerateManifest="TRUE"
 				LinkIncremental="1"
-				GenerateDebugInformation="false"
+				AdditionalLibraryDirectories=""
+				ProgramDataBaseFile="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/MinSizeRel/avida.pdb"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
+				ImportLibrary="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\MinSizeRel\avida.lib"/>
+		</Configuration>
+		<Configuration
+			Name="RelWithDebInfo|Win32"
+			OutputDirectory="RelWithDebInfo"
+			IntermediateDirectory="avida.dir\RelWithDebInfo"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
 			<Tool
-				Name="VCALinkTool"
-			/>
+				Name="VCCLCompilerTool"
+				AdditionalOptions=" /Zm1000"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				CompileAs="2"
+				DebugInformationFormat="3"
+				ExceptionHandling="1"
+				InlineFunctionExpansion="1"
+				Optimization="2"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="TRUE"
+				WarningLevel="3"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
+				AssemblerListingLocation="RelWithDebInfo"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/RelWithDebInfo/avida.pdb"
+/>
 			<Tool
-				Name="VCManifestTool"
-			/>
+				Name="VCCustomBuildTool"/>
 			<Tool
-				Name="VCXDCMakeTool"
-			/>
+				Name="VCResourceCompilerTool"
+				AdditionalIncludeDirectories="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\actions&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\analyze&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\classification&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-core&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\viewer-coreGUI&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\cpu&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\drivers&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\main&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\platform&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\source\tools&q!
 uot;;"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"/>
 			<Tool
-				Name="VCBscMakeTool"
-			/>
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,CMAKE_INTDIR=\&quot;RelWithDebInfo\&quot;"
+				MkTypLibCompatible="FALSE"
+				TargetEnvironment="1"
+				GenerateStublessProxies="TRUE"
+				TypeLibraryName="$(InputName).tlb"
+				OutputDirectory="$(IntDir)"
+				HeaderFileName="$(InputName).h"
+				DLLDataFileName=""
+				InterfaceIdentifierFileName="$(InputName)_i.c"
+				ProxyFileName="$(InputName)_p.c"/>
 			<Tool
-				Name="VCFxCopTool"
-			/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
-				Name="VCPostBuildEventTool"
-			/>
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions=" /STACK:10000000 /machine:I386 /debug"
+				AdditionalDependencies="$(NOINHERIT) kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib  lib\RelWithDebInfo\avidacore.lib "
+				OutputFile="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\RelWithDebInfo\avida.exe"
+				Version="0.0"
+				GenerateManifest="TRUE"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				ProgramDataBaseFile="C:/Documents and Settings/Sherri Goings/Desktop/development/bin/RelWithDebInfo/avida.pdb"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				ImportLibrary="C:\Documents and Settings\Sherri Goings\Desktop\development\bin\RelWithDebInfo\avida.lib"/>
 		</Configuration>
 	</Configurations>
-	<References>
-	</References>
 	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
 			<File
-				RelativePath=".\source\main\avida.h"
-				>
+				RelativePath="C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+					Name="VCCustomBuildTool"
+					Description="Building Custom Rule C:/Documents and Settings/Sherri Goings/Desktop/development/CMakeLists.txt"
+					CommandLine="&quot;C:\Program Files\CMake 2.6\bin\cmake.exe&quot; &quot;-HC:/Documents and Settings/Sherri Goings/Desktop/development&quot; &quot;-BC:/Documents and Settings/Sherri Goings/Desktop/development&quot; --check-stamp-file CMakeFiles/generate.stamp"
+					AdditionalDependencies="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeSystem.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCCompiler.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeSystemSpecificInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeGenericSystem.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\gcc.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\Windows.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\WindowsPaths.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCInformation.cmake&quot;;&quot;C:\Program Files\CMak!
 e 2.6\share\cmake-2.6\Modules\Platform\Windows-cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCPlatform.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXPlatform.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeRCCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeRCInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCXXInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;"
+					Outputs="CMakeFiles\generate.stamp"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+					Name="VCCustomBuildTool"
+					Description="Building Custom Rule C:/Documents and Settings/Sherri Goings/Desktop/development/CMakeLists.txt"
+					CommandLine="&quot;C:\Program Files\CMake 2.6\bin\cmake.exe&quot; &quot;-HC:/Documents and Settings/Sherri Goings/Desktop/development&quot; &quot;-BC:/Documents and Settings/Sherri Goings/Desktop/development&quot; --check-stamp-file CMakeFiles/generate.stamp"
+					AdditionalDependencies="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeSystem.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCCompiler.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeSystemSpecificInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeGenericSystem.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\gcc.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\Windows.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\WindowsPaths.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCInformation.cmake&quot;;&quot;C:\Program Files\CMak!
 e 2.6\share\cmake-2.6\Modules\Platform\Windows-cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCPlatform.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXPlatform.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeRCCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeRCInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCXXInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;"
+					Outputs="CMakeFiles\generate.stamp"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="MinSizeRel|Win32">
+					<Tool
+					Name="VCCustomBuildTool"
+					Description="Building Custom Rule C:/Documents and Settings/Sherri Goings/Desktop/development/CMakeLists.txt"
+					CommandLine="&quot;C:\Program Files\CMake 2.6\bin\cmake.exe&quot; &quot;-HC:/Documents and Settings/Sherri Goings/Desktop/development&quot; &quot;-BC:/Documents and Settings/Sherri Goings/Desktop/development&quot; --check-stamp-file CMakeFiles/generate.stamp"
+					AdditionalDependencies="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeSystem.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCCompiler.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeSystemSpecificInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeGenericSystem.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\gcc.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\Windows.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\WindowsPaths.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCInformation.cmake&quot;;&quot;C:\Program Files\CMak!
 e 2.6\share\cmake-2.6\Modules\Platform\Windows-cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCPlatform.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXPlatform.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeRCCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeRCInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCXXInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;"
+					Outputs="CMakeFiles\generate.stamp"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="RelWithDebInfo|Win32">
+					<Tool
+					Name="VCCustomBuildTool"
+					Description="Building Custom Rule C:/Documents and Settings/Sherri Goings/Desktop/development/CMakeLists.txt"
+					CommandLine="&quot;C:\Program Files\CMake 2.6\bin\cmake.exe&quot; &quot;-HC:/Documents and Settings/Sherri Goings/Desktop/development&quot; &quot;-BC:/Documents and Settings/Sherri Goings/Desktop/development&quot; --check-stamp-file CMakeFiles/generate.stamp"
+					AdditionalDependencies="&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeSystem.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCCompiler.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeSystemSpecificInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeGenericSystem.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\gcc.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\Windows.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\WindowsPaths.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCInformation.cmake&quot;;&quot;C:\Program Files\CMak!
 e 2.6\share\cmake-2.6\Modules\Platform\Windows-cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCPlatform.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeCXXPlatform.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\Platform\cl.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeFiles\CMakeRCCompiler.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeRCInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCXXInformation.cmake&quot;;&quot;C:\Program Files\CMake 2.6\share\cmake-2.6\Modules\CMakeCommonLanguageInclude.cmake&quot;;&quot;C:\Documents and Settings\Sherri Goings\Desktop\development\CMakeLists.txt&quot;;"
+					Outputs="CMakeFiles\generate.stamp"/>
+				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\source\actions\cAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\cActionLibrary.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyze.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeCommand.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeCommandAction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeCommandDef.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeCommandDefBase.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeFlowCommand.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeFlowCommandDef.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeFunction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeGenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeJob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeJobQueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeJobWorker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cAnalyzeScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeTreeStats_CumulativeStemminess.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeTreeStats_Gamma.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cAnalyzeView.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cArgContainer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cArgSchema.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cAvidaConfig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cAvidaContext.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cAvidaDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cBarScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cBaseTextWindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthChamber.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthDemeHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthDemeHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthGenomeSizeHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthGenomeSizeHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthGlobalHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthGlobalHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthGridLocalHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthGridLocalHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthMateSelectHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthMateSelectHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthNeighborhoodHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthNeighborhoodHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthSelectionHandler.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthSelectionHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cBlockStruct.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cChangeList.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cClassificationManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCodeLabel.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cConditionVariable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cConstBurstSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cConstSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cCountTracker.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCPUMemory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCPUStack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCPUTestInfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cCycleCheck.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDataFile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDataFileManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDataManager_Base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDefaultAnalyzeDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDefaultMessageDisplay.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDefaultRunDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cDeme.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cDemeCellEvent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDemeProbSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDoubleSum.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDriverManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDriverStatusConduit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cEnvironment.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cEnvironmentScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cEnvReqs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cEventList.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cFallbackWorldDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cFile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cFitnessMatrix.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cFixedBlock.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cFixedCoords.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cGenome.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cGenomeUtil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotype_BirthData.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotype_TestData.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cGenotypeBatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotypeControl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cGenotypeData.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareBase.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareCPU.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareExperimental.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareGX.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareGX.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareSMT.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareStatusPrinter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareTracer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareTransSMT.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHeadCPU.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpAlias.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpFullEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpType.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHistogram.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cHistScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cID.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIndexedBlockStruct.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cInitFile.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotype_BirthData.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotypeControl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotypeElement.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotypeQueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cInstLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cInstLibEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cInstruction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cInstSet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIntegratedSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIntegratedScheduleNode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIntSum.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cLandscape.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cLineage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cLocalMutations.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cMapScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cMenuWindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cMerit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cModularityAnalysis.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMutation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cMutationalNeighborhood.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cMutationalNeighborhoodResults.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMutationLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMutationRates.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cMutationSteps.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cMutex.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMxCodeArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cOptionsScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrganism.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgInterface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgMessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgMessagePredicate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgMovementPredicate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgSeqMessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgSinkMessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgSourceMessage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPhenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPhenPlastGenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPlasticPhenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPopulation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPopulationCell.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPopulationInterface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cProbDemeProbSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cProbSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRandom.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRCObject.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReactionLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReactionProcess.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReactionRequisite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReactionResult.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRefBlock.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResourceCount.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResourceHistory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResourceLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRunningAverage.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRWLock.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cSaleItem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cScaledBlock.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cSchedule.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cSpatialCountElem.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cSpatialResCount.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cSpecies.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cSpeciesControl.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cSpeciesQueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cStats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cStatsScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cString.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cStringIterator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cStringList.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cStringUtil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cSymbolUtil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTabBox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cTaskContext.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cTaskEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cTaskLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cTaskState.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cTestCPU.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cTestCPUInterface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextViewerAnalyzeDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextViewerDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextViewerDriver_Base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextWindow.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\cThread.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cTools.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cUInt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\msvc2005\pdcurses\curses.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cView.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cView_Base.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cViewInfo.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cWeightedIndex.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cWorld.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cWorldDriver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cZoomScreen.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\defs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\DriverActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\EnvironmentActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\FloatingPoint.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\functions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\LandscapeActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\MyCodeArrayLessThan.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\nGenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\nGeometry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\nHardware.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\nInjectGenotype.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\nMutation.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\nReaction.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\nSpecies.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\platform.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\PlatformExpert.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\PopulationActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\PrintActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\SaveLoadActions.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\sCPUStats.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\tAnalyzeJob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\tAnalyzeJobBatch.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tArgDataEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tArrayMap.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tBuffer.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tDataEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tDataEntryBase.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tDataEntryCommand.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tDataManager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tDictionary.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tHashTable.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\tInstLib.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\tInstLibEntry.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tKVPair.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tList.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tManagedPointerArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tMatrix.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tMemTrack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tObjectFactory.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\tRLockPtr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tSmartArray.h"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\tVector.h"
-				>
-			</File>
-		</Filter>
 		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
+			Name="target"
+			Filter="">
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
+			Name="avida"
+			Filter="">
 			<File
-				RelativePath=".\source\main\avida.cc"
-				>
+				RelativePath="C:\Documents and Settings\Sherri Goings\Desktop\development\source\targets\avida\primitive.cc">
 			</File>
-			<File
-				RelativePath=".\source\actions\cActionLibrary.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyze.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeGenotype.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeJobQueue.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeJobWorker.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cAnalyzeScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeTreeStats_CumulativeStemminess.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cAnalyzeTreeStats_Gamma.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cAnalyzeView.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cArgContainer.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cArgSchema.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cAvidaConfig.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cBarScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cBirthChamber.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cBlockStruct.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cChangeList.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cClassificationManager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCodeLabel.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cConstBurstSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cConstSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCPUMemory.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCPUStack.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cCPUTestInfo.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cCycleCheck.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDataFile.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDataFileManager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDataManager_Base.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDefaultAnalyzeDriver.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDefaultMessageDisplay.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDefaultRunDriver.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cDeme.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cDemeCellEvent.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDemeProbSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cDoubleSum.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDriverManager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cDriverStatusConduit.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cEnvironment.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cEnvironmentScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cEventList.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\drivers\cFallbackWorldDriver.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cFile.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cFitnessMatrix.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cFixedBlock.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cFixedCoords.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cGenome.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cGenomeUtil.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotype.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotype_BirthData.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cGenotypeBatch.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cGenotypeControl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cGenotypeData.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareBase.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareCPU.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareExperimental.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareManager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareSMT.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareStatusPrinter.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHardwareTransSMT.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cHeadCPU.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpAlias.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpManager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHelpType.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cHistogram.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cHistScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIndexedBlockStruct.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cInitFile.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotype.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotypeControl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cInjectGenotypeQueue.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cInstruction.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cInstSet.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIntegratedSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIntegratedScheduleNode.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cIntSum.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cLandscape.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cLineage.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cLocalMutations.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cMapScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cMenuWindow.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cMerit.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cModularityAnalysis.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\analyze\cMutationalNeighborhood.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMutationLib.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMutationRates.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cMutationSteps.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cMxCodeArray.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cOptionsScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrganism.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cOrgMessage.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPhenotype.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPhenPlastGenotype.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPlasticPhenotype.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPopulation.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPopulationCell.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cPopulationInterface.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cProbDemeProbSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cProbSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRandom.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRCObject.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReaction.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReactionLib.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cReactionResult.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResource.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResourceCount.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResourceHistory.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cResourceLib.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cRunningAverage.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cSchedule.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cSpatialCountElem.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cSpatialResCount.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cSpecies.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cSpeciesControl.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\classification\cSpeciesQueue.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cStats.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cStatsScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cString.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cStringIterator.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cStringList.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cStringUtil.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cSymbolUtil.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cTaskLib.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cTestCPU.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\cpu\cTestCPUInterface.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextViewerAnalyzeDriver.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextViewerDriver.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextViewerDriver_Base.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cTextWindow.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\cThread.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cTools.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cView.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cViewInfo.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\tools\cWeightedIndex.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\main\cWorld.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\cZoomScreen.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\DriverActions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\EnvironmentActions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\LandscapeActions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\platform\PlatformExpert.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\PopulationActions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\PrintActions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\actions\SaveLoadActions.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\source\targets\avida-viewer\viewer.cc"
-				>
-			</File>
 		</Filter>
-		<File
-			RelativePath=".\source\platform\msvc2005\pdcurses\pdcurses.lib"
-			>
-		</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

Modified: branches/goings/source/classification/cClassificationManager.cc
===================================================================
--- branches/goings/source/classification/cClassificationManager.cc	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/classification/cClassificationManager.cc	2009-05-12 20:32:21 UTC (rev 3233)
@@ -120,6 +120,15 @@
   if (list_num < 0) list_num = FindCRC(in_genotype->GetGenome());
   
   m_active_genotypes[list_num].Push(in_genotype);
+
+  // for fitness sharing *SLG
+  for (int i = 0; i < m_genotype_ctl->GetSize(); i++) {
+	  cGenotype * genotype = m_genotype_ctl->Get(0);
+	  int hd = genotype->AddHDist(in_genotype);
+	  in_genotype->AddHDist(genotype, hd);
+	  m_genotype_ctl->Next(0);
+  }
+
   m_genotype_ctl->Insert(*in_genotype);
   m_world->GetStats().AddGenotype();
   
@@ -253,6 +262,14 @@
     int list_num = FindCRC(in_genotype.GetGenome());
     m_active_genotypes[list_num].Remove(&in_genotype);
     m_genotype_ctl->Remove(in_genotype);
+
+	// for fitness sharing *SLG
+	for (int i = 0; i < m_genotype_ctl->GetSize(); i++) {
+		cGenotype * genotype = m_genotype_ctl->Get(0);
+		genotype->RemHDist(&in_genotype);
+		m_genotype_ctl->Next(0);
+	}
+
     in_genotype.Deactivate(m_world->GetStats().GetUpdate(), m_world->GetStats().GetTotCreatures());
     if (m_world->GetConfig().TRACK_MAIN_LINEAGE.Get()) {
       m_genotype_ctl->InsertHistoric(in_genotype);
@@ -1427,3 +1444,4 @@
   
   return ret_value;
 }
+

Modified: branches/goings/source/classification/cGenotype.cc
===================================================================
--- branches/goings/source/classification/cGenotype.cc	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/classification/cGenotype.cc	2009-05-12 20:32:21 UTC (rev 3233)
@@ -184,7 +184,36 @@
   birth_data.breed_true_track.Next();
   birth_data.breed_in_track.Next();
 }
+// for fitness sharing *SLG
+int cGenotype::AddHDist(cGenotype* gen)
+{
+	int dist = cGenomeUtil::FindHammingDistance(GetGenome(), gen->GetGenome(), 0);
+	hdists[gen] = dist;
+	return dist;
+}
 
+// for fitness sharing *SLG
+double cGenotype::GetNicheVal()
+{
+	double r = m_world->GetConfig().NICHE_RADIUS.Get();
+	if (r==0.0)
+		return 1.0;
+	double p = m_world->GetConfig().NICHE_SCALING.Get();
+
+	double sum = 0;
+	map< cGenotype*, int >::iterator it = hdists.begin();
+	for(; it != hdists.end(); it++)
+	{
+		cGenotype* cur_gen = it->first;
+		double num_orgs = cur_gen->GetNumOrganisms();
+		double share = 0;
+		if (it->second < r)
+			share = 1 - pow((it->second / r),p);
+		sum += share * num_orgs;
+	}
+	return sum;
+}
+
 void cGenotype::SetGenome(const cGenome & in_genome)
 {
   genome = in_genome;

Modified: branches/goings/source/classification/cGenotype.h
===================================================================
--- branches/goings/source/classification/cGenotype.h	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/classification/cGenotype.h	2009-05-12 20:32:21 UTC (rev 3233)
@@ -43,6 +43,7 @@
 #ifndef cString_h
 #include "cString.h"
 #endif
+#include <map>
 
 
 class cAvidaContext;
@@ -73,6 +74,9 @@
   mutable cGenotype_TestData test_data;
   cGenotype_BirthData birth_data;
   mutable cPhenPlastSummary* m_phenplast;
+
+  // for fitness sharing *SLG
+  std::map<cGenotype*, int> hdists;
   
   // Statistical info
 
@@ -132,6 +136,11 @@
   void SetGenome(const cGenome & in_genome);
   void SetSpecies(cSpecies * in_species) { species = in_species; }
 
+  // for fitness sharing *SLG
+  int AddHDist(cGenotype* gen);
+  void AddHDist(cGenotype* gen, int dist) { hdists[gen] = dist; }
+  void RemHDist(cGenotype* gen) { hdists.erase(gen); }
+  double GetNicheVal();
  
   // Test CPU info -- only used with limited options on.
   inline bool GetTestViable(cAvidaContext& ctx) const;

Modified: branches/goings/source/cpu/cHardwareBase.cc
===================================================================
--- branches/goings/source/cpu/cHardwareBase.cc	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/cpu/cHardwareBase.cc	2009-05-12 20:32:21 UTC (rev 3233)
@@ -537,13 +537,14 @@
 	    bool del = false;
 	    bool added = false;
 	    for (int i=0; i<childtasks.GetSize(); i++)
+		{
 	      if (childtasks[i] > parenttasks[i]) {
-		added = true;
-		break;
+			added = true;
+			break;
 	      }
-	      else if (childtasks[i] < parenttasks[i]) {
-		del = true;
-	      }
+	      else if (childtasks[i] < parenttasks[i])
+			del = true;
+		}
 	    revert = (del & !added);
 	  }
       
@@ -624,13 +625,14 @@
 	  bool del = false;
 	  bool added = false;
 	  for (int i=0; i<childtasks.GetSize(); i++)
+	  {
 		  if (childtasks[i] > parenttasks[i]) {
 			  added = true;
 			  break;
 		  }
-		  else if (childtasks[i] < parenttasks[i]) {
+		  else if (childtasks[i] < parenttasks[i]) 
 			  del = true;
-		  }
+	  }
 	  revert = (del & !added);
   }
  

Modified: branches/goings/source/main/cAvidaConfig.h
===================================================================
--- branches/goings/source/main/cAvidaConfig.h	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/main/cAvidaConfig.h	2009-05-12 20:32:21 UTC (rev 3233)
@@ -350,6 +350,8 @@
   CONFIG_ADD_VAR(GENERATION_INC_METHOD, int, 1, "0 = Only the generation of the child is\n    increased on divide.\n1 = Both the generation of the mother and child are\n    increased on divide (good with DIVIDE_METHOD 1).");
   CONFIG_ADD_VAR(RESET_INPUTS_ON_DIVIDE, int, 0, "Reset environment inputs of parent upon successful divide.");
   CONFIG_ADD_VAR(REPRO_METHOD, int, 1, "Replace existing organism: 1=yes");
+  CONFIG_ADD_VAR(NICHE_RADIUS, double, 0.0, "niche radius to use with fitness sharing, 0 means no sharing");
+  CONFIG_ADD_VAR(NICHE_SCALING, double, 1.0, "scaling factor to use with fitness sharing");
 	
   CONFIG_ADD_GROUP(RECOMBINATION_GROUP, "Sexual Recombination and Modularity");
   CONFIG_ADD_VAR(RECOMBINATION_PROB, double, 1.0, "probability of recombination in div-sex");
@@ -424,6 +426,7 @@
   CONFIG_ADD_VAR(STERILIZE_DETRIMENTAL, double, 0.0, "");
   CONFIG_ADD_VAR(STERILIZE_NEUTRAL, double, 0.0, "");
   CONFIG_ADD_VAR(STERILIZE_BENEFICIAL, double, 0.0, "");
+  CONFIG_ADD_VAR(STERILIZE_TASKLOSS, double, 0.0, "");
   CONFIG_ADD_VAR(FAIL_IMPLICIT, int, 0, "Should copies that failed *not* due to mutations\nbe eliminated?");
   CONFIG_ADD_VAR(NEUTRAL_MAX,double, 0.0, "The percent benifical change from parent fitness\nto be considered neutral.");
   CONFIG_ADD_VAR(NEUTRAL_MIN,double, 0.0, "The percent deleterious change from parent fitness\nto be considered neutral.");

Modified: branches/goings/source/main/cPhenotype.cc
===================================================================
--- branches/goings/source/main/cPhenotype.cc	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/main/cPhenotype.cc	2009-05-12 20:32:21 UTC (rev 3233)
@@ -1288,7 +1288,18 @@
     out_size = m_world->GetConfig().BASE_CONST_MERIT.Get();
     break;
   }
+  /*if (m_world->GetConfig().FITNESS_SHARING.Get()) 
+  {
+	  cGenotype * genotype = 
+	  cClassificationManager* classmgr = m_world->GetClassificationManager();
+	  for (cGenotype * cur_genotype = classmgr->ResetThread(0); cur_genotype != NULL;
+		  cur_genotype = classmgr.NextGenotype(0)) 
+	  {
+		  int cur_num = cur_genotype->GetNumOrganisms();
+	  }
 
+  }*/
+
   return out_size;
 } 
 

Modified: branches/goings/source/main/cPopulation.cc
===================================================================
--- branches/goings/source/main/cPopulation.cc	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/main/cPopulation.cc	2009-05-12 20:32:21 UTC (rev 3233)
@@ -393,6 +393,11 @@
         delete test_cpu;
       }
     }
+
+	// for fitness sharing *SLG
+	double niche_val = parent_genotype->GetNicheVal(); 
+	cMerit parent_merit = parent_phenotype.GetMerit();
+	parent_merit.SetNicheVal(niche_val);
     AdjustSchedule(parent_cell, parent_phenotype.GetMerit());
     
     // In a local run, face the child toward the parent. 
@@ -547,6 +552,9 @@
   }
   m_world->GetClassificationManager().AdjustGenotype(*in_genotype);
   
+	// for fitness sharing *SLG
+  double niche_val = in_genotype->GetNicheVal();
+
   // Initialize the time-slice for this new organism.
   AdjustSchedule(target_cell, in_organism->GetPhenotype().GetMerit());
   

Modified: branches/goings/source/tools/cMerit.h
===================================================================
--- branches/goings/source/tools/cMerit.h	2009-05-12 18:05:09 UTC (rev 3232)
+++ branches/goings/source/tools/cMerit.h	2009-05-12 20:32:21 UTC (rev 3233)
@@ -40,11 +40,12 @@
   unsigned int base;
   int offset;
   double value;
+  double niche_val;
 
   void UpdateValue(double in_value);
 
 public:
-  cMerit() : bits(0), base(0), offset(0), value(0) { ; }
+  cMerit() : bits(0), base(0), offset(0), value(0), niche_val(1) { ; }
 
   explicit cMerit(const int    in_value){ UpdateValue(in_value); }
   explicit cMerit(const unsigned int   in_value){ UpdateValue(in_value); }
@@ -52,6 +53,7 @@
   cMerit(const cMerit& merit) { *this = merit; }
 
   bool OK() const;
+  void SetNicheVal(double in_val) { niche_val = in_val; }
 
   void operator=(const cMerit & _merit)
   {
@@ -89,7 +91,7 @@
     assert(value < UINT_MAX);  // Fails for merit values > UINT_MAX.
     return (unsigned int) value; }
 
-  double GetDouble()      const { return value; }
+  double GetDouble()      const { return value/niche_val; }
 
   int GetBit(int bit_num)  const {
     assert(bit_num >= 0);




More information about the Avida-cvs mailing list