[avida-cvs] avida(kaben) CVS commits: /current bootstrap /current/source/cpu hardware_cpu.cc /current/source/main genebank.cc genebank.hh primitive.ncb primitive.pch primitive.pdb primitive.sln primitive.suo primitive.vcproj /current/source/qt-viewer population_cell_wrapper.hh qt-viewer.pch qt-viewer.pdb qt_viewer.ncb qt_viewer.sln qt_viewer.suo qt_viewer.vcproj /current/source/qt-viewer/exp avd_widget_list.hh avd_widget_list_item.hh avd_widget_list_item_container.hh /current/source/third-party/trio-1.9 example.c regression.c strio.h trio.c trio.h triodef.h trionan.c trionan.h triop.h triostr.c triostr.h /current/source/third-party/trio-1.9/doc doc.h doc_dynamic.h doc_printf.h doc_register.h doc_scanf.h doc_static.h /current/source/viewers ncurses-viewer.ilk ncurses-viewer.pch ncurses-viewer.pdb ncurses_viewer.ncb ncurses_viewer.sln ncurses_viewer.suo ncurses_viewer.vcproj

kaben avida-cvs at alife.org
Sat Oct 11 03:46:27 PDT 2003


kaben		Fri Oct 10 19:46:27 2003 EDT

  Modified files:              (Branch: kaben)
    /avida/current	bootstrap 
    /avida/current/source/cpu	hardware_cpu.cc 
    /avida/current/source/main	primitive.ncb primitive.pch 
                              	primitive.pdb primitive.sln 
                              	primitive.suo primitive.vcproj 
                              	genebank.cc genebank.hh 
    /avida/current/source/qt-viewer	qt-viewer.pch qt-viewer.pdb 
                                   	qt_viewer.ncb qt_viewer.sln 
                                   	qt_viewer.suo qt_viewer.vcproj 
                                   	population_cell_wrapper.hh 
    /avida/current/source/qt-viewer/exp	avd_widget_list.hh 
                                       	avd_widget_list_item.hh 
                                       	avd_widget_list_item_container.hh 
    /avida/current/source/third-party/trio-1.9	example.c regression.c 
                                              	strio.h trio.c trio.h 
                                              	triodef.h trionan.c 
                                              	trionan.h triop.h 
                                              	triostr.c triostr.h 
    /avida/current/source/third-party/trio-1.9/doc	doc.h doc_dynamic.h 
                                                  	doc_printf.h 
                                                  	doc_register.h 
                                                  	doc_scanf.h 
                                                  	doc_static.h 
    /avida/current/source/viewers	ncurses-viewer.ilk ncurses-viewer.pch 
                                 	ncurses-viewer.pdb ncurses_viewer.ncb 
                                 	ncurses_viewer.sln ncurses_viewer.suo 
                                 	ncurses_viewer.vcproj 
  Log:
  Merged branch HEAD into branch kaben.
  
-------------- next part --------------
Index: avida/current/bootstrap
diff -u avida/current/bootstrap:1.5.2.3 avida/current/bootstrap:1.5.2.4
--- avida/current/bootstrap:1.5.2.3	Tue Sep 23 20:57:42 2003
+++ avida/current/bootstrap	Fri Oct 10 19:45:53 2003
@@ -12,7 +12,7 @@
 # helps bootstrapping, when checked out from CVS
 # requires GNU autoconf and GNU automake
 #
-# $Id: bootstrap,v 1.5.2.3 2003/09/24 03:57:42 kaben Exp $
+# $Id: bootstrap,v 1.5.2.4 2003/10/11 02:45:53 kaben Exp $
 
 # this is not meant to be exported outside the source tree
 
Index: avida/current/source/cpu/hardware_cpu.cc
diff -u avida/current/source/cpu/hardware_cpu.cc:1.34.2.10 avida/current/source/cpu/hardware_cpu.cc:1.34.2.11
--- avida/current/source/cpu/hardware_cpu.cc:1.34.2.10	Thu Oct  2 17:04:37 2003
+++ avida/current/source/cpu/hardware_cpu.cc	Fri Oct 10 19:45:53 2003
@@ -3125,7 +3125,7 @@
 
 bool cHardwareCPU::Inst_HeadDivideAsexWait()  
 { 
-  organism->GetPhenotype().SetDivideSex(false);
+  organism->GetPhenotype().SetDivideSex(true);
   organism->GetPhenotype().SetCrossNum(0);
   return Inst_HeadDivide(); 
 }
Index: avida/current/source/main/primitive.ncb
Index: avida/current/source/main/primitive.pch
Index: avida/current/source/main/primitive.pdb
Index: avida/current/source/main/primitive.sln
diff -u /dev/null avida/current/source/main/primitive.sln:1.1.2.5
--- /dev/null	Fri Oct 10 19:46:22 2003
+++ avida/current/source/main/primitive.sln	Fri Oct 10 19:46:04 2003
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "primitive", "primitive.vcproj", "{D090D0B7-F4CE-4998-9447-665551EC2287}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = primitive-debug
+		ConfigName.1 = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{D090D0B7-F4CE-4998-9447-665551EC2287}.primitive-debug.ActiveCfg = Debug|Win32
+		{D090D0B7-F4CE-4998-9447-665551EC2287}.primitive-debug.Build.0 = Debug|Win32
+		{D090D0B7-F4CE-4998-9447-665551EC2287}.Release.ActiveCfg = Release|Win32
+		{D090D0B7-F4CE-4998-9447-665551EC2287}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
Index: avida/current/source/main/primitive.suo
Index: avida/current/source/main/primitive.vcproj
diff -u /dev/null avida/current/source/main/primitive.vcproj:1.1.2.6
--- /dev/null	Fri Oct 10 19:46:22 2003
+++ avida/current/source/main/primitive.vcproj	Fri Oct 10 19:46:04 2003
@@ -0,0 +1,533 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="primitive"
+	ProjectGUID="{461e7351-c13c-48ef-8c3b-d2f22cb33935}">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..,..\cpu,..\event,..\main,..\third-party\trio-1.9,..\tools,$(QTDIR)\include,C:\cygwin\home\Kaben\CygwinExperiment\current\source\main,$(QTDIR)\mkspecs\win32-msvc.net"
+				PreprocessorDefinitions="_CONSOLE,UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT"
+				GeneratePreprocessedFile="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\primitive.pch"
+				AssemblerListingLocation=".\"
+				ObjectFile=".\"
+				ProgramDataBaseFileName=".\"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="qt-mteval312.lib qtmain.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib"
+				OutputFile=".\primitive.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="primitive.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\main\analyze.cc">
+			</File>
+			<File
+				RelativePath="..\main\analyze_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\avida.cc">
+			</File>
+			<File
+				RelativePath="..\tools\b_struct2.cc">
+			</File>
+			<File
+				RelativePath="..\main\birth_chamber.cc">
+			</File>
+			<File
+				RelativePath="..\tools\block_struct.cc">
+			</File>
+			<File
+				RelativePath="..\main\callback_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\config.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_memory.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stack.cc">
+			</File>
+			<File
+				RelativePath="..\tools\data_entry.cc">
+			</File>
+			<File
+				RelativePath="..\tools\data_manager.cc">
+			</File>
+			<File
+				RelativePath="..\tools\datafile.cc">
+			</File>
+			<File
+				RelativePath="..\main\environment.cc">
+			</File>
+			<File
+				RelativePath="..\event\event.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_factory.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_factory_manager.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_list.cc">
+			</File>
+			<File
+				RelativePath="..\tools\file.cc">
+			</File>
+			<File
+				RelativePath="..\main\fitness_matrix.cc">
+			</File>
+			<File
+				RelativePath="..\main\genebank.cc">
+			</File>
+			<File
+				RelativePath="..\main\genome.cc">
+			</File>
+			<File
+				RelativePath="..\main\genome_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\genotype.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_base.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_cpu.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_factory.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_util.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\head.cc">
+			</File>
+			<File
+				RelativePath="..\tools\help.cc">
+			</File>
+			<File
+				RelativePath="..\main\inst.cc">
+			</File>
+			<File
+				RelativePath="..\main\inst_util.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\label.cc">
+			</File>
+			<File
+				RelativePath="..\main\landscape.cc">
+			</File>
+			<File
+				RelativePath="..\main\lineage.cc">
+			</File>
+			<File
+				RelativePath="..\main\lineage_control.cc">
+			</File>
+			<File
+				RelativePath="..\tools\merit.cc">
+			</File>
+			<File
+				RelativePath="..\tools\message_display.cc">
+			</File>
+			<File
+				RelativePath="..\main\mutations.cc">
+			</File>
+			<File
+				RelativePath="..\main\organism.cc">
+			</File>
+			<File
+				RelativePath="..\main\phenotype.cc">
+			</File>
+			<File
+				RelativePath="..\main\pop_interface.cc">
+			</File>
+			<File
+				RelativePath="..\main\population.cc">
+			</File>
+			<File
+				RelativePath="..\main\population_cell.cc">
+			</File>
+			<File
+				RelativePath="..\event\population_event_factory.cc">
+			</File>
+			<File
+				RelativePath="primitive.cc">
+			</File>
+			<File
+				RelativePath="..\tools\random.cc">
+			</File>
+			<File
+				RelativePath="..\main\reaction.cc">
+			</File>
+			<File
+				RelativePath="..\main\reaction_result.cc">
+			</File>
+			<File
+				RelativePath="..\main\resource.cc">
+			</File>
+			<File
+				RelativePath="..\main\resource_count.cc">
+			</File>
+			<File
+				RelativePath="..\tools\slice.cc">
+			</File>
+			<File
+				RelativePath="..\main\species.cc">
+			</File>
+			<File
+				RelativePath="..\tools\stat.cc">
+			</File>
+			<File
+				RelativePath="..\main\stats.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string_list.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\tasks.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\test_cpu.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\test_util.cc">
+			</File>
+			<File
+				RelativePath="..\tools\tools.cc">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trio.c">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trionan.c">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triostr.c">
+			</File>
+			<File
+				RelativePath="..\tools\weighted_index.cc">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\main\analyze.hh">
+			</File>
+			<File
+				RelativePath="..\main\analyze_util.hh">
+			</File>
+			<File
+				RelativePath="..\main\avida.hh">
+			</File>
+			<File
+				RelativePath="..\tools\b_struct2.hh">
+			</File>
+			<File
+				RelativePath="..\main\birth_chamber.hh">
+			</File>
+			<File
+				RelativePath="..\tools\block_struct.hh">
+			</File>
+			<File
+				RelativePath="..\main\callback_util.hh">
+			</File>
+			<File
+				RelativePath="..\main\config.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_defs.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_memory.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stack.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stats.hh">
+			</File>
+			<File
+				RelativePath="..\tools\data_entry.hh">
+			</File>
+			<File
+				RelativePath="..\tools\data_manager.hh">
+			</File>
+			<File
+				RelativePath="..\tools\datafile.hh">
+			</File>
+			<File
+				RelativePath="..\main\environment.hh">
+			</File>
+			<File
+				RelativePath="..\event\event.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_factory.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_factory_manager.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_list.hh">
+			</File>
+			<File
+				RelativePath="..\tools\file.hh">
+			</File>
+			<File
+				RelativePath="..\main\fitness_matrix.hh">
+			</File>
+			<File
+				RelativePath="..\tools\functions.hh">
+			</File>
+			<File
+				RelativePath="..\main\genebank.hh">
+			</File>
+			<File
+				RelativePath="..\main\genome.hh">
+			</File>
+			<File
+				RelativePath="..\main\genome_util.hh">
+			</File>
+			<File
+				RelativePath="..\main\genotype.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_base.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_cpu.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_factory.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_method.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_util.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\head.hh">
+			</File>
+			<File
+				RelativePath="..\tools\help.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst_lib.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst_util.hh">
+			</File>
+			<File
+				RelativePath="..\tools\int.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\label.hh">
+			</File>
+			<File
+				RelativePath="..\main\landscape.hh">
+			</File>
+			<File
+				RelativePath="..\main\lineage.hh">
+			</File>
+			<File
+				RelativePath="..\main\lineage_control.hh">
+			</File>
+			<File
+				RelativePath="..\tools\merit.hh">
+			</File>
+			<File
+				RelativePath="..\tools\message_display.hh">
+			</File>
+			<File
+				RelativePath="..\tools\message_display_hdrs.hh">
+			</File>
+			<File
+				RelativePath="..\main\mutations.hh">
+			</File>
+			<File
+				RelativePath="..\main\organism.hh">
+			</File>
+			<File
+				RelativePath="..\main\phenotype.hh">
+			</File>
+			<File
+				RelativePath="..\main\pop_interface.hh">
+			</File>
+			<File
+				RelativePath="..\main\population.hh">
+			</File>
+			<File
+				RelativePath="..\main\population_cell.hh">
+			</File>
+			<File
+				RelativePath="..\event\population_event_factory.hh">
+			</File>
+			<File
+				RelativePath="..\tools\random.hh">
+			</File>
+			<File
+				RelativePath="..\main\reaction.hh">
+			</File>
+			<File
+				RelativePath="..\main\reaction_result.hh">
+			</File>
+			<File
+				RelativePath="..\main\resource.hh">
+			</File>
+			<File
+				RelativePath="..\main\resource_count.hh">
+			</File>
+			<File
+				RelativePath="..\tools\slice.hh">
+			</File>
+			<File
+				RelativePath="..\main\species.hh">
+			</File>
+			<File
+				RelativePath="..\tools\stat.hh">
+			</File>
+			<File
+				RelativePath="..\main\stats.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string_list.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string_util.hh">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\strio.h">
+			</File>
+			<File
+				RelativePath="..\tools\tArray.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tBuffer.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tDictionary.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tList.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tMatrix.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tVector.hh">
+			</File>
+			<File
+				RelativePath="..\main\tasks.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\test_cpu.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\test_util.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tools.hh">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trio.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triodef.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trionan.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triop.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triostr.h">
+			</File>
+			<File
+				RelativePath="..\tools\weighted_index.hh">
+			</File>
+			<File
+				RelativePath="..\tools\win32_mkdir_hack.hh">
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\cpu\hardware_4stack.cc">
+		</File>
+		<File
+			RelativePath="..\cpu\hardware_4stack.hh">
+		</File>
+		<File
+			RelativePath="inst_set.cc">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: avida/current/source/main/genebank.cc
diff -u avida/current/source/main/genebank.cc:1.28.2.4 avida/current/source/main/genebank.cc:1.28.2.5
--- avida/current/source/main/genebank.cc:1.28.2.4	Mon Aug 25 23:30:22 2003
+++ avida/current/source/main/genebank.cc	Fri Oct 10 19:45:54 2003
@@ -14,101 +14,13 @@
 #include "config.hh"
 #include "stats.hh"
 
+#include "../tools/tArray.hh"
 #include "../cpu/test_util.hh"
 
 
 using namespace std;
 
 
-/////////////////////
-//  cGenotypeQueue
-/////////////////////
-
-cGenotypeQueue::cGenotypeQueue()
-{
-  size = 0;
-  root.SetNext(&root);
-  root.SetPrev(&root);
-}
-
-
-cGenotypeQueue::~cGenotypeQueue()
-{
-  while (root.GetNext() != &root) {
-    Remove(root.GetNext());
-  }
-}
-
-bool cGenotypeQueue::OK()
-{
-  bool result = true;
-  int count = 0;
-
-  for (cGenotypeElement * temp_element = root.GetNext();
-       temp_element != &root;
-       temp_element = temp_element->GetNext()) {
-    assert (temp_element->GetNext()->GetPrev() == temp_element);
-    assert (temp_element->GetGenotype()->GetID() >= 0);
-
-    count++;
-    assert (count <= size);
-  }
-
-  assert (count == size);
-
-  return result;
-}
-
-void cGenotypeQueue::Insert(cGenotype & in_genotype)
-{
-  cGenotypeElement * new_element = new cGenotypeElement(&in_genotype);
-  new_element->SetNext(root.GetNext());
-  new_element->SetPrev(&root);
-  root.GetNext()->SetPrev(new_element);
-  root.SetNext(new_element);
-  size++;
-}
-
-void cGenotypeQueue::Remove(cGenotype & in_genotype)
-{
-  cGenotypeElement * cur_element;
-
-  for (cur_element = root.GetNext();
-       cur_element != &root;
-       cur_element = cur_element->GetNext()) {
-    if (cur_element->GetGenotype() == &in_genotype) break;
-  }
-
-  assert (cur_element != &root);
-
-  Remove(cur_element);
-}
-
-void cGenotypeQueue::Remove(cGenotypeElement * in_element)
-{
-  in_element->GetPrev()->SetNext(in_element->GetNext());
-  in_element->GetNext()->SetPrev(in_element->GetPrev());
-  in_element->SetNext(NULL);
-  in_element->SetPrev(NULL);
-  delete(in_element);
-
-  size--;
-}
-
-cGenotype * cGenotypeQueue::Find(const cGenome & in_genome) const
-{
-  for (cGenotypeElement * cur_element = root.GetNext();
-       cur_element != &root;
-       cur_element = cur_element->GetNext()) {
-    if (cur_element->GetGenotype()->GetGenome() == in_genome) {
-      return cur_element->GetGenotype();
-    }
-  }
-
-  return NULL;
-}
-
-
 ///////////////////////
 //  cGenotypeControl
 ///////////////////////
@@ -720,6 +632,22 @@
 			     filename, best_genotype, stats.GetUpdate());
     }
   }
+
+//   tArray<int> hist_array(15);
+//   hist_array.SetAll(0);
+//   int total_gens = 0;
+  
+//   for (int i = 0; i < GENOTYPE_HASH_SIZE; i++) {
+//     int cur_val = active_genotypes[i].GetSize();
+//     total_gens += cur_val;
+//     if (cur_val < 15) hist_array[cur_val]++;
+//     else cout << cur_val << " ";
+//   }
+//   cout << endl;
+//   for (int i = 0; i < 15; i++) {
+//     cout << i << " : " << hist_array[i] << endl;
+//   }
+//   cout << "Total genotypes: " << total_gens << endl;
 }
 
 cString cGenebank::GetLabel(int in_size, int in_num)
@@ -740,14 +668,13 @@
 }
 
 
-void cGenebank::AddGenotype(cGenotype * in_genotype, int in_list_num)
+void cGenebank::AddGenotype(cGenotype * in_genotype, int list_num)
 {
   assert( in_genotype != 0 );
   
-  if ( in_list_num < 0 )
-    in_list_num = FindCRC(in_genotype->GetGenome()) % GENOTYPE_HASH_SIZE;
+  if (list_num < 0) list_num = FindCRC(in_genotype->GetGenome());
   
-  active_genotypes[in_list_num].Insert(*in_genotype);
+  active_genotypes[list_num].Push(in_genotype);
   genotype_control->Insert(*in_genotype);
   stats.AddGenotype(in_genotype->GetID());
 
@@ -767,42 +694,42 @@
 cGenotype * cGenebank::AddGenotype(const cGenome & in_genome,
 				   cGenotype * parent_genotype)
 {
-  int list_num = FindCRC(in_genome) % GENOTYPE_HASH_SIZE;
-  cGenotype * found_genotype;
-
-  found_genotype = active_genotypes[list_num].Find(in_genome);
+  int list_num = FindCRC(in_genome);
+  cGenotype * found_genotype = FindGenotype(in_genome, list_num);
 
   if (!found_genotype) {
     found_genotype = new cGenotype(stats.GetUpdate());
     found_genotype->SetGenome(in_genome);
     found_genotype->SetParent(parent_genotype);
     
-    AddGenotype( found_genotype, list_num );
-    /*
-    active_genotypes[list_num].Insert(*found_genotype);
-    genotype_control->Insert(*found_genotype);
-    stats.AddGenotype(found_genotype->GetID());
-
-    // Speciation... If we are creating a new genotype here, we must
-    // initilize it to the species of its parent genotype.
-
-    cSpecies * parent_species = NULL;
-    if (parent_genotype != NULL) {
-      parent_species = parent_genotype->GetSpecies();
-    }
-
-    found_genotype->SetSpecies(parent_species);
-    if (parent_species != NULL) parent_species->AddGenotype();
-    */
+    AddGenotype(found_genotype, list_num);
   }
 
   return found_genotype;
 }
 
-cGenotype * cGenebank::FindGenotype(const cGenome & in_genome) const
+const cGenotype * cGenebank::FindGenotype(const cGenome & in_genome,
+				    int list_num) const
+{
+  if (list_num < 0) list_num = FindCRC(in_genome);
+
+  tConstListIterator<cGenotype> list_it(active_genotypes[list_num]);
+  while (list_it.Next() != NULL) {
+    if (list_it.GetConst()->GetGenome() == in_genome) break;
+  }
+  return list_it.GetConst();
+}
+
+cGenotype * cGenebank::FindGenotype(const cGenome & in_genome,
+				    int list_num)
 {
-  int list_num = FindCRC(in_genome) % GENOTYPE_HASH_SIZE;
-  return active_genotypes[list_num].Find(in_genome);
+  if (list_num < 0) list_num = FindCRC(in_genome);
+
+  tListIterator<cGenotype> list_it(active_genotypes[list_num]);
+  while (list_it.Next() != NULL) {
+    if (list_it.Get()->GetGenome() == in_genome) break;
+  }
+  return list_it.Get();
 }
 
 void cGenebank::RemoveGenotype(cGenotype & in_genotype)
@@ -812,8 +739,8 @@
   // assigned to it.
 
   if (in_genotype.GetActive() == true) {
-    int list_num = FindCRC(in_genotype.GetGenome()) % GENOTYPE_HASH_SIZE;
-    active_genotypes[list_num].Remove(in_genotype);
+    int list_num = FindCRC(in_genotype.GetGenome());
+    active_genotypes[list_num].Remove(&in_genotype);
     genotype_control->Remove(in_genotype);
     in_genotype.Deactivate(stats.GetUpdate());
     if (cConfig::GetTrackMainLineage()) {
@@ -1178,12 +1105,6 @@
 
 #endif
 
-  // Loop through all of the reference lists for matching genotypes...
-
-  for (i = 0; i < GENOTYPE_HASH_SIZE; i++) {
-    assert (active_genotypes[i].OK());
-  }
-
   assert (ret_value == true);
 
   return ret_value;
@@ -1206,15 +1127,13 @@
 
 unsigned int cGenebank::FindCRC(const cGenome & in_genome) const
 {
-  unsigned int total = 13;
-  int i;
+  unsigned int total = 0;
 
-  for (i = 0; i < in_genome.GetSize(); i++) {
-    total *= in_genome[i].GetOp() + 10 + i << 6;
-    total += 3;
+  for (int i = 0; i < in_genome.GetSize(); i++) {
+    total += (in_genome[i].GetOp() + 3) * i;
   }
 
-  return total;
+  return total % GENOTYPE_HASH_SIZE;
 }
 
 void cGenebank::SpeciesTest(char * message, cGenotype & genotype)
Index: avida/current/source/main/genebank.hh
diff -u avida/current/source/main/genebank.hh:1.17.2.2 avida/current/source/main/genebank.hh:1.17.2.3
--- avida/current/source/main/genebank.hh:1.17.2.2	Tue May 20 05:12:22 2003
+++ avida/current/source/main/genebank.hh	Fri Oct 10 19:45:54 2003
@@ -9,6 +9,7 @@
 #define GENEBANK_HH
 
 #include "../tools/string.hh"
+#include "../tools/tList.hh"
 #include "../defs.hh"
 
 // porting to gcc 3.1 -- k
@@ -21,7 +22,7 @@
 class cSpecies;
 class cStats;
 
-#define GENOTYPE_HASH_SIZE 307    // @CAO Is this an optimal number?
+#define GENOTYPE_HASH_SIZE 3203    // @CAO Is this an optimal number?
 #define SPECIES_HASH_SIZE 101
 #define GENOTYPE_THREADS 2
 
@@ -29,42 +30,6 @@
 #define SPECIES_RECORD_FULL    1
 #define SPECIES_RECORD_LIMITED 2
 
-class cGenotypeElement {
-private:
-  cGenotype * genotype;
-  cGenotypeElement * next;
-  cGenotypeElement * prev;
-public:
-  inline cGenotypeElement(cGenotype * in_gen=NULL) : genotype(in_gen) {
-    next = NULL;  prev = NULL;
-  }
-  inline ~cGenotypeElement() { ; }
-
-  inline cGenotype * GetGenotype() const { return genotype; }
-  inline cGenotypeElement * GetNext() const { return next; }
-  inline cGenotypeElement * GetPrev() const { return prev; }
-
-  inline void SetNext(cGenotypeElement * in_next) { next = in_next; }
-  inline void SetPrev(cGenotypeElement * in_prev) { prev = in_prev; }
-};
-
-class cGenotypeQueue {
-private:
-  int size;
-  cGenotypeElement root;
-
-  void Remove(cGenotypeElement * in_element);
-public:
-  cGenotypeQueue();
-  ~cGenotypeQueue();
-
-  bool OK();
-
-  void Insert(cGenotype & in_genotype);
-  void Remove(cGenotype & in_genotype);
-  cGenotype * Find(const cGenome & in_genome) const;
-};
-
 class cGenotypeControl {
 private:
   int size;
@@ -162,7 +127,7 @@
 class cGenebank {
 private:
   unsigned int genotype_count[MAX_CREATURE_SIZE];
-  cGenotypeQueue active_genotypes[GENOTYPE_HASH_SIZE];
+  tList<cGenotype> active_genotypes[GENOTYPE_HASH_SIZE];
   cGenotypeControl * genotype_control;
   cSpeciesControl * species_control;
   cStats & stats;
@@ -183,10 +148,11 @@
    * function AddGenotype(const cGenome & in_genome, 
    * cGenotype * parent_genotype = NULL), which then calls this one.
    **/
-  void AddGenotype(cGenotype *in_genotype, int in_list_num = -1 );
+  void AddGenotype(cGenotype *in_genotype, int list_num=-1);
   cGenotype * AddGenotype(const cGenome & in_genome,
 			  cGenotype * parent_genotype = NULL);
-  cGenotype * FindGenotype(const cGenome & in_genome) const;
+  const cGenotype * FindGenotype(const cGenome & in_genome, int list_num=-1) const;
+  cGenotype * FindGenotype(const cGenome & in_genome, int list_num=-1);
   void RemoveGenotype(cGenotype & in_genotype);
   void ThresholdGenotype(cGenotype & in_genotype);
   bool AdjustGenotype(cGenotype & in_genotype);
Index: avida/current/source/qt-viewer/qt-viewer.pch
Index: avida/current/source/qt-viewer/qt-viewer.pdb
Index: avida/current/source/qt-viewer/qt_viewer.ncb
Index: avida/current/source/qt-viewer/qt_viewer.sln
diff -u /dev/null avida/current/source/qt-viewer/qt_viewer.sln:1.1.2.3
--- /dev/null	Fri Oct 10 19:46:24 2003
+++ avida/current/source/qt-viewer/qt_viewer.sln	Fri Oct 10 19:46:11 2003
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qt-viewer", "qt_viewer.vcproj", "{341F7ED6-63EA-4C06-92D4-9F1F02A15288}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+		ConfigName.1 = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{341F7ED6-63EA-4C06-92D4-9F1F02A15288}.Debug.ActiveCfg = Release|Win32
+		{341F7ED6-63EA-4C06-92D4-9F1F02A15288}.Debug.Build.0 = Release|Win32
+		{341F7ED6-63EA-4C06-92D4-9F1F02A15288}.Release.ActiveCfg = Release|Win32
+		{341F7ED6-63EA-4C06-92D4-9F1F02A15288}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
Index: avida/current/source/qt-viewer/qt_viewer.suo
Index: avida/current/source/qt-viewer/qt_viewer.vcproj
diff -u /dev/null avida/current/source/qt-viewer/qt_viewer.vcproj:1.1.2.4
--- /dev/null	Fri Oct 10 19:46:24 2003
+++ avida/current/source/qt-viewer/qt_viewer.vcproj	Fri Oct 10 19:46:11 2003
@@ -0,0 +1,1460 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="qt-viewer"
+	ProjectGUID="{564914ad-b4de-46d0-9d7f-6b777aa3ffcc}">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189"
+				Optimization="1"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..,..\cpu,..\event,..\main,..\third-party\trio-1.9,..\tools,$(QTDIR)\include,,c:\cygwin\home\Kaben\local\exp\current\source\qt-viewer,$(QTDIR)\mkspecs\win32-msvc.net"
+				PreprocessorDefinitions="QT_NO_DEBUG,NDEBUG,_CONSOLE,UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT"
+				GeneratePreprocessedFile="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\qt-viewer.pch"
+				AssemblerListingLocation=".\"
+				ObjectFile=".\"
+				ProgramDataBaseFileName=".\"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/FORCE:MULTIPLE"
+				AdditionalDependencies="qt-mteval312.lib qtmain.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib"
+				OutputFile=".\qt-viewer.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				DelayLoadDLLs="comdlg32.dll,oleaut32.dll,winmm.dll,wsock32.dll,winspool.dll"
+				ProgramDatabaseFile="qt-viewer.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\main\analyze.cc">
+			</File>
+			<File
+				RelativePath="..\main\analyze_util.cc">
+			</File>
+			<File
+				RelativePath="apocalypse_widget.cc">
+			</File>
+			<File
+				RelativePath="avd_avida_driver.cc">
+			</File>
+			<File
+				RelativePath="avd_driver_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_event_viewer_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_godbox_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_help_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_help_viewer.cc">
+			</File>
+			<File
+				RelativePath="avd_instruction_viewer_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_lograte_widget.cc">
+			</File>
+			<File
+				RelativePath="avd_main_window.cc">
+			</File>
+			<File
+				RelativePath="avd_main_window_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_mission_control.cc">
+			</File>
+			<File
+				RelativePath="avd_plot_viewer_controller.cc">
+			</File>
+			<File
+				RelativePath="avd_rate_slider2.cc">
+			</File>
+			<File
+				RelativePath="avd_rate_validator2.cc">
+			</File>
+			<File
+				RelativePath="..\main\avida.cc">
+			</File>
+			<File
+				RelativePath="avida_data.cc">
+			</File>
+			<File
+				RelativePath="avida_plot_widget.cc">
+			</File>
+			<File
+				RelativePath="..\tools\b_struct2.cc">
+			</File>
+			<File
+				RelativePath="..\main\birth_chamber.cc">
+			</File>
+			<File
+				RelativePath="..\tools\block_struct.cc">
+			</File>
+			<File
+				RelativePath="..\main\callback_util.cc">
+			</File>
+			<File
+				RelativePath="color_scale_widget.cc">
+			</File>
+			<File
+				RelativePath="..\main\config.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_memory.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stack.cc">
+			</File>
+			<File
+				RelativePath="..\tools\data_entry.cc">
+			</File>
+			<File
+				RelativePath="..\tools\data_manager.cc">
+			</File>
+			<File
+				RelativePath="..\tools\datafile.cc">
+			</File>
+			<File
+				RelativePath="double_slider.cc">
+			</File>
+			<File
+				RelativePath="..\main\environment.cc">
+			</File>
+			<File
+				RelativePath="..\event\event.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_factory.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_factory_manager.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_list.cc">
+			</File>
+			<File
+				RelativePath="event_view_widget.cc">
+			</File>
+			<File
+				RelativePath="..\tools\file.cc">
+			</File>
+			<File
+				RelativePath="..\main\fitness_matrix.cc">
+			</File>
+			<File
+				RelativePath="..\main\genebank.cc">
+			</File>
+			<File
+				RelativePath="..\main\genome.cc">
+			</File>
+			<File
+				RelativePath="..\main\genome_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\genotype.cc">
+			</File>
+			<File
+				RelativePath="godbox_widget2.cc">
+			</File>
+			<File
+				RelativePath="gui_message_display.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_base.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_cpu.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_factory.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_util.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\head.cc">
+			</File>
+			<File
+				RelativePath="..\tools\help.cc">
+			</File>
+			<File
+				RelativePath="..\main\inst.cc">
+			</File>
+			<File
+				RelativePath="..\main\inst_util.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\label.cc">
+			</File>
+			<File
+				RelativePath="..\main\landscape.cc">
+			</File>
+			<File
+				RelativePath="..\main\lineage.cc">
+			</File>
+			<File
+				RelativePath="..\main\lineage_control.cc">
+			</File>
+			<File
+				RelativePath="main.cc">
+			</File>
+			<File
+				RelativePath="map_view.cc">
+			</File>
+			<File
+				RelativePath="map_view_cell_entry.cc">
+			</File>
+			<File
+				RelativePath="map_view_widget.cc">
+			</File>
+			<File
+				RelativePath="..\tools\merit.cc">
+			</File>
+			<File
+				RelativePath="..\tools\message_display.cc">
+			</File>
+			<File
+				RelativePath="messaging_population_wrapper.cc">
+			</File>
+			<File
+				RelativePath="..\main\mutations.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_buttons_widget.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_cpu_widget.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_field_widget.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_line_pixmap_pair.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_line_widget.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_pixmapstructs.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_scrollview.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_scrollview_config.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_view_widget.cc">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_viewer.cc">
+			</File>
+			<File
+				RelativePath="..\main\organism.cc">
+			</File>
+			<File
+				RelativePath="..\main\phenotype.cc">
+			</File>
+			<File
+				RelativePath="plot_select_dia_impl.cc">
+			</File>
+			<File
+				RelativePath="plot_widget.cc">
+			</File>
+			<File
+				RelativePath="..\main\pop_interface.cc">
+			</File>
+			<File
+				RelativePath="..\main\population.cc">
+			</File>
+			<File
+				RelativePath="..\main\population_cell.cc">
+			</File>
+			<File
+				RelativePath="population_cell_wrapped_accessors.cc">
+			</File>
+			<File
+				RelativePath="population_cell_wrapper.cc">
+			</File>
+			<File
+				RelativePath="..\event\population_event_factory.cc">
+			</File>
+			<File
+				RelativePath="..\tools\random.cc">
+			</File>
+			<File
+				RelativePath="..\main\reaction.cc">
+			</File>
+			<File
+				RelativePath="..\main\reaction_result.cc">
+			</File>
+			<File
+				RelativePath="repopulate_widget.cc">
+			</File>
+			<File
+				RelativePath="..\main\resource.cc">
+			</File>
+			<File
+				RelativePath="..\main\resource_count.cc">
+			</File>
+			<File
+				RelativePath="setup_avida.cc">
+			</File>
+			<File
+				RelativePath="setup_file.cc">
+			</File>
+			<File
+				RelativePath="setup_genesis.cc">
+			</File>
+			<File
+				RelativePath="setup_wizard.cc">
+			</File>
+			<File
+				RelativePath="setup_wizard2.cc">
+			</File>
+			<File
+				RelativePath="setup_wizard_config.cc">
+			</File>
+			<File
+				RelativePath="setup_wizard_constants.cc">
+			</File>
+			<File
+				RelativePath="setup_wizard_page.cc">
+			</File>
+			<File
+				RelativePath="setup_wizard_page2.cc">
+			</File>
+			<File
+				RelativePath="..\tools\slice.cc">
+			</File>
+			<File
+				RelativePath="..\main\species.cc">
+			</File>
+			<File
+				RelativePath="..\tools\stat.cc">
+			</File>
+			<File
+				RelativePath="..\main\stats.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string_list.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\tasks.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\test_cpu.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\test_util.cc">
+			</File>
+			<File
+				RelativePath="testwizard.cc">
+			</File>
+			<File
+				RelativePath="testwizard_loadgen.cc">
+			</File>
+			<File
+				RelativePath="testwizard_validators.cc">
+			</File>
+			<File
+				RelativePath="..\tools\tools.cc">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trio.c">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trionan.c">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triostr.c">
+			</File>
+			<File
+				RelativePath="..\tools\weighted_index.cc">
+			</File>
+			<File
+				RelativePath="wizard.ui.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\main\analyze.hh">
+			</File>
+			<File
+				RelativePath="..\main\analyze_util.hh">
+			</File>
+			<File
+				RelativePath="apocalypse_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing apocalypse_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe apocalypse_widget.hh -o moc_apocalypse_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_apocalypse_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_avida_driver.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_avida_driver.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_avida_driver.hh -o moc_avd_avida_driver.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_avida_driver.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_driver_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_driver_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_driver_controller.hh -o moc_avd_driver_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_driver_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_event_viewer_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_event_viewer_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_event_viewer_controller.hh -o moc_avd_event_viewer_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_event_viewer_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_godbox_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_godbox_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_godbox_controller.hh -o moc_avd_godbox_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_godbox_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_gui_msg_event.hh">
+			</File>
+			<File
+				RelativePath="avd_help_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_help_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_help_controller.hh -o moc_avd_help_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_help_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_help_viewer.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_help_viewer.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_help_viewer.hh -o moc_avd_help_viewer.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_help_viewer.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_instruction_viewer_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_instruction_viewer_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_instruction_viewer_controller.hh -o moc_avd_instruction_viewer_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_instruction_viewer_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_lograte_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_lograte_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_lograte_widget.hh -o moc_avd_lograte_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_lograte_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_main_window.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_main_window.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_main_window.hh -o moc_avd_main_window.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_main_window.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_main_window_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_main_window_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_main_window_controller.hh -o moc_avd_main_window_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_main_window_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_message_queue.hh">
+			</File>
+			<File
+				RelativePath="avd_mission_control.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_mission_control.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_mission_control.hh -o moc_avd_mission_control.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_mission_control.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_plot_viewer_controller.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_plot_viewer_controller.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_plot_viewer_controller.hh -o moc_avd_plot_viewer_controller.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_plot_viewer_controller.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_rate_slider2.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avd_rate_slider2.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avd_rate_slider2.hh -o moc_avd_rate_slider2.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avd_rate_slider2.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="avd_rate_validator2.hh">
+			</File>
+			<File
+				RelativePath="..\main\avida.hh">
+			</File>
+			<File
+				RelativePath="avida_data.hh">
+			</File>
+			<File
+				RelativePath="avida_plot_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing avida_plot_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe avida_plot_widget.hh -o moc_avida_plot_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_avida_plot_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tools\b_struct2.hh">
+			</File>
+			<File
+				RelativePath="..\main\birth_chamber.hh">
+			</File>
+			<File
+				RelativePath="..\tools\block_struct.hh">
+			</File>
+			<File
+				RelativePath="..\main\callback_util.hh">
+			</File>
+			<File
+				RelativePath="color_scale_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing color_scale_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe color_scale_widget.hh -o moc_color_scale_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_color_scale_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\main\config.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_defs.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_memory.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stack.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stats.hh">
+			</File>
+			<File
+				RelativePath="..\tools\data_entry.hh">
+			</File>
+			<File
+				RelativePath="..\tools\data_manager.hh">
+			</File>
+			<File
+				RelativePath="..\tools\datafile.hh">
+			</File>
+			<File
+				RelativePath="double_slider.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing double_slider.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe double_slider.hh -o moc_double_slider.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_double_slider.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\main\environment.hh">
+			</File>
+			<File
+				RelativePath="..\event\event.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_factory.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_factory_manager.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_list.hh">
+			</File>
+			<File
+				RelativePath="event_view_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing event_view_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe event_view_widget.hh -o moc_event_view_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_event_view_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tools\file.hh">
+			</File>
+			<File
+				RelativePath="..\main\fitness_matrix.hh">
+			</File>
+			<File
+				RelativePath="..\tools\functions.hh">
+			</File>
+			<File
+				RelativePath="..\main\genebank.hh">
+			</File>
+			<File
+				RelativePath="..\main\genome.hh">
+			</File>
+			<File
+				RelativePath="..\main\genome_util.hh">
+			</File>
+			<File
+				RelativePath="..\main\genotype.hh">
+			</File>
+			<File
+				RelativePath="godbox_widget2.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing godbox_widget2.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe godbox_widget2.hh -o moc_godbox_widget2.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_godbox_widget2.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_base.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_cpu.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_factory.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_method.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_util.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\head.hh">
+			</File>
+			<File
+				RelativePath="..\tools\help.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst_lib.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst_util.hh">
+			</File>
+			<File
+				RelativePath="..\tools\int.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\label.hh">
+			</File>
+			<File
+				RelativePath="..\main\landscape.hh">
+			</File>
+			<File
+				RelativePath="..\main\lineage.hh">
+			</File>
+			<File
+				RelativePath="..\main\lineage_control.hh">
+			</File>
+			<File
+				RelativePath="map_view.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing map_view.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe map_view.hh -o moc_map_view.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_map_view.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="map_view_cell_entry.hh">
+			</File>
+			<File
+				RelativePath="map_view_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing map_view_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe map_view_widget.hh -o moc_map_view_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_map_view_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tools\merit.hh">
+			</File>
+			<File
+				RelativePath="..\tools\message_display.hh">
+			</File>
+			<File
+				RelativePath="..\tools\message_display_hdrs.hh">
+			</File>
+			<File
+				RelativePath="messaging_population_wrapper.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing messaging_population_wrapper.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe messaging_population_wrapper.hh -o moc_messaging_population_wrapper.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_messaging_population_wrapper.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\main\mutations.hh">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_buttons_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_buttons_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_buttons_widget.hh -o moc_n_orig_instruction_buttons_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_buttons_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="n_orig_instruction_cpu_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_cpu_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_cpu_widget.hh -o moc_n_orig_instruction_cpu_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_cpu_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="n_orig_instruction_field_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_field_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_field_widget.hh -o moc_n_orig_instruction_field_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_field_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="n_orig_instruction_line_pixmap_pair.hh">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_line_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_line_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_line_widget.hh -o moc_n_orig_instruction_line_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_line_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="n_orig_instruction_pixmapstructs.hh">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_scrollview.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_scrollview.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_scrollview.hh -o moc_n_orig_instruction_scrollview.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_scrollview.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="n_orig_instruction_scrollview_config.hh">
+			</File>
+			<File
+				RelativePath="n_orig_instruction_view_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_view_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_view_widget.hh -o moc_n_orig_instruction_view_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_view_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="n_orig_instruction_viewer.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing n_orig_instruction_viewer.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe n_orig_instruction_viewer.hh -o moc_n_orig_instruction_viewer.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_n_orig_instruction_viewer.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\main\organism.hh">
+			</File>
+			<File
+				RelativePath="..\main\phenotype.hh">
+			</File>
+			<File
+				RelativePath="plot_select_dia_impl.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing plot_select_dia_impl.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe plot_select_dia_impl.hh -o moc_plot_select_dia_impl.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_plot_select_dia_impl.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="plot_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing plot_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe plot_widget.hh -o moc_plot_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_plot_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\main\pop_interface.hh">
+			</File>
+			<File
+				RelativePath="..\main\population.hh">
+			</File>
+			<File
+				RelativePath="..\main\population_cell.hh">
+			</File>
+			<File
+				RelativePath="population_cell_wrapped_accessors.hh">
+			</File>
+			<File
+				RelativePath="population_cell_wrapper.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing population_cell_wrapper.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe population_cell_wrapper.hh -o moc_population_cell_wrapper.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_population_cell_wrapper.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\event\population_event_factory.hh">
+			</File>
+			<File
+				RelativePath="population_wrapper.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing population_wrapper.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe population_wrapper.hh -o moc_population_wrapper.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_population_wrapper.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tools\random.hh">
+			</File>
+			<File
+				RelativePath="..\main\reaction.hh">
+			</File>
+			<File
+				RelativePath="..\main\reaction_result.hh">
+			</File>
+			<File
+				RelativePath="repopulate_widget.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing repopulate_widget.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe repopulate_widget.hh -o moc_repopulate_widget.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_repopulate_widget.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\main\resource.hh">
+			</File>
+			<File
+				RelativePath="..\main\resource_count.hh">
+			</File>
+			<File
+				RelativePath="setup_file.hh">
+			</File>
+			<File
+				RelativePath="setup_genesis.hh">
+			</File>
+			<File
+				RelativePath="setup_wizard.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing setup_wizard.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe setup_wizard.hh -o moc_setup_wizard.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_setup_wizard.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="setup_wizard2.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing setup_wizard2.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe setup_wizard2.hh -o moc_setup_wizard2.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_setup_wizard2.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="setup_wizard_config.hh">
+			</File>
+			<File
+				RelativePath="setup_wizard_constants.hh">
+			</File>
+			<File
+				RelativePath="setup_wizard_page.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing setup_wizard_page.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe setup_wizard_page.hh -o moc_setup_wizard_page.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_setup_wizard_page.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="setup_wizard_page2.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing setup_wizard_page2.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe setup_wizard_page2.hh -o moc_setup_wizard_page2.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_setup_wizard_page2.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tools\slice.hh">
+			</File>
+			<File
+				RelativePath="..\main\species.hh">
+			</File>
+			<File
+				RelativePath="..\tools\stat.hh">
+			</File>
+			<File
+				RelativePath="..\main\stats.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string_list.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string_util.hh">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\strio.h">
+			</File>
+			<File
+				RelativePath="..\tools\tArray.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tBuffer.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tDictionary.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tList.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tMatrix.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tVector.hh">
+			</File>
+			<File
+				RelativePath="..\main\tasks.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\test_cpu.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\test_util.hh">
+			</File>
+			<File
+				RelativePath="testwizard.hh">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Moc&apos;ing testwizard.hh..."
+						CommandLine="$(QTDIR)\bin\moc.exe testwizard.hh -o moc_testwizard.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe"
+						Outputs="moc_testwizard.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\tools\tools.hh">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trio.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triodef.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trionan.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triop.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triostr.h">
+			</File>
+			<File
+				RelativePath="..\tools\weighted_index.hh">
+			</File>
+			<File
+				RelativePath="..\tools\win32_mkdir_hack.hh">
+			</File>
+		</Filter>
+		<Filter
+			Name="Generated MOC Files"
+			Filter="cpp;c;cxx;moc">
+			<File
+				RelativePath="moc_apocalypse_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_avida_driver.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_driver_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_event_viewer_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_godbox_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_help_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_help_viewer.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_instruction_viewer_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_lograte_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_main_window.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_main_window_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_mission_control.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_plot_viewer_controller.cpp">
+			</File>
+			<File
+				RelativePath="moc_avd_rate_slider2.cpp">
+			</File>
+			<File
+				RelativePath="moc_avida_plot_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_color_scale_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_double_slider.cpp">
+			</File>
+			<File
+				RelativePath="moc_event_chooser.cpp">
+			</File>
+			<File
+				RelativePath="moc_event_list_editor.cpp">
+			</File>
+			<File
+				RelativePath="moc_event_view_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_godbox_widget2.cpp">
+			</File>
+			<File
+				RelativePath="moc_map_view.cpp">
+			</File>
+			<File
+				RelativePath="moc_map_view_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_messaging_population_wrapper.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_buttons_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_cpu_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_field_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_line_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_scrollview.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_view_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_n_orig_instruction_viewer.cpp">
+			</File>
+			<File
+				RelativePath="moc_plot_select_dia.cpp">
+			</File>
+			<File
+				RelativePath="moc_plot_select_dia_impl.cpp">
+			</File>
+			<File
+				RelativePath="moc_plot_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_population_cell_wrapper.cpp">
+			</File>
+			<File
+				RelativePath="moc_population_wrapper.cpp">
+			</File>
+			<File
+				RelativePath="moc_repopulate_widget.cpp">
+			</File>
+			<File
+				RelativePath="moc_setup_wizard.cpp">
+			</File>
+			<File
+				RelativePath="moc_setup_wizard2.cpp">
+			</File>
+			<File
+				RelativePath="moc_setup_wizard_page.cpp">
+			</File>
+			<File
+				RelativePath="moc_setup_wizard_page2.cpp">
+			</File>
+			<File
+				RelativePath="moc_testwizard.cpp">
+			</File>
+			<File
+				RelativePath="moc_wizard.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Generated UI Files"
+			Filter="cpp;c;cxx;h;hpp;hxx;">
+			<File
+				RelativePath="event_chooser.cpp">
+			</File>
+			<File
+				RelativePath="event_chooser.h">
+			</File>
+			<File
+				RelativePath="event_list_editor.cpp">
+			</File>
+			<File
+				RelativePath="event_list_editor.h">
+			</File>
+			<File
+				RelativePath="plot_select_dia.cpp">
+			</File>
+			<File
+				RelativePath="plot_select_dia.h">
+			</File>
+			<File
+				RelativePath="wizard.cpp">
+			</File>
+			<File
+				RelativePath="wizard.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Forms"
+			Filter="ui"
+			ParseFiles="FALSE">
+			<File
+				RelativePath="event_chooser.ui">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Uic&apos;ing event_chooser.ui..."
+						CommandLine="$(QTDIR)\bin\uic.exe event_chooser.ui -o .\event_chooser.h &amp;&amp; $(QTDIR)\bin\uic.exe event_chooser.ui -i event_chooser.h -o .\event_chooser.cpp &amp;&amp; $(QTDIR)\bin\moc.exe .\event_chooser.h -o moc_event_chooser.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe"
+						Outputs=".\event_chooser.h;.\event_chooser.cpp;moc_event_chooser.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="event_list_editor.ui">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Uic&apos;ing event_list_editor.ui..."
+						CommandLine="$(QTDIR)\bin\uic.exe event_list_editor.ui -o .\event_list_editor.h &amp;&amp; $(QTDIR)\bin\uic.exe event_list_editor.ui -i event_list_editor.h -o .\event_list_editor.cpp &amp;&amp; $(QTDIR)\bin\moc.exe .\event_list_editor.h -o moc_event_list_editor.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe"
+						Outputs=".\event_list_editor.h;.\event_list_editor.cpp;moc_event_list_editor.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="plot_select_dia.ui">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Uic&apos;ing plot_select_dia.ui..."
+						CommandLine="$(QTDIR)\bin\uic.exe plot_select_dia.ui -o .\plot_select_dia.h &amp;&amp; $(QTDIR)\bin\uic.exe plot_select_dia.ui -i plot_select_dia.h -o .\plot_select_dia.cpp &amp;&amp; $(QTDIR)\bin\moc.exe .\plot_select_dia.h -o moc_plot_select_dia.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe"
+						Outputs=".\plot_select_dia.h;.\plot_select_dia.cpp;moc_plot_select_dia.cpp"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="wizard.ui">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Uic&apos;ing wizard.ui..."
+						CommandLine="$(QTDIR)\bin\uic.exe wizard.ui -o .\wizard.h &amp;&amp; $(QTDIR)\bin\uic.exe wizard.ui -i wizard.h -o .\wizard.cpp &amp;&amp; $(QTDIR)\bin\moc.exe .\wizard.h -o moc_wizard.cpp
+"
+						AdditionalDependencies="$(QTDIR)\bin\moc.exe;$(QTDIR)\bin\uic.exe"
+						Outputs=".\wizard.h;.\wizard.cpp;moc_wizard.cpp"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\cpu\hardware_4stack.cc">
+		</File>
+		<File
+			RelativePath="..\cpu\hardware_4stack.hh">
+		</File>
+		<File
+			RelativePath="..\main\inst_set.cc">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
Index: avida/current/source/qt-viewer/population_cell_wrapper.hh
diff -u avida/current/source/qt-viewer/population_cell_wrapper.hh:1.2.2.3 avida/current/source/qt-viewer/population_cell_wrapper.hh:1.2.2.4
--- avida/current/source/qt-viewer/population_cell_wrapper.hh:1.2.2.3	Tue Sep 23 20:57:43 2003
+++ avida/current/source/qt-viewer/population_cell_wrapper.hh	Fri Oct 10 19:46:04 2003
@@ -60,7 +60,7 @@
  * PopulationCellWrapper instance.
  *
  * @short Encapsulates an Avida population cell and changes to its data.
- * @version $Id: population_cell_wrapper.hh,v 1.2.2.3 2003/09/24 03:57:43 kaben Exp $
+ * @version $Id: population_cell_wrapper.hh,v 1.2.2.4 2003/10/11 02:46:04 kaben Exp $
  * @see avd_CellViewListItem
  * @see avd_WidgetListItem
  * @see avd_WidgetList
Index: avida/current/source/qt-viewer/exp/avd_widget_list.hh
diff -u avida/current/source/qt-viewer/exp/avd_widget_list.hh:1.4.2.4 avida/current/source/qt-viewer/exp/avd_widget_list.hh:1.4.2.5
--- avida/current/source/qt-viewer/exp/avd_widget_list.hh:1.4.2.4	Tue Sep 23 20:57:43 2003
+++ avida/current/source/qt-viewer/exp/avd_widget_list.hh	Fri Oct 10 19:46:11 2003
@@ -37,7 +37,7 @@
  * its subclasses.
  *
  * @short A scrollable collapsible container of other widgets.
- * @version $Id: avd_widget_list.hh,v 1.4.2.4 2003/09/24 03:57:43 kaben Exp $
+ * @version $Id: avd_widget_list.hh,v 1.4.2.5 2003/10/11 02:46:11 kaben Exp $
  * @see avd_WidgetListItem
  */
 class avd_WidgetList : public QWidget {
Index: avida/current/source/qt-viewer/exp/avd_widget_list_item.hh
diff -u avida/current/source/qt-viewer/exp/avd_widget_list_item.hh:1.3.2.4 avida/current/source/qt-viewer/exp/avd_widget_list_item.hh:1.3.2.5
--- avida/current/source/qt-viewer/exp/avd_widget_list_item.hh:1.3.2.4	Tue Sep 23 20:57:43 2003
+++ avida/current/source/qt-viewer/exp/avd_widget_list_item.hh	Fri Oct 10 19:46:11 2003
@@ -27,7 +27,7 @@
  * forming a collapsible hierarchial view of widgets.
  *
  * @short A labeled collapsible container of other widgets.
- * @version $Id: avd_widget_list_item.hh,v 1.3.2.4 2003/09/24 03:57:43 kaben Exp $
+ * @version $Id: avd_widget_list_item.hh,v 1.3.2.5 2003/10/11 02:46:11 kaben Exp $
  * @see avd_WidgetList
  */
 class avd_WidgetListItem : public QWidget{
Index: avida/current/source/qt-viewer/exp/avd_widget_list_item_container.hh
diff -u avida/current/source/qt-viewer/exp/avd_widget_list_item_container.hh:1.3.2.3 avida/current/source/qt-viewer/exp/avd_widget_list_item_container.hh:1.3.2.4
--- avida/current/source/qt-viewer/exp/avd_widget_list_item_container.hh:1.3.2.3	Tue Sep 23 20:57:43 2003
+++ avida/current/source/qt-viewer/exp/avd_widget_list_item_container.hh	Fri Oct 10 19:46:11 2003
@@ -20,7 +20,7 @@
  * vertical layout.
  *
  * @short Part of the avd_WidgetListItem.
- * @version $Id: avd_widget_list_item_container.hh,v 1.3.2.3 2003/09/24 03:57:43 kaben Exp $
+ * @version $Id: avd_widget_list_item_container.hh,v 1.3.2.4 2003/10/11 02:46:11 kaben Exp $
  * @see avd_WidgetListItem
  * @see avd_WidgetList
  */
Index: avida/current/source/third-party/trio-1.9/example.c
diff -u avida/current/source/third-party/trio-1.9/example.c:1.1.2.3 avida/current/source/third-party/trio-1.9/example.c:1.1.2.4
--- avida/current/source/third-party/trio-1.9/example.c:1.1.2.3	Tue Sep 23 20:57:43 2003
+++ avida/current/source/third-party/trio-1.9/example.c	Fri Oct 10 19:46:11 2003
@@ -32,7 +32,7 @@
 # define LONGEST LONGLONG
 #endif
 
-static TRIO_CONST char rcsid[] = "@(#)$Id: example.c,v 1.1.2.3 2003/09/24 03:57:43 kaben Exp $";
+static TRIO_CONST char rcsid[] = "@(#)$Id: example.c,v 1.1.2.4 2003/10/11 02:46:11 kaben Exp $";
 
 /*************************************************************************
  *
Index: avida/current/source/third-party/trio-1.9/regression.c
diff -u avida/current/source/third-party/trio-1.9/regression.c:1.1.2.3 avida/current/source/third-party/trio-1.9/regression.c:1.1.2.4
--- avida/current/source/third-party/trio-1.9/regression.c:1.1.2.3	Tue Sep 23 20:57:43 2003
+++ avida/current/source/third-party/trio-1.9/regression.c	Fri Oct 10 19:46:11 2003
@@ -33,7 +33,7 @@
 #define DOUBLE_EQUAL(x,y) (((x)>(y)-DBL_EPSILON) && ((x)<(y)+DBL_EPSILON))
 #define FLOAT_EQUAL(x,y) (((x)>(y)-FLT_EPSILON) && ((x)<(y)+FLT_EPSILON))
 
-static TRIO_CONST char rcsid[] = "@(#)$Id: regression.c,v 1.1.2.3 2003/09/24 03:57:43 kaben Exp $";
+static TRIO_CONST char rcsid[] = "@(#)$Id: regression.c,v 1.1.2.4 2003/10/11 02:46:11 kaben Exp $";
 
 
 /*************************************************************************
Index: avida/current/source/third-party/trio-1.9/strio.h
diff -u avida/current/source/third-party/trio-1.9/strio.h:1.1.2.3 avida/current/source/third-party/trio-1.9/strio.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/strio.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/strio.h	Fri Oct 10 19:46:11 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: strio.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: strio.h,v 1.1.2.4 2003/10/11 02:46:11 kaben Exp $
  *
  * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/trio.c
diff -u avida/current/source/third-party/trio-1.9/trio.c:1.1.2.5 avida/current/source/third-party/trio-1.9/trio.c:1.1.2.6
--- avida/current/source/third-party/trio-1.9/trio.c:1.1.2.5	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/trio.c	Fri Oct 10 19:46:11 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: trio.c,v 1.1.2.5 2003/09/24 03:57:44 kaben Exp $
+ * $Id: trio.c,v 1.1.2.6 2003/10/11 02:46:11 kaben Exp $
  *
  * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
  *
@@ -720,7 +720,7 @@
  *
  *************************************************************************/
 
-static TRIO_CONST char rcsid[] = "@(#)$Id: trio.c,v 1.1.2.5 2003/09/24 03:57:44 kaben Exp $";
+static TRIO_CONST char rcsid[] = "@(#)$Id: trio.c,v 1.1.2.6 2003/10/11 02:46:11 kaben Exp $";
 
 /*
  * Need this to workaround a parser bug in HP C/iX compiler that fails
Index: avida/current/source/third-party/trio-1.9/trio.h
diff -u avida/current/source/third-party/trio-1.9/trio.h:1.1.2.3 avida/current/source/third-party/trio-1.9/trio.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/trio.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/trio.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: trio.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: trio.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/triodef.h
diff -u avida/current/source/third-party/trio-1.9/triodef.h:1.2.2.3 avida/current/source/third-party/trio-1.9/triodef.h:1.2.2.4
--- avida/current/source/third-party/trio-1.9/triodef.h:1.2.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/triodef.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: triodef.h,v 1.2.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: triodef.h,v 1.2.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese <breese at users.sourceforge.net>
  *
Index: avida/current/source/third-party/trio-1.9/trionan.c
diff -u avida/current/source/third-party/trio-1.9/trionan.c:1.1.2.4 avida/current/source/third-party/trio-1.9/trionan.c:1.1.2.5
--- avida/current/source/third-party/trio-1.9/trionan.c:1.1.2.4	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/trionan.c	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: trionan.c,v 1.1.2.4 2003/09/24 03:57:44 kaben Exp $
+ * $Id: trionan.c,v 1.1.2.5 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese <breese at users.sourceforge.net>
  *
@@ -106,7 +106,7 @@
  * Constants
  */
 
-static TRIO_CONST char rcsid[] = "@(#)$Id: trionan.c,v 1.1.2.4 2003/09/24 03:57:44 kaben Exp $";
+static TRIO_CONST char rcsid[] = "@(#)$Id: trionan.c,v 1.1.2.5 2003/10/11 02:46:12 kaben Exp $";
 
 #if defined(USE_IEEE_754)
 
Index: avida/current/source/third-party/trio-1.9/trionan.h
diff -u avida/current/source/third-party/trio-1.9/trionan.h:1.1.2.3 avida/current/source/third-party/trio-1.9/trionan.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/trionan.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/trionan.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: trionan.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: trionan.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese <breese at users.sourceforge.net>
  *
Index: avida/current/source/third-party/trio-1.9/triop.h
diff -u avida/current/source/third-party/trio-1.9/triop.h:1.1.2.3 avida/current/source/third-party/trio-1.9/triop.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/triop.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/triop.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: triop.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: triop.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2000 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/triostr.c
diff -u avida/current/source/third-party/trio-1.9/triostr.c:1.1.2.4 avida/current/source/third-party/trio-1.9/triostr.c:1.1.2.5
--- avida/current/source/third-party/trio-1.9/triostr.c:1.1.2.4	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/triostr.c	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: triostr.c,v 1.1.2.4 2003/09/24 03:57:44 kaben Exp $
+ * $Id: triostr.c,v 1.1.2.5 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
@@ -88,7 +88,7 @@
  */
 
 #if !defined(TRIO_MINIMAL)
-static TRIO_CONST char rcsid[] = "@(#)$Id: triostr.c,v 1.1.2.4 2003/09/24 03:57:44 kaben Exp $";
+static TRIO_CONST char rcsid[] = "@(#)$Id: triostr.c,v 1.1.2.5 2003/10/11 02:46:12 kaben Exp $";
 #endif
 
 /*************************************************************************
Index: avida/current/source/third-party/trio-1.9/triostr.h
diff -u avida/current/source/third-party/trio-1.9/triostr.h:1.1.2.3 avida/current/source/third-party/trio-1.9/triostr.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/triostr.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/triostr.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: triostr.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: triostr.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/doc/doc.h
diff -u avida/current/source/third-party/trio-1.9/doc/doc.h:1.1.2.3 avida/current/source/third-party/trio-1.9/doc/doc.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/doc/doc.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/doc/doc.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: doc.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: doc.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/doc/doc_dynamic.h
diff -u avida/current/source/third-party/trio-1.9/doc/doc_dynamic.h:1.1.2.3 avida/current/source/third-party/trio-1.9/doc/doc_dynamic.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/doc/doc_dynamic.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/doc/doc_dynamic.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: doc_dynamic.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: doc_dynamic.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/doc/doc_printf.h
diff -u avida/current/source/third-party/trio-1.9/doc/doc_printf.h:1.1.2.3 avida/current/source/third-party/trio-1.9/doc/doc_printf.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/doc/doc_printf.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/doc/doc_printf.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: doc_printf.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: doc_printf.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/doc/doc_register.h
diff -u avida/current/source/third-party/trio-1.9/doc/doc_register.h:1.1.2.3 avida/current/source/third-party/trio-1.9/doc/doc_register.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/doc/doc_register.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/doc/doc_register.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: doc_register.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: doc_register.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/doc/doc_scanf.h
diff -u avida/current/source/third-party/trio-1.9/doc/doc_scanf.h:1.1.2.3 avida/current/source/third-party/trio-1.9/doc/doc_scanf.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/doc/doc_scanf.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/doc/doc_scanf.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: doc_scanf.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: doc_scanf.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/third-party/trio-1.9/doc/doc_static.h
diff -u avida/current/source/third-party/trio-1.9/doc/doc_static.h:1.1.2.3 avida/current/source/third-party/trio-1.9/doc/doc_static.h:1.1.2.4
--- avida/current/source/third-party/trio-1.9/doc/doc_static.h:1.1.2.3	Tue Sep 23 20:57:44 2003
+++ avida/current/source/third-party/trio-1.9/doc/doc_static.h	Fri Oct 10 19:46:12 2003
@@ -1,6 +1,6 @@
 /*************************************************************************
  *
- * $Id: doc_static.h,v 1.1.2.3 2003/09/24 03:57:44 kaben Exp $
+ * $Id: doc_static.h,v 1.1.2.4 2003/10/11 02:46:12 kaben Exp $
  *
  * Copyright (C) 2001 Bjorn Reese and Daniel Stenberg.
  *
Index: avida/current/source/viewers/ncurses-viewer.ilk
Index: avida/current/source/viewers/ncurses-viewer.pch
Index: avida/current/source/viewers/ncurses-viewer.pdb
Index: avida/current/source/viewers/ncurses_viewer.ncb
Index: avida/current/source/viewers/ncurses_viewer.sln
diff -u /dev/null avida/current/source/viewers/ncurses_viewer.sln:1.1.2.3
--- /dev/null	Fri Oct 10 19:46:27 2003
+++ avida/current/source/viewers/ncurses_viewer.sln	Fri Oct 10 19:46:19 2003
@@ -0,0 +1,18 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ncurses-viewer", "ncurses_viewer.vcproj", "{B6625AC4-47F4-4480-BCCA-82FC8F2EF859}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{B6625AC4-47F4-4480-BCCA-82FC8F2EF859}.Debug.ActiveCfg = Debug|Win32
+		{B6625AC4-47F4-4480-BCCA-82FC8F2EF859}.Debug.Build.0 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
Index: avida/current/source/viewers/ncurses_viewer.suo
Index: avida/current/source/viewers/ncurses_viewer.vcproj
diff -u /dev/null avida/current/source/viewers/ncurses_viewer.vcproj:1.1.2.4
--- /dev/null	Fri Oct 10 19:46:27 2003
+++ avida/current/source/viewers/ncurses_viewer.vcproj	Fri Oct 10 19:46:19 2003
@@ -0,0 +1,611 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="ncurses-viewer"
+	ProjectGUID="{B6625AC4-47F4-4480-BCCA-82FC8F2EF859}">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="-Zm200 -w34100 -w34189"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..;..\cpu;..\event;..\main;&quot;..\third-party\trio-1.9&quot;;..\tools;&quot;$(QTDIR)\include&quot;;C:\cygwin\home\Kaben\CygwinExperiment\current\source\viewers;&quot;$(QTDIR)\mkspecs\win32-msvc.net&quot;;c:\cygwin\home\kaben\CygwinExperiment\pdcurs26"
+				PreprocessorDefinitions="_CONSOLE,UNICODE,WIN32,QT_DLL,QT_THREAD_SUPPORT"
+				GeneratePreprocessedFile="0"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\ncurses-viewer.pch"
+				AssemblerListingLocation=".\"
+				ObjectFile=".\"
+				ProgramDataBaseFileName=".\"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="1"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="qt-mteval312.lib qtmain.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib winmm.lib wsock32.lib winspool.lib delayimp.lib c:/cygwin/home/kaben/CygwinExperiment/pdcurs/pdcurses.lib"
+				OutputFile=".\ncurses-viewer.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="$(QTDIR)\lib"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="ncurses-viewer.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				WarningLevel="0"
+				DefaultCharType="0"
+				EnableErrorChecks="1"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\main\analyze.cc">
+			</File>
+			<File
+				RelativePath="..\main\analyze_util.cc">
+			</File>
+			<File
+				RelativePath="ansi.cc">
+			</File>
+			<File
+				RelativePath="..\main\avida.cc">
+			</File>
+			<File
+				RelativePath="..\tools\b_struct2.cc">
+			</File>
+			<File
+				RelativePath="bar_screen.cc">
+			</File>
+			<File
+				RelativePath="..\main\birth_chamber.cc">
+			</File>
+			<File
+				RelativePath="..\tools\block_struct.cc">
+			</File>
+			<File
+				RelativePath="..\main\callback_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\config.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_memory.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stack.cc">
+			</File>
+			<File
+				RelativePath="..\tools\data_entry.cc">
+			</File>
+			<File
+				RelativePath="..\tools\data_manager.cc">
+			</File>
+			<File
+				RelativePath="..\tools\datafile.cc">
+			</File>
+			<File
+				RelativePath="..\main\environment.cc">
+			</File>
+			<File
+				RelativePath="..\event\event.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_factory.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_factory_manager.cc">
+			</File>
+			<File
+				RelativePath="..\event\event_list.cc">
+			</File>
+			<File
+				RelativePath="..\tools\file.cc">
+			</File>
+			<File
+				RelativePath="..\main\fitness_matrix.cc">
+			</File>
+			<File
+				RelativePath="..\main\genebank.cc">
+			</File>
+			<File
+				RelativePath="..\main\genome.cc">
+			</File>
+			<File
+				RelativePath="..\main\genome_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\genotype.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_base.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_cpu.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_factory.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_util.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\head.cc">
+			</File>
+			<File
+				RelativePath="..\tools\help.cc">
+			</File>
+			<File
+				RelativePath="hist_screen.cc">
+			</File>
+			<File
+				RelativePath="..\main\inst.cc">
+			</File>
+			<File
+				RelativePath="..\main\inst_util.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\label.cc">
+			</File>
+			<File
+				RelativePath="..\main\landscape.cc">
+			</File>
+			<File
+				RelativePath="..\main\lineage.cc">
+			</File>
+			<File
+				RelativePath="..\main\lineage_control.cc">
+			</File>
+			<File
+				RelativePath="map_screen.cc">
+			</File>
+			<File
+				RelativePath="menu.cc">
+			</File>
+			<File
+				RelativePath="..\tools\merit.cc">
+			</File>
+			<File
+				RelativePath="..\tools\message_display.cc">
+			</File>
+			<File
+				RelativePath="..\main\mutations.cc">
+			</File>
+			<File
+				RelativePath="ncurses.cc">
+			</File>
+			<File
+				RelativePath="options_screen.cc">
+			</File>
+			<File
+				RelativePath="..\main\organism.cc">
+			</File>
+			<File
+				RelativePath="..\main\phenotype.cc">
+			</File>
+			<File
+				RelativePath="..\main\pop_interface.cc">
+			</File>
+			<File
+				RelativePath="..\main\population.cc">
+			</File>
+			<File
+				RelativePath="..\main\population_cell.cc">
+			</File>
+			<File
+				RelativePath="..\event\population_event_factory.cc">
+			</File>
+			<File
+				RelativePath="..\tools\random.cc">
+			</File>
+			<File
+				RelativePath="..\main\reaction.cc">
+			</File>
+			<File
+				RelativePath="..\main\reaction_result.cc">
+			</File>
+			<File
+				RelativePath="..\main\resource.cc">
+			</File>
+			<File
+				RelativePath="..\main\resource_count.cc">
+			</File>
+			<File
+				RelativePath="..\tools\slice.cc">
+			</File>
+			<File
+				RelativePath="..\main\species.cc">
+			</File>
+			<File
+				RelativePath="..\tools\stat.cc">
+			</File>
+			<File
+				RelativePath="..\main\stats.cc">
+			</File>
+			<File
+				RelativePath="stats_screen.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string_list.cc">
+			</File>
+			<File
+				RelativePath="..\tools\string_util.cc">
+			</File>
+			<File
+				RelativePath="symbol_util.cc">
+			</File>
+			<File
+				RelativePath="..\main\tasks.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\test_cpu.cc">
+			</File>
+			<File
+				RelativePath="..\cpu\test_util.cc">
+			</File>
+			<File
+				RelativePath="text_screen.cc">
+			</File>
+			<File
+				RelativePath="..\tools\tools.cc">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trio.c">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trionan.c">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triostr.c">
+			</File>
+			<File
+				RelativePath="view.cc">
+			</File>
+			<File
+				RelativePath="viewer.cc">
+			</File>
+			<File
+				RelativePath="..\tools\weighted_index.cc">
+			</File>
+			<File
+				RelativePath="zoom_screen.cc">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\main\analyze.hh">
+			</File>
+			<File
+				RelativePath="..\main\analyze_util.hh">
+			</File>
+			<File
+				RelativePath="ansi.hh">
+			</File>
+			<File
+				RelativePath="..\main\avida.hh">
+			</File>
+			<File
+				RelativePath="..\tools\b_struct2.hh">
+			</File>
+			<File
+				RelativePath="bar_screen.hh">
+			</File>
+			<File
+				RelativePath="..\main\birth_chamber.hh">
+			</File>
+			<File
+				RelativePath="..\tools\block_struct.hh">
+			</File>
+			<File
+				RelativePath="..\main\callback_util.hh">
+			</File>
+			<File
+				RelativePath="..\main\config.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_defs.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_memory.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stack.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\cpu_stats.hh">
+			</File>
+			<File
+				RelativePath="..\tools\data_entry.hh">
+			</File>
+			<File
+				RelativePath="..\tools\data_manager.hh">
+			</File>
+			<File
+				RelativePath="..\tools\datafile.hh">
+			</File>
+			<File
+				RelativePath="..\main\environment.hh">
+			</File>
+			<File
+				RelativePath="..\event\event.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_factory.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_factory_manager.hh">
+			</File>
+			<File
+				RelativePath="..\event\event_list.hh">
+			</File>
+			<File
+				RelativePath="..\tools\file.hh">
+			</File>
+			<File
+				RelativePath="..\main\fitness_matrix.hh">
+			</File>
+			<File
+				RelativePath="..\tools\functions.hh">
+			</File>
+			<File
+				RelativePath="..\main\genebank.hh">
+			</File>
+			<File
+				RelativePath="..\main\genome.hh">
+			</File>
+			<File
+				RelativePath="..\main\genome_util.hh">
+			</File>
+			<File
+				RelativePath="..\main\genotype.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_base.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_cpu.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_factory.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_method.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\hardware_util.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\head.hh">
+			</File>
+			<File
+				RelativePath="..\tools\help.hh">
+			</File>
+			<File
+				RelativePath="hist_screen.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst_lib.hh">
+			</File>
+			<File
+				RelativePath="..\main\inst_util.hh">
+			</File>
+			<File
+				RelativePath="..\tools\int.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\label.hh">
+			</File>
+			<File
+				RelativePath="..\main\landscape.hh">
+			</File>
+			<File
+				RelativePath="..\main\lineage.hh">
+			</File>
+			<File
+				RelativePath="..\main\lineage_control.hh">
+			</File>
+			<File
+				RelativePath="map_screen.hh">
+			</File>
+			<File
+				RelativePath="menu.hh">
+			</File>
+			<File
+				RelativePath="..\tools\merit.hh">
+			</File>
+			<File
+				RelativePath="..\tools\message_display.hh">
+			</File>
+			<File
+				RelativePath="..\tools\message_display_hdrs.hh">
+			</File>
+			<File
+				RelativePath="..\main\mutations.hh">
+			</File>
+			<File
+				RelativePath="ncurses.hh">
+			</File>
+			<File
+				RelativePath="options_screen.hh">
+			</File>
+			<File
+				RelativePath="..\main\organism.hh">
+			</File>
+			<File
+				RelativePath="..\main\phenotype.hh">
+			</File>
+			<File
+				RelativePath="..\main\pop_interface.hh">
+			</File>
+			<File
+				RelativePath="..\main\population.hh">
+			</File>
+			<File
+				RelativePath="..\main\population_cell.hh">
+			</File>
+			<File
+				RelativePath="..\event\population_event_factory.hh">
+			</File>
+			<File
+				RelativePath="..\tools\random.hh">
+			</File>
+			<File
+				RelativePath="..\main\reaction.hh">
+			</File>
+			<File
+				RelativePath="..\main\reaction_result.hh">
+			</File>
+			<File
+				RelativePath="..\main\resource.hh">
+			</File>
+			<File
+				RelativePath="..\main\resource_count.hh">
+			</File>
+			<File
+				RelativePath="..\tools\slice.hh">
+			</File>
+			<File
+				RelativePath="..\main\species.hh">
+			</File>
+			<File
+				RelativePath="..\tools\stat.hh">
+			</File>
+			<File
+				RelativePath="..\main\stats.hh">
+			</File>
+			<File
+				RelativePath="stats_screen.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string_list.hh">
+			</File>
+			<File
+				RelativePath="..\tools\string_util.hh">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\strio.h">
+			</File>
+			<File
+				RelativePath="symbol_util.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tArray.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tBuffer.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tDictionary.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tList.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tMatrix.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tVector.hh">
+			</File>
+			<File
+				RelativePath="..\main\tasks.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\test_cpu.hh">
+			</File>
+			<File
+				RelativePath="..\cpu\test_util.hh">
+			</File>
+			<File
+				RelativePath="text_screen.hh">
+			</File>
+			<File
+				RelativePath="text_window.hh">
+			</File>
+			<File
+				RelativePath="..\tools\tools.hh">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trio.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triodef.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\trionan.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triop.h">
+			</File>
+			<File
+				RelativePath="..\third-party\trio-1.9\triostr.h">
+			</File>
+			<File
+				RelativePath="view.hh">
+			</File>
+			<File
+				RelativePath="viewer.hh">
+			</File>
+			<File
+				RelativePath="..\tools\weighted_index.hh">
+			</File>
+			<File
+				RelativePath="..\tools\win32_mkdir_hack.hh">
+			</File>
+			<File
+				RelativePath="zoom_screen.hh">
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\cpu\hardware_4stack.cc">
+		</File>
+		<File
+			RelativePath="..\cpu\hardware_4stack.hh">
+		</File>
+		<File
+			RelativePath="..\main\inst_set.cc">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>


More information about the Avida-cvs mailing list