[Avida-cvs] [Avida2-svn] r334 - in trunk: Avida2.xcodeproj source/bindings/Boost.Python source/event source/main source/testsuites/unit_testsuites source/testsuites/unit_testsuites/level_0 source/tools source/viewers
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Thu Oct 6 16:54:52 PDT 2005
Author: brysonda
Date: 2005-10-06 19:54:52 -0400 (Thu, 06 Oct 2005)
New Revision: 334
Added:
trunk/source/tools/cBlockStruct.cc
trunk/source/tools/cBlockStruct.h
trunk/source/tools/cChangeList.cc
trunk/source/tools/cChangeList.h
trunk/source/tools/cConstSchedule.cc
trunk/source/tools/cConstSchedule.h
trunk/source/tools/cCountTracker.cc
trunk/source/tools/cCountTracker.h
trunk/source/tools/cCycleCheck.h
trunk/source/tools/cID.h
trunk/source/tools/cVerifierSuiteRecurser.h
Removed:
trunk/source/main/primitive.hh
trunk/source/tools/block_struct.cc
trunk/source/tools/block_struct.hh
trunk/source/tools/cCycleCheck.hh
trunk/source/tools/cID.hh
trunk/source/tools/cVerifierSuiteRecurser.hh
trunk/source/tools/change_list.cc
trunk/source/tools/change_list.hh
trunk/source/tools/const_schedule.cc
trunk/source/tools/const_schedule.hh
trunk/source/tools/count_tracker.cc
trunk/source/tools/count_tracker.hh
Modified:
trunk/Avida2.xcodeproj/project.pbxproj
trunk/source/bindings/Boost.Python/avida-fixups.hh
trunk/source/bindings/Boost.Python/avida_driver_population.pyste
trunk/source/bindings/Boost.Python/block_struct.pyste
trunk/source/bindings/Boost.Python/cCycleCheck.pyste
trunk/source/bindings/Boost.Python/cID.pyste
trunk/source/bindings/Boost.Python/change_list.pyste
trunk/source/bindings/Boost.Python/const_schedule.pyste
trunk/source/bindings/Boost.Python/count_tracker.pyste
trunk/source/bindings/Boost.Python/population.pyste
trunk/source/bindings/Boost.Python/py_avida_driver-fixups.cc
trunk/source/bindings/Boost.Python/py_avida_driver.pyste
trunk/source/bindings/Boost.Python/schedule.pyste
trunk/source/event/cPopulationEventFactory.cc
trunk/source/main/avida.cc
trunk/source/main/avida.h
trunk/source/main/cAvidaDriver_Population.cc
trunk/source/main/cCallbackUtil.cc
trunk/source/main/cGenotype_BirthData.h
trunk/source/main/cInjectGenotype_BirthData.h
trunk/source/main/cPopulation.cc
trunk/source/main/primitive.cc
trunk/source/testsuites/unit_testsuites/avida.t.cc
trunk/source/testsuites/unit_testsuites/block_struct.t.cc
trunk/source/testsuites/unit_testsuites/const_schedule.t.cc
trunk/source/testsuites/unit_testsuites/level_0/count_tracker.t.cc
trunk/source/tools/CMakeLists.txt
trunk/source/tools/cCycleCheck.cc
trunk/source/tools/integrated_schedule.cc
trunk/source/tools/prob_schedule.cc
trunk/source/tools/recursive_tests_decl_hdrs.hh
trunk/source/tools/recursive_tests_defn_hdrs.hh
trunk/source/tools/schedule.cc
trunk/source/tools/tUnitTestSuite.hh
trunk/source/tools/tUnitTestSuiteRecurser.hh
trunk/source/tools/tVerifierSuite.hh
trunk/source/tools/tVerifierSuiteRecurser.hh
trunk/source/tools/tools.pri
trunk/source/viewers/viewer.hh
Log:
Rename tools/b*, tools/c*
Modified: trunk/Avida2.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida2.xcodeproj/project.pbxproj 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/Avida2.xcodeproj/project.pbxproj 2005-10-06 23:54:52 UTC (rev 334)
@@ -11,10 +11,6 @@
700E2AF8085DE50C00CF158A /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
700E2B43085DE50C00CF158A /* weighted_index.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC315B3076253A5008F7A48 /* weighted_index.cc */; };
700E2B44085DE50C00CF158A /* tools.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC315AA076253A4008F7A48 /* tools.cc */; };
- 700E2B45085DE50C00CF158A /* block_struct.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31545076253A4008F7A48 /* block_struct.cc */; };
- 700E2B46085DE50C00CF158A /* cCycleCheck.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31547076253A4008F7A48 /* cCycleCheck.cc */; };
- 700E2B47085DE50C00CF158A /* const_schedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3154B076253A4008F7A48 /* const_schedule.cc */; };
- 700E2B48085DE50C00CF158A /* count_tracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3154D076253A4008F7A48 /* count_tracker.cc */; };
700E2B49085DE50C00CF158A /* data_entry.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31550076253A4008F7A48 /* data_entry.cc */; };
700E2B4A085DE50C00CF158A /* data_file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31552076253A4008F7A48 /* data_file.cc */; };
700E2B4B085DE50C00CF158A /* data_file_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31554076253A4008F7A48 /* data_file_manager.cc */; };
@@ -45,7 +41,6 @@
700E2B64085DE50C00CF158A /* string_iterator.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31592076253A4008F7A48 /* string_iterator.cc */; };
700E2B65085DE50C00CF158A /* string_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31594076253A4008F7A48 /* string_list.cc */; };
700E2B66085DE50C00CF158A /* string_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31596076253A4008F7A48 /* string_util.cc */; };
- 700E2B68085DE50C00CF158A /* change_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CBFCEF0815E8370078D8CC /* change_list.cc */; };
700E2B6F085DE50C00CF158A /* analyze.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC3114B0762539E008F7A48 /* analyze.cfg */; };
700E2B70085DE50C00CF158A /* environment.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311800762539F008F7A48 /* environment.cfg */; };
700E2B71085DE50C00CF158A /* events.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311810762539F008F7A48 /* events.cfg */; };
@@ -171,6 +166,12 @@
70B0874B08F5E82D00FC65FE /* cStats.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0872B08F5E82D00FC65FE /* cStats.cc */; };
70B0874C08F5E82D00FC65FE /* cTaskEntry.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0872C08F5E82D00FC65FE /* cTaskEntry.cc */; };
70B0874D08F5E82D00FC65FE /* cTaskLib.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0872D08F5E82D00FC65FE /* cTaskLib.cc */; };
+ 70B087E208F5F4BA00FC65FE /* cChangeList.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B087DF08F5F4BA00FC65FE /* cChangeList.cc */; };
+ 70B087E308F5F4BA00FC65FE /* cConstSchedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B087E008F5F4BA00FC65FE /* cConstSchedule.cc */; };
+ 70B087E408F5F4BA00FC65FE /* cCountTracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B087E108F5F4BA00FC65FE /* cCountTracker.cc */; };
+ 70B087E508F5F4BA00FC65FE /* cChangeList.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B087DF08F5F4BA00FC65FE /* cChangeList.cc */; };
+ 70B087E608F5F4BA00FC65FE /* cConstSchedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B087E008F5F4BA00FC65FE /* cConstSchedule.cc */; };
+ 70B087E708F5F4BA00FC65FE /* cCountTracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B087E108F5F4BA00FC65FE /* cCountTracker.cc */; };
70C1EF4808C393BA00F50912 /* cCodeLabel.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70C1EF4608C393BA00F50912 /* cCodeLabel.cc */; };
70C1EF4A08C393BA00F50912 /* cCodeLabel.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70C1EF4608C393BA00F50912 /* cCodeLabel.cc */; };
70C1EF5908C3948C00F50912 /* cCPUMemory.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70C1EF5808C3948C00F50912 /* cCPUMemory.cc */; };
@@ -249,17 +250,12 @@
70CA6EDF08DB7F8200068AC2 /* cInstruction.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CA6EBF08DB7F8200068AC2 /* cInstruction.cc */; };
70CA6EE008DB7F8200068AC2 /* cInstSet.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CA6EC008DB7F8200068AC2 /* cInstSet.cc */; };
70CA6EE108DB7F8200068AC2 /* cInstUtil.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CA6EC108DB7F8200068AC2 /* cInstUtil.cc */; };
- 70CBFCF10815E8370078D8CC /* change_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CBFCEF0815E8370078D8CC /* change_list.cc */; };
70D46934085F61DA004C8409 /* trio.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC3146D076253A1008F7A48 /* trio.c */; };
70D46935085F61DD004C8409 /* trionan.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC31471076253A1008F7A48 /* trionan.c */; };
70D46936085F61DF004C8409 /* triostr.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC31474076253A1008F7A48 /* triostr.c */; };
DCC3166107628531008F7A48 /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
DCC316B807628742008F7A48 /* weighted_index.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC315B3076253A5008F7A48 /* weighted_index.cc */; };
DCC316B907628744008F7A48 /* tools.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC315AA076253A4008F7A48 /* tools.cc */; };
- DCC316BA07628749008F7A48 /* block_struct.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31545076253A4008F7A48 /* block_struct.cc */; };
- DCC316BB0762874A008F7A48 /* cCycleCheck.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31547076253A4008F7A48 /* cCycleCheck.cc */; };
- DCC316BC0762874B008F7A48 /* const_schedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3154B076253A4008F7A48 /* const_schedule.cc */; };
- DCC316BD0762874C008F7A48 /* count_tracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3154D076253A4008F7A48 /* count_tracker.cc */; };
DCC316BE0762874D008F7A48 /* data_entry.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31550076253A4008F7A48 /* data_entry.cc */; };
DCC316BF0762874E008F7A48 /* data_file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31552076253A4008F7A48 /* data_file.cc */; };
DCC316C00762874F008F7A48 /* data_file_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31554076253A4008F7A48 /* data_file_manager.cc */; };
@@ -476,6 +472,17 @@
70B0872D08F5E82D00FC65FE /* cTaskLib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTaskLib.cc; sourceTree = "<group>"; };
70B0875A08F5EC8900FC65FE /* nGeometry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nGeometry.h; sourceTree = "<group>"; };
70B0875C08F5ECBC00FC65FE /* nReaction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nReaction.h; sourceTree = "<group>"; };
+ 70B087D708F5F4A900FC65FE /* cBlockStruct.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cBlockStruct.cc; sourceTree = "<group>"; };
+ 70B087D808F5F4A900FC65FE /* cBlockStruct.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cBlockStruct.h; sourceTree = "<group>"; };
+ 70B087D908F5F4A900FC65FE /* cChangeList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cChangeList.h; sourceTree = "<group>"; };
+ 70B087DA08F5F4A900FC65FE /* cConstSchedule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cConstSchedule.h; sourceTree = "<group>"; };
+ 70B087DB08F5F4A900FC65FE /* cCountTracker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cCountTracker.h; sourceTree = "<group>"; };
+ 70B087DC08F5F4A900FC65FE /* cCycleCheck.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cCycleCheck.h; sourceTree = "<group>"; };
+ 70B087DD08F5F4A900FC65FE /* cID.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cID.h; sourceTree = "<group>"; };
+ 70B087DE08F5F4A900FC65FE /* cVerifierSuiteRecurser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cVerifierSuiteRecurser.h; sourceTree = "<group>"; };
+ 70B087DF08F5F4BA00FC65FE /* cChangeList.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cChangeList.cc; sourceTree = "<group>"; };
+ 70B087E008F5F4BA00FC65FE /* cConstSchedule.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cConstSchedule.cc; sourceTree = "<group>"; };
+ 70B087E108F5F4BA00FC65FE /* cCountTracker.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCountTracker.cc; sourceTree = "<group>"; };
70C1EF4608C393BA00F50912 /* cCodeLabel.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCodeLabel.cc; sourceTree = "<group>"; };
70C1EF4708C393BA00F50912 /* cCodeLabel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cCodeLabel.h; sourceTree = "<group>"; };
70C1EF5808C3948C00F50912 /* cCPUMemory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCPUMemory.cc; sourceTree = "<group>"; };
@@ -577,8 +584,6 @@
70CA6EF308DB7F9E00068AC2 /* cInstSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cInstSet.h; sourceTree = "<group>"; };
70CA6EF408DB7F9E00068AC2 /* cInstUtil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cInstUtil.h; sourceTree = "<group>"; };
70CA6EF508DB806200068AC2 /* cGenotypeBatch.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cGenotypeBatch.h; sourceTree = "<group>"; };
- 70CBFCEF0815E8370078D8CC /* change_list.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = change_list.cc; sourceTree = "<group>"; };
- 70CBFCF00815E8370078D8CC /* change_list.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = change_list.hh; sourceTree = "<group>"; };
70CD471B089692200070D2DF /* AvidaEd-osx.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = "AvidaEd-osx.py"; sourceTree = "<group>"; };
70CD471D089692200070D2DF /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
70CD471E089692200070D2DF /* _Custom_Widgets.cw */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = _Custom_Widgets.cw; sourceTree = "<group>"; };
@@ -989,7 +994,6 @@
DCC310F00762539E008F7A48 /* main.pro */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = main.pro; sourceTree = "<group>"; };
DCC310F10762539E008F7A48 /* main_sub.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = main_sub.pri; sourceTree = "<group>"; };
DCC311090762539E008F7A48 /* primitive.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = primitive.cc; sourceTree = "<group>"; };
- DCC3110A0762539E008F7A48 /* primitive.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = primitive.hh; sourceTree = "<group>"; };
DCC311390762539E008F7A48 /* modules.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = modules.pri; sourceTree = "<group>"; };
DCC3114B0762539E008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
DCC3114C0762539E008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
@@ -1276,17 +1280,8 @@
DCC314D5076253A2008F7A48 /* test_result.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = test_result.h; sourceTree = "<group>"; };
DCC314D6076253A2008F7A48 /* text_test_interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = text_test_interpreter.cpp; sourceTree = "<group>"; };
DCC314D7076253A2008F7A48 /* text_test_interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = text_test_interpreter.h; sourceTree = "<group>"; };
- DCC31545076253A4008F7A48 /* block_struct.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = block_struct.cc; sourceTree = "<group>"; };
- DCC31546076253A4008F7A48 /* block_struct.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = block_struct.hh; sourceTree = "<group>"; };
DCC31547076253A4008F7A48 /* cCycleCheck.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCycleCheck.cc; sourceTree = "<group>"; };
- DCC31548076253A4008F7A48 /* cCycleCheck.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cCycleCheck.hh; sourceTree = "<group>"; };
- DCC31549076253A4008F7A48 /* cID.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cID.hh; sourceTree = "<group>"; };
DCC3154A076253A4008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
- DCC3154B076253A4008F7A48 /* const_schedule.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = const_schedule.cc; sourceTree = "<group>"; };
- DCC3154C076253A4008F7A48 /* const_schedule.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = const_schedule.hh; sourceTree = "<group>"; };
- DCC3154D076253A4008F7A48 /* count_tracker.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = count_tracker.cc; sourceTree = "<group>"; };
- DCC3154E076253A4008F7A48 /* count_tracker.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = count_tracker.hh; sourceTree = "<group>"; };
- DCC3154F076253A4008F7A48 /* cVerifierSuiteRecurser.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cVerifierSuiteRecurser.hh; sourceTree = "<group>"; };
DCC31550076253A4008F7A48 /* data_entry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_entry.cc; sourceTree = "<group>"; };
DCC31551076253A4008F7A48 /* data_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = data_entry.hh; sourceTree = "<group>"; };
DCC31552076253A4008F7A48 /* data_file.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_file.cc; sourceTree = "<group>"; };
@@ -2172,7 +2167,6 @@
DCC310F00762539E008F7A48 /* main.pro */,
DCC310F10762539E008F7A48 /* main_sub.pri */,
DCC311090762539E008F7A48 /* primitive.cc */,
- DCC3110A0762539E008F7A48 /* primitive.hh */,
DCC3112E0762539E008F7A48 /* unit_testsuites */,
70B085D108F48C9400FC65FE /* nSpecies.h */,
);
@@ -2721,20 +2715,20 @@
DCC314D8076253A2008F7A48 /* tools */ = {
isa = PBXGroup;
children = (
+ 70B087DF08F5F4BA00FC65FE /* cChangeList.cc */,
+ 70B087E008F5F4BA00FC65FE /* cConstSchedule.cc */,
+ 70B087E108F5F4BA00FC65FE /* cCountTracker.cc */,
+ 70B087D708F5F4A900FC65FE /* cBlockStruct.cc */,
+ 70B087D808F5F4A900FC65FE /* cBlockStruct.h */,
+ 70B087D908F5F4A900FC65FE /* cChangeList.h */,
+ 70B087DA08F5F4A900FC65FE /* cConstSchedule.h */,
+ 70B087DB08F5F4A900FC65FE /* cCountTracker.h */,
+ 70B087DC08F5F4A900FC65FE /* cCycleCheck.h */,
+ 70B087DD08F5F4A900FC65FE /* cID.h */,
+ 70B087DE08F5F4A900FC65FE /* cVerifierSuiteRecurser.h */,
70FB868608BFA02D00BDF589 /* tHashTable.hh */,
- 70CBFCEF0815E8370078D8CC /* change_list.cc */,
- 70CBFCF00815E8370078D8CC /* change_list.hh */,
- DCC31545076253A4008F7A48 /* block_struct.cc */,
- DCC31546076253A4008F7A48 /* block_struct.hh */,
DCC31547076253A4008F7A48 /* cCycleCheck.cc */,
- DCC31548076253A4008F7A48 /* cCycleCheck.hh */,
- DCC31549076253A4008F7A48 /* cID.hh */,
DCC3154A076253A4008F7A48 /* CMakeLists.txt */,
- DCC3154B076253A4008F7A48 /* const_schedule.cc */,
- DCC3154C076253A4008F7A48 /* const_schedule.hh */,
- DCC3154D076253A4008F7A48 /* count_tracker.cc */,
- DCC3154E076253A4008F7A48 /* count_tracker.hh */,
- DCC3154F076253A4008F7A48 /* cVerifierSuiteRecurser.hh */,
DCC31550076253A4008F7A48 /* data_entry.cc */,
DCC31551076253A4008F7A48 /* data_entry.hh */,
DCC31552076253A4008F7A48 /* data_file.cc */,
@@ -3036,10 +3030,6 @@
700E2AF8085DE50C00CF158A /* avida.cc in Sources */,
700E2B43085DE50C00CF158A /* weighted_index.cc in Sources */,
700E2B44085DE50C00CF158A /* tools.cc in Sources */,
- 700E2B45085DE50C00CF158A /* block_struct.cc in Sources */,
- 700E2B46085DE50C00CF158A /* cCycleCheck.cc in Sources */,
- 700E2B47085DE50C00CF158A /* const_schedule.cc in Sources */,
- 700E2B48085DE50C00CF158A /* count_tracker.cc in Sources */,
700E2B49085DE50C00CF158A /* data_entry.cc in Sources */,
700E2B4A085DE50C00CF158A /* data_file.cc in Sources */,
700E2B4B085DE50C00CF158A /* data_file_manager.cc in Sources */,
@@ -3070,7 +3060,6 @@
700E2B64085DE50C00CF158A /* string_iterator.cc in Sources */,
700E2B65085DE50C00CF158A /* string_list.cc in Sources */,
700E2B66085DE50C00CF158A /* string_util.cc in Sources */,
- 700E2B68085DE50C00CF158A /* change_list.cc in Sources */,
70658C35085DE5D800486BED /* ansi.cc in Sources */,
70658C36085DE5D900486BED /* bar_screen.cc in Sources */,
70658C38085DE5DC00486BED /* environment_screen.cc in Sources */,
@@ -3164,6 +3153,9 @@
70B0874B08F5E82D00FC65FE /* cStats.cc in Sources */,
70B0874C08F5E82D00FC65FE /* cTaskEntry.cc in Sources */,
70B0874D08F5E82D00FC65FE /* cTaskLib.cc in Sources */,
+ 70B087E508F5F4BA00FC65FE /* cChangeList.cc in Sources */,
+ 70B087E608F5F4BA00FC65FE /* cConstSchedule.cc in Sources */,
+ 70B087E708F5F4BA00FC65FE /* cCountTracker.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3174,10 +3166,6 @@
DCC3166107628531008F7A48 /* avida.cc in Sources */,
DCC316B807628742008F7A48 /* weighted_index.cc in Sources */,
DCC316B907628744008F7A48 /* tools.cc in Sources */,
- DCC316BA07628749008F7A48 /* block_struct.cc in Sources */,
- DCC316BB0762874A008F7A48 /* cCycleCheck.cc in Sources */,
- DCC316BC0762874B008F7A48 /* const_schedule.cc in Sources */,
- DCC316BD0762874C008F7A48 /* count_tracker.cc in Sources */,
DCC316BE0762874D008F7A48 /* data_entry.cc in Sources */,
DCC316BF0762874E008F7A48 /* data_file.cc in Sources */,
DCC316C00762874F008F7A48 /* data_file_manager.cc in Sources */,
@@ -3208,7 +3196,6 @@
DCC316D90762876C008F7A48 /* string_iterator.cc in Sources */,
DCC316DA0762876E008F7A48 /* string_list.cc in Sources */,
DCC316DB0762876F008F7A48 /* string_util.cc in Sources */,
- 70CBFCF10815E8370078D8CC /* change_list.cc in Sources */,
70658C44085DE5FF00486BED /* primitive.cc in Sources */,
70D46934085F61DA004C8409 /* trio.c in Sources */,
70D46935085F61DD004C8409 /* trionan.c in Sources */,
@@ -3292,6 +3279,9 @@
70B0873B08F5E82D00FC65FE /* cStats.cc in Sources */,
70B0873C08F5E82D00FC65FE /* cTaskEntry.cc in Sources */,
70B0873D08F5E82D00FC65FE /* cTaskLib.cc in Sources */,
+ 70B087E208F5F4BA00FC65FE /* cChangeList.cc in Sources */,
+ 70B087E308F5F4BA00FC65FE /* cConstSchedule.cc in Sources */,
+ 70B087E408F5F4BA00FC65FE /* cCountTracker.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/source/bindings/Boost.Python/avida-fixups.hh
===================================================================
--- trunk/source/bindings/Boost.Python/avida-fixups.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/avida-fixups.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,7 +1,7 @@
#ifndef AVIDA_FIXUPS_HH
#define AVIDA_FIXUPS_HH
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
Modified: trunk/source/bindings/Boost.Python/avida_driver_population.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/avida_driver_population.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/avida_driver_population.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
-Include("change_list.hh")
+Include("cChangeList.h")
Include("cEnvironment.h")
Include("cPopulation.h")
Modified: trunk/source/bindings/Boost.Python/block_struct.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/block_struct.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/block_struct.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,4 +1,4 @@
-cBlockStruct = Class("cBlockStruct", "block_struct.hh")
+cBlockStruct = Class("cBlockStruct", "cBlockStruct.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/cCycleCheck.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/cCycleCheck.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/cCycleCheck.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
-Include("cID.hh")
+Include("cID.h")
-cCycleCheck = Class("cCycleCheck", "cCycleCheck.hh")
+cCycleCheck = Class("cCycleCheck", "cCycleCheck.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/cID.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/cID.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/cID.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,4 +1,4 @@
-cID = Class("cID", "cID.hh")
+cID = Class("cID", "cID.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/change_list.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/change_list.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/change_list.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
-cChangeList = Class("cChangeList", "change_list.hh")
+cChangeList = Class("cChangeList", "cChangeList.h")
class_code(cChangeList, '.def("__len__", &cChangeList__len__)')
class_code(cChangeList, '.def("__getitem__", &cChangeList__getitem__)')
declaration_code("""
Modified: trunk/source/bindings/Boost.Python/const_schedule.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/const_schedule.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/const_schedule.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -3,6 +3,6 @@
Include("merit.hh")
-cConstSchedule = Class("cConstSchedule", "const_schedule.hh")
+cConstSchedule = Class("cConstSchedule", "cConstSchedule.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/count_tracker.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/count_tracker.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/count_tracker.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,4 +1,4 @@
-cCountTracker = Class("cCountTracker", "count_tracker.hh")
+cCountTracker = Class("cCountTracker", "cCountTracker.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/population.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/population.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/population.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
-Include("change_list.hh")
+Include("cChangeList.h")
Include("cEnvironment.h")
Include("cGenebank.h" )
Include("cInjectGenebank.h")
Modified: trunk/source/bindings/Boost.Python/py_avida_driver-fixups.cc
===================================================================
--- trunk/source/bindings/Boost.Python/py_avida_driver-fixups.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/py_avida_driver-fixups.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#include "main/cOrganism.h"
#include "main/cPopulation.h"
#include "main/cPopulationCell.h"
-#include "tools/change_list.hh"
+#include "tools/cChangeList.h"
#include "tools/string.hh"
Modified: trunk/source/bindings/Boost.Python/py_avida_driver.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/py_avida_driver.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/py_avida_driver.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
-Include("change_list.hh")
+Include("cChangeList.h")
Import("avida_driver_population.pyste")
Modified: trunk/source/bindings/Boost.Python/schedule.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/schedule.pyste 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/bindings/Boost.Python/schedule.pyste 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
-Include("change_list.hh")
+Include("cChangeList.h")
Include("merit.hh")
cSchedule = Class("cSchedule", "schedule.hh")
Modified: trunk/source/event/cPopulationEventFactory.cc
===================================================================
--- trunk/source/event/cPopulationEventFactory.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/event/cPopulationEventFactory.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -12,7 +12,7 @@
#ifndef ANALYZE_UTIL_HH
#include "cAnalyzeUtil.h"
#endif
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
#ifndef AVIDA_DRIVER_BASE_HH
Modified: trunk/source/main/avida.cc
===================================================================
--- trunk/source/main/avida.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/avida.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -5,7 +5,7 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
Modified: trunk/source/main/avida.h
===================================================================
--- trunk/source/main/avida.h 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/avida.h 2005-10-06 23:54:52 UTC (rev 334)
@@ -5,8 +5,8 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef AVIDA_HH
-#define AVIDA_HH
+#ifndef avida_h
+#define avida_h
class cEnvironment;
class cPopulationInterface;
Modified: trunk/source/main/cAvidaDriver_Population.cc
===================================================================
--- trunk/source/main/cAvidaDriver_Population.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/cAvidaDriver_Population.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#include "cAvidaTriggers.h"
#include "cCallbackUtil.h"
-#include "change_list.hh"
+#include "cChangeList.h"
#include "cConfig.h"
#include "cEventFactoryManager.h"
#include "cEventList.h"
Modified: trunk/source/main/cCallbackUtil.cc
===================================================================
--- trunk/source/main/cCallbackUtil.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/cCallbackUtil.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#include "cCallbackUtil.h"
#endif
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
#ifndef AVIDA_DRIVER_BASE_HH
Modified: trunk/source/main/cGenotype_BirthData.h
===================================================================
--- trunk/source/main/cGenotype_BirthData.h 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/cGenotype_BirthData.h 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#define GENOTYPE_BIRTH_DATA_HH
#ifndef COUNT_TRACKER_HH
-#include "count_tracker.hh"
+#include "cCountTracker.h"
#endif
#ifndef TARRAY_HH
Modified: trunk/source/main/cInjectGenotype_BirthData.h
===================================================================
--- trunk/source/main/cInjectGenotype_BirthData.h 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/cInjectGenotype_BirthData.h 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#define INJECT_GENOTYPE_BIRTH_DATA_HH
#ifndef COUNT_TRACKER_HH
-#include "count_tracker.hh"
+#include "cCountTracker.h"
#endif
class cInjectGenotype;
Modified: trunk/source/main/cPopulation.cc
===================================================================
--- trunk/source/main/cPopulation.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/cPopulation.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -7,9 +7,9 @@
#include "cPopulation.h"
-#include "change_list.hh"
+#include "cChangeList.h"
#include "cConfig.h"
-#include "const_schedule.hh"
+#include "cConstSchedule.h"
#include "data_file.hh"
#include "cEnvironment.h"
#include "functions.hh"
Modified: trunk/source/main/primitive.cc
===================================================================
--- trunk/source/main/primitive.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/primitive.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,15 +1,13 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2001 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
+/*
+ * nGeometry.h
+ * Avida2
+ *
+ * Copyright 2005 Michigan State University. All rights reserved.
+ * Copyright 1993 - 2001 California Institute of Technology.
+ *
+ */
-#ifndef PRIMITIVE_HH
-#include "primitive.hh"
-#endif
-
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
#ifndef AVIDA_DRIVER_ANALYZE_HH
Deleted: trunk/source/main/primitive.hh
===================================================================
--- trunk/source/main/primitive.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/main/primitive.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,16 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2001 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef PRIMITIVE_HH
-#define PRIMITIVE_HH
-
-/*
-This header file is intentionally empty. Its presence prevents
-complaints from an automatic level-check program.
-*/
-
-#endif
Modified: trunk/source/testsuites/unit_testsuites/avida.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/avida.t.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/testsuites/unit_testsuites/avida.t.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,4 +1,4 @@
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
#ifndef TEST_CASE_H
Modified: trunk/source/testsuites/unit_testsuites/block_struct.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/block_struct.t.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/testsuites/unit_testsuites/block_struct.t.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,7 +1,7 @@
#include <iostream>
#ifndef BLOCK_STRUCT_HH
-#include "block_struct.hh"
+#include "cBlockStruct.h"
#endif
#ifndef TEST_CASE_H
#include "third-party/yaktest/cTestCase.hh"
Modified: trunk/source/testsuites/unit_testsuites/const_schedule.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/const_schedule.t.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/testsuites/unit_testsuites/const_schedule.t.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,7 +1,7 @@
#include <iostream>
#ifndef CONST_SCHEDULE_HH
-#include "const_schedule.hh"
+#include "cConstSchedule.h"
#endif
#ifndef TEST_CASE_H
#include "third-party/yaktest/cTestCase.hh"
Modified: trunk/source/testsuites/unit_testsuites/level_0/count_tracker.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/level_0/count_tracker.t.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/testsuites/unit_testsuites/level_0/count_tracker.t.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,5 +1,5 @@
#ifndef COUNT_TRACKER_HH
-#include "count_tracker.hh"
+#include "cCountTracker.h"
#endif
#ifndef TEST_CASE_H
Modified: trunk/source/tools/CMakeLists.txt
===================================================================
--- trunk/source/tools/CMakeLists.txt 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/CMakeLists.txt 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,8 +1,8 @@
SET(libtools_a_SOURCES
- block_struct.cc
- change_list.cc
- const_schedule.cc
- count_tracker.cc
+ cBlockStruct.cc
+ cChangeList.cc
+ cConstSchedule.cc
+ cCountTracker.cc
data_entry.cc
data_file.cc
data_file_manager.cc
Deleted: trunk/source/tools/block_struct.cc
===================================================================
--- trunk/source/tools/block_struct.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/block_struct.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,227 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2000 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef BLOCK_STRUCT_HH
-#include "block_struct.hh"
-#endif
-
-#include <iostream>
-
-using namespace std;
-
-////////////////////
-// cBlockStruct
-////////////////////
-
-cBlockStruct::cBlockStruct(int in_num_scaled, int in_num_fixed)
-{
- num_fixed = in_num_fixed;
- num_scaled = in_num_scaled;
-
- fixed_array = new cFixedBlock[num_fixed];
- scaled_array = new cScaledBlock[num_scaled];
-
- fixed_used(0, 0);
- scaled_used = 0;
-
- fixed_size = 0;
-}
-
-cBlockStruct::~cBlockStruct()
-{
- delete [] scaled_array;
- delete [] fixed_array;
-}
-
-int cBlockStruct::AddData(void * in_data, int in_size)
-{
- if (in_size <= 0) return -1; // Only allow positive sized data.
-
- scaled_array[scaled_used].SetData(in_data);
- scaled_array[scaled_used].SetSize(in_size);
-
- return scaled_used++;
-}
-
-int cBlockStruct::AddDataTo(void * in_data, int in_index)
-{
- scaled_array[in_index].SetData(in_data);
-
- return scaled_array[in_index].GetSize();
-}
-
-void cBlockStruct::Clear()
-{
- fixed_used(0, 0);
- scaled_used = 0;
-}
-
-int cBlockStruct::Process()
-{
- if (!fixed_size) {
- cerr << "Error: No fixed size!" << endl;
- return -1;
- }
-
- int cur_scaled = 0;
- int cur_fixed = 0;
- int size_left = scaled_array[0].GetSize();
-
- // Set up the internal data for the first scaled block.
-
- scaled_array[0].SetStart(0, 0);
-
- // Move through the fixed blocks assigning each to the corresponding scaled
- // block. This is done by keeping track of the current scaled block for
- // a particular location, and keeping track the "size" until the next block.
-
- for(cur_fixed = 0; cur_fixed < num_fixed; cur_fixed++) {
- // Set the current fixed block to point to whatever scaled block we are
- // currently in.
-
- fixed_array[cur_fixed].SetStart(cur_scaled);
-
- // If the current scaled block covers the entire fixed block, then just
- // adjust the size_left and move on.
-
- if (size_left > fixed_size) {
- size_left -= fixed_size;
- continue;
- }
-
- // Otherwise, start moving through the scaled blocks until the size can
- // be covered.
-
- while (size_left <= fixed_size) {
- // move onto the next scaled block...
- cur_scaled++;
-
- // Check to see if we are finished...
- if (cur_scaled == scaled_used) {
- fixed_used(cur_fixed, size_left); // Store max coord
- return cur_fixed + 1;
- }
-
- // Setup the next cScaledBlock...
-
- scaled_array[cur_scaled].SetStart(cur_fixed, size_left);
- if (size_left == fixed_size) {
- scaled_array[cur_scaled].SetStart(cur_fixed + 1, 0);
- }
-
- // Add the size of the new cScaledBlock onto the size_left.
-
- size_left += scaled_array[cur_scaled].GetSize();
- }
-
- // Move onto the next fixed block.
- size_left -= fixed_size;
- }
-
- cout << "END Process() : Ran out of fixed_blocks..." << endl;
-
- return -1;
-}
-
-int cBlockStruct::Update()
-{
- // @CAO make sure a process has been done at some point in the past?
-
- // Start out where the last Process() finished.
-
- int cur_scaled = fixed_array[fixed_used.GetBlockNum()].GetStart();
- int cur_fixed = scaled_array[cur_scaled].GetStart().GetBlockNum();
- int cur_offset = scaled_array[cur_scaled].GetStart().GetOffset();
- int size_left = scaled_array[cur_scaled].GetSize();
-
- // Re-adjust to make sure we are starting at the begining of a fixed block.
-
- if (cur_offset) {
- size_left += cur_offset - fixed_size;
- cur_fixed++;
- }
-
- // Move through the fixed blocks assigning each to the corresponding scaled
- // block. This is done by keeping track of the current scaled block for
- // a particular location, and keeping track the "size" until the next block.
-
- for(; cur_fixed < num_fixed; cur_fixed++) {
- // Set the current fixed block to point to whatever scaled block we are
- // currently in.
-
- fixed_array[cur_fixed].SetStart(cur_scaled);
-
- // If the current scaled block covers the entire fixed block, then just
- // adjust the size_left and move on.
-
- if (size_left > fixed_size) {
- size_left -= fixed_size;
- continue;
- }
-
- // Otherwise, start moving through the scaled blocks until the size can
- // be covered.
-
- while (size_left <= fixed_size) {
- // move onto the next scaled block...
- cur_scaled++;
-
- // Check to see if we are finished...
- if (cur_scaled == scaled_used) {
- fixed_used(cur_fixed, size_left); // Store max coord
- return cur_fixed + 1;
- }
-
- // Setup the next cScaledBlock...
-
- scaled_array[cur_scaled].SetStart(cur_fixed, size_left);
- if (size_left == fixed_size) {
- scaled_array[cur_scaled].SetStart(cur_fixed + 1, 0);
- }
-
- // Add the size of the new cScaledBlock onto the size_left.
-
- size_left += scaled_array[cur_scaled].GetSize();
- }
-
- // Move onto the next fixed block.
- size_left -= fixed_size;
- }
-
- cout << "END Update() : Ran out of fixed_blocks..." << endl;
-
- return -1;
-}
-
-
-int cBlockStruct::Compress()
-{
- int scan_loc;
- int write_loc = 0;
-
- for (scan_loc = 0; scan_loc < num_scaled; scan_loc++) {
- if (scaled_array[scan_loc].GetData()) {
- if (scan_loc != write_loc) {
- scaled_array[write_loc] = scaled_array[scan_loc];
- scaled_array[scan_loc].SetData(NULL);
- scaled_array[scan_loc].SetSize(0);
- }
- write_loc++;
- }
- }
-
- num_scaled = write_loc;
-
- return num_scaled;
-}
-
-void * cBlockStruct::Remove(int out_block)
-{
- void * temp = scaled_array[out_block].GetData();
- scaled_array[out_block].SetData(NULL);
- return temp;
-}
Deleted: trunk/source/tools/block_struct.hh
===================================================================
--- trunk/source/tools/block_struct.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/block_struct.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,271 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef BLOCK_STRUCT_HH
-#define BLOCK_STRUCT_HH
-
-#ifndef FIXEDBLOCK_HH
-#include "fixed_block.hh"
-#endif
-#ifndef FIXEDCOORDS_HH
-#include "fixed_coords.hh"
-#endif
-#ifndef SCALED_BLOCK_HH
-#include "scaled_block.hh"
-#endif
-#ifndef UINT_HH
-#include "uint.hh"
-#endif
-
-#define BLOCK_FLAG_FILL_IN 0
-#define BLOCK_FLAG_AUTO_COMPRESS 1
-#define BLOCK_FLAG_FRAGMENT_OK 2
-#define BLOCK_FLAG_AUTOCALC_SIZE 3
-
-/**
- * A data structure which allows indexing into an array
- * where each cell of the array is *not* a fixed size. This would be useful
- * in situations such as when working with probabilities (construct an array
- * with each piece of data having a size propotional to its probability, and
- * then index randomly into the array) or mapping the contents of a one-
- * dimensional space (such as computer memory) allowing random access to what
- * is at any location with maximal precision, high speed, and reasonably low
- * memory costs.
- *
- * The structure works by first creating an array where each block contains
- * the data it points to, and a number representing its size. This is then
- * translated onto a second array where all of the blocks represent a fixed
- * size, and simply point back to their respective location in the original
- * array. The structure can therefore find the approximate location in the
- * original array, and do a serial search from there.
- *
- * Example: We have a time line of 100 years which there were 5 distinct
- * periods of time (labeled A-E for convienence), A = 15 yrs, B = 20 yrs,
- * C = 10 yrs, D = 5 yrs, and E = 50 yrs. We can represent each of these
- * as a block with a size equal to its duration. Then, we might translate
- * it to 5 fixed blocks, each of size 20 years, where the first points to
- * block A, the second to B, the third to C, and the last two to E. Thus,
- * if you want to know what period any specific year was in, you only have
- * to indexed into the fixed-size array, and you immediately have a much
- * more acurate starting point for your search in the scaled array. In
- * this case it's not a big deal since there only five blocks to consider,
- * but when you start having huge quantities of data to consider, this
- * technique is much more useful.
- *
- * In avida this is used in two parts. The first is in the probabilistic
- * time slicing scheme where we want all of the creatures to have a chance
- * of being executed proportional to their merit. The second is in the
- * cosmic ray mutations, where each creature's chance of being struck by one
- * is scaled to their size.
- *
- * In creating a cBlockStruct, the variables which need to be set are the
- * number of blocks in each of the arrays. In the first array, this simply
- * determines how many of pieces of data can be entered into the structure.
- * In the second (fixed-size blocked) array, this will determine the
- * resolution of the initial search. A higher resolution allows for a much
- * faster search, while a lower resultion means less memory is used. By the
- * diminishing returns of larger arrays, memory and speed maximize when both
- * arrays are made of the same size.
- *
- * The only other variable which needs to be considered is the actual size
- * of each block in the fixed-size array. This can either be entered by the
- * programer, or else optimally determined from the data which has thus far
- * been entered by running the CalcFixedSize() method. It is only recomened
- * the you calculate the value outside of the object if you are planing to
- * still insert more data to be added into the structure after it is initially
- * constructed.
- *
- * To add data to the object, call AddData(void *, int),
- * where the first input
- * is a pointer to the data, and the second is its size. Once all the data
- * has been added, a call to Process() will build up the object so it can
- * be used (remember, the fixed_size must be set before Process()
- * can run).
- * If more data is added to the structure after Process() is run, a second
- * function, Update(), will incorporate all of the new information without
- * having to take the time to rebuild the whole thing.
- *
- * When AddData(void *, int) is called, it will return a int value
- * which is
- * the location in the propotional sized array that that piece of data has.
- * If you every want to remove the data from the structure, you must call
- * Remove(int) giving it back this int tag.
- * Remove will simply change the
- * pointer to the data at this location to a NULL pointer. If you want to
- * put new data in this location, call AddDataTo(void *, int) where the
- * first argument is the data, and the second is the location to place it in.
- * It will have the same size as the original piece of data in this location.
- * Finally, if you wish to simply get rid of the NULL data locations, a
- * call to the method Compress() will do this in O(N) time.
- * Note that once
- * the data is compressed, all of the tags will change, and the ones sent
- * back by AddData() will no longer be valid.
- *
- * Extra options (in the form of flags) are going to be added. These are:
- * BLOCK_FLAG_FILL_IN : This causes all new entries added with AddData()
- * to be placed in the first cell pointing to NULL data in which it fits,
- * rather then at the end of the currently used portion of the array.
- * This is useful to conserve space in the array, but insertions take
- * slightly longer.
- * BLOCK_FLAG_AUTO_COMPRESS : This causes the array to automatically be
- * compressed to remove the space left by removed data, and the runs
- * process again. This keeps clean arrays with no holes in them, but
- * insertions take *very* long.
- * BLOCK_FLAG_FRAGMENT_OK : This causes new data to be placed in the blocks
- * of old data, even if it means spliting up a single piece of data over
- * a number of blocks. This minimizes the amount of wasted space in the
- * array without taking the time to compress the entire thing, but can
- * lead to a huge number of cells in the array being used due to
- * fragmentation.
- * BLOCK_FLAG_AUTOCALC_SIZE : This option causes Process() to
- * automatically
- * recalculate the fixed_size every time it is run.
- **/
-
-class cFixedCoords; // aggregate
-class cFixedBlock; // accessed
-class cScaledBlock; // accessed
-class cUInt; // aggregate
-
-class cBlockStruct {
-private:
- cFixedBlock * fixed_array;
- cScaledBlock * scaled_array;
-
- int num_fixed;
- int num_scaled;
-
- cFixedCoords fixed_used;
- int scaled_used;
-
- int fixed_size;
-public:
- cBlockStruct(int in_num_scaled = 1, int in_num_fixed = 1);
- ~cBlockStruct();
-
-/**
- * This function adds a single piece of data to the scaled array
- * but does not update the fixed array yet.
- *
- * @see cBlockStruct::AddDataTo
- * @return An index into the scaled block array.
- * @param in_data A pointer to the data.
- * @param in_size The size of the data.
- **/
- int AddData(void * in_data, int in_size);
-
-
-/**
- * This function adds a single piece of data to the scaled array
- * but does not update the fixed array yet. In comparison to
- * @ref cBlockStruct::AddData, this function adds the data at the given
- * index in_index in the scaled block array, and returns the size of the
- * data at that index position.
- *
- * @see cBlockStruct::AddData
- * @return The size of the data at position in_index.
- * @param in_data A pointer to the data.
- * @param in_index The index position at which the data should be put.
- **/
- int AddDataTo(void * in_data, int in_index);
-
-/**
- * This function removes all of the data from the structure.
- **/
- void Clear();
-
-/**
- * This function takes the scaled array and constructs from it the
- * proper fixed array. Any information which previously was in the fixed
- * array is
- * completely erased and re-constructed.
- *
- * @return The number of @ref cFixedBlock's, or -1 if that number overflows.
- **/
- int Process();
-
-/**
- * This function looks at data which has been taken in since the last
- * time the fixed array was built or updated, and the new info at the end.
- *
- * @return The number of @ref cFixedBlock's, or -1 if that number overflows.
- **/
- int Update();
-
-/**
- * This function takes the scaled array, and removes any elements from it
- * which no longer point to data, and compresses everything to the begining.
- * This should always be followed shortly by adding any new data, and then
- * a Process().
- *
- * @return The new number of @ref cScaledBlock's used.
- **/
-
- int Compress();
-
-
-/**
- * Function to retrieve data from the structure.
- **/
- inline void * Find(const cFixedCoords & search_coords) const;
-/**
- * Function to retrieve data from the structure.
- **/
- inline void * Find(int in_block, int in_offset) const;
-/**
- * Function to retrieve data from the structure.
- **/
- inline void * Find(cUInt in_position) const;
-
-/**
- * Function to remove data from the structure.
- **/
- void * Remove(int out_block);
-
- // Finally, internal variable control...
- inline int GetFixedSize() const { return fixed_size; }
- inline int GetBlocksUsed() const { return fixed_used.GetBlockNum() + 1; }
- inline void SetFixedSize(int in_fs) { fixed_size = in_fs; }
-};
-
-inline void * cBlockStruct::Find(const cFixedCoords & search_coords) const
-{
- // Make sure the find is within range.
- if (search_coords >= fixed_used) {
- return NULL;
- }
-
- // Find the starting point in the scaled array for the search.
- int scaled_loc = fixed_array[search_coords.GetBlockNum()].GetStart();
- cFixedCoords cur_coords = scaled_array[scaled_loc].GetStart();
-
- // Starting at the starting point, move through the array until the entry
- // which covers this area is found.
- cur_coords.Add(0, scaled_array[scaled_loc].GetSize(), fixed_size);
- while (cur_coords <= search_coords) {
- scaled_loc++;
- cur_coords.Add(0, scaled_array[scaled_loc].GetSize(), fixed_size);
- }
-
- // Return the data in the found entry.
- return scaled_array[scaled_loc].GetData();
-}
-
-inline void * cBlockStruct::Find(int in_block, int in_offset) const
-{
- cFixedCoords search_coords(in_block, in_offset);
- return Find(search_coords);
-}
-
-inline void * cBlockStruct::Find(cUInt in_position) const
-{
- cFixedCoords search_coords((in_position /= fixed_size).AsInt(),
- (in_position %= fixed_size).AsInt());
- return Find(search_coords);
-}
-
-#endif
Copied: trunk/source/tools/cBlockStruct.cc (from rev 331, trunk/source/tools/block_struct.cc)
===================================================================
--- trunk/source/tools/block_struct.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cBlockStruct.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -0,0 +1,227 @@
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1993 - 2000 California Institute of Technology //
+// //
+// Read the COPYING and README files, or contact 'avida at alife.org', //
+// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BLOCK_STRUCT_HH
+#include "cBlockStruct.h"
+#endif
+
+#include <iostream>
+
+using namespace std;
+
+////////////////////
+// cBlockStruct
+////////////////////
+
+cBlockStruct::cBlockStruct(int in_num_scaled, int in_num_fixed)
+{
+ num_fixed = in_num_fixed;
+ num_scaled = in_num_scaled;
+
+ fixed_array = new cFixedBlock[num_fixed];
+ scaled_array = new cScaledBlock[num_scaled];
+
+ fixed_used(0, 0);
+ scaled_used = 0;
+
+ fixed_size = 0;
+}
+
+cBlockStruct::~cBlockStruct()
+{
+ delete [] scaled_array;
+ delete [] fixed_array;
+}
+
+int cBlockStruct::AddData(void * in_data, int in_size)
+{
+ if (in_size <= 0) return -1; // Only allow positive sized data.
+
+ scaled_array[scaled_used].SetData(in_data);
+ scaled_array[scaled_used].SetSize(in_size);
+
+ return scaled_used++;
+}
+
+int cBlockStruct::AddDataTo(void * in_data, int in_index)
+{
+ scaled_array[in_index].SetData(in_data);
+
+ return scaled_array[in_index].GetSize();
+}
+
+void cBlockStruct::Clear()
+{
+ fixed_used(0, 0);
+ scaled_used = 0;
+}
+
+int cBlockStruct::Process()
+{
+ if (!fixed_size) {
+ cerr << "Error: No fixed size!" << endl;
+ return -1;
+ }
+
+ int cur_scaled = 0;
+ int cur_fixed = 0;
+ int size_left = scaled_array[0].GetSize();
+
+ // Set up the internal data for the first scaled block.
+
+ scaled_array[0].SetStart(0, 0);
+
+ // Move through the fixed blocks assigning each to the corresponding scaled
+ // block. This is done by keeping track of the current scaled block for
+ // a particular location, and keeping track the "size" until the next block.
+
+ for(cur_fixed = 0; cur_fixed < num_fixed; cur_fixed++) {
+ // Set the current fixed block to point to whatever scaled block we are
+ // currently in.
+
+ fixed_array[cur_fixed].SetStart(cur_scaled);
+
+ // If the current scaled block covers the entire fixed block, then just
+ // adjust the size_left and move on.
+
+ if (size_left > fixed_size) {
+ size_left -= fixed_size;
+ continue;
+ }
+
+ // Otherwise, start moving through the scaled blocks until the size can
+ // be covered.
+
+ while (size_left <= fixed_size) {
+ // move onto the next scaled block...
+ cur_scaled++;
+
+ // Check to see if we are finished...
+ if (cur_scaled == scaled_used) {
+ fixed_used(cur_fixed, size_left); // Store max coord
+ return cur_fixed + 1;
+ }
+
+ // Setup the next cScaledBlock...
+
+ scaled_array[cur_scaled].SetStart(cur_fixed, size_left);
+ if (size_left == fixed_size) {
+ scaled_array[cur_scaled].SetStart(cur_fixed + 1, 0);
+ }
+
+ // Add the size of the new cScaledBlock onto the size_left.
+
+ size_left += scaled_array[cur_scaled].GetSize();
+ }
+
+ // Move onto the next fixed block.
+ size_left -= fixed_size;
+ }
+
+ cout << "END Process() : Ran out of fixed_blocks..." << endl;
+
+ return -1;
+}
+
+int cBlockStruct::Update()
+{
+ // @CAO make sure a process has been done at some point in the past?
+
+ // Start out where the last Process() finished.
+
+ int cur_scaled = fixed_array[fixed_used.GetBlockNum()].GetStart();
+ int cur_fixed = scaled_array[cur_scaled].GetStart().GetBlockNum();
+ int cur_offset = scaled_array[cur_scaled].GetStart().GetOffset();
+ int size_left = scaled_array[cur_scaled].GetSize();
+
+ // Re-adjust to make sure we are starting at the begining of a fixed block.
+
+ if (cur_offset) {
+ size_left += cur_offset - fixed_size;
+ cur_fixed++;
+ }
+
+ // Move through the fixed blocks assigning each to the corresponding scaled
+ // block. This is done by keeping track of the current scaled block for
+ // a particular location, and keeping track the "size" until the next block.
+
+ for(; cur_fixed < num_fixed; cur_fixed++) {
+ // Set the current fixed block to point to whatever scaled block we are
+ // currently in.
+
+ fixed_array[cur_fixed].SetStart(cur_scaled);
+
+ // If the current scaled block covers the entire fixed block, then just
+ // adjust the size_left and move on.
+
+ if (size_left > fixed_size) {
+ size_left -= fixed_size;
+ continue;
+ }
+
+ // Otherwise, start moving through the scaled blocks until the size can
+ // be covered.
+
+ while (size_left <= fixed_size) {
+ // move onto the next scaled block...
+ cur_scaled++;
+
+ // Check to see if we are finished...
+ if (cur_scaled == scaled_used) {
+ fixed_used(cur_fixed, size_left); // Store max coord
+ return cur_fixed + 1;
+ }
+
+ // Setup the next cScaledBlock...
+
+ scaled_array[cur_scaled].SetStart(cur_fixed, size_left);
+ if (size_left == fixed_size) {
+ scaled_array[cur_scaled].SetStart(cur_fixed + 1, 0);
+ }
+
+ // Add the size of the new cScaledBlock onto the size_left.
+
+ size_left += scaled_array[cur_scaled].GetSize();
+ }
+
+ // Move onto the next fixed block.
+ size_left -= fixed_size;
+ }
+
+ cout << "END Update() : Ran out of fixed_blocks..." << endl;
+
+ return -1;
+}
+
+
+int cBlockStruct::Compress()
+{
+ int scan_loc;
+ int write_loc = 0;
+
+ for (scan_loc = 0; scan_loc < num_scaled; scan_loc++) {
+ if (scaled_array[scan_loc].GetData()) {
+ if (scan_loc != write_loc) {
+ scaled_array[write_loc] = scaled_array[scan_loc];
+ scaled_array[scan_loc].SetData(NULL);
+ scaled_array[scan_loc].SetSize(0);
+ }
+ write_loc++;
+ }
+ }
+
+ num_scaled = write_loc;
+
+ return num_scaled;
+}
+
+void * cBlockStruct::Remove(int out_block)
+{
+ void * temp = scaled_array[out_block].GetData();
+ scaled_array[out_block].SetData(NULL);
+ return temp;
+}
Copied: trunk/source/tools/cBlockStruct.h (from rev 331, trunk/source/tools/block_struct.hh)
Copied: trunk/source/tools/cChangeList.cc (from rev 331, trunk/source/tools/change_list.cc)
===================================================================
--- trunk/source/tools/change_list.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cChangeList.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -0,0 +1,72 @@
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1993 - 2005 California Institute of Technology //
+// //
+// Read the COPYING and README files, or contact 'avida at alife.org', //
+// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
+//////////////////////////////////////////////////////////////////////////////
+
+#include "cChangeList.h"
+
+
+void cChangeList::ResizeClear(int capacity){
+ m_change_list.ResizeClear(capacity);
+ m_change_tracking.ResizeClear(capacity);
+ m_change_list.SetAll(0);
+ m_change_tracking.SetAll(false);
+ m_change_count = 0;
+}
+
+cChangeList::cChangeList(int capacity)
+: m_change_list(0)
+, m_change_tracking(0)
+, m_change_count(0)
+{ ResizeClear(capacity); }
+
+int cChangeList::GetSize() const { return m_change_list.GetSize(); }
+
+int cChangeList::GetChangeCount() const { return m_change_count; }
+
+// Note that decreasing size invalidates stored changes.
+void cChangeList::Resize(int capacity) {
+ if (capacity < m_change_list.GetSize()){
+ ResizeClear(capacity);
+ } else {
+ m_change_list.Resize(capacity);
+ m_change_tracking.Resize(capacity, false);
+ }
+}
+
+// Unsafe version : assumes index is within change count.
+int cChangeList::GetChangeAt(int index) const {
+ return m_change_list[index];
+}
+
+// Safe version : returns -1 if index is outside change count.
+int cChangeList::CheckChangeAt(int index) const {
+ return (index < m_change_count) ? ((int) GetChangeAt(index)) : (-1);
+}
+
+// Unsafe version : assumes changed_index is within capacity.
+void cChangeList::MarkChange(int changed_index) {
+ if (!m_change_tracking[changed_index]) {
+ m_change_tracking[changed_index] = true;
+ m_change_list[m_change_count] = changed_index;
+ m_change_count++;
+ }
+}
+
+// Safe version : will resize to accommodate changed_index greater
+// than capacity.
+void cChangeList::PushChange(int changed_index) {
+ if (m_change_list.GetSize() <= changed_index) {
+ Resize(changed_index + 1);
+ }
+ MarkChange(changed_index);
+}
+
+void cChangeList::Reset() {
+ for (int i = 0; i < m_change_count; i++) {
+ m_change_tracking[m_change_list[i]] = false;
+ }
+ m_change_count = 0;
+}
Copied: trunk/source/tools/cChangeList.h (from rev 331, trunk/source/tools/change_list.hh)
Copied: trunk/source/tools/cConstSchedule.cc (from rev 331, trunk/source/tools/const_schedule.cc)
===================================================================
--- trunk/source/tools/const_schedule.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cConstSchedule.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -0,0 +1,55 @@
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1993 - 2003 California Institute of Technology //
+// //
+// Read the COPYING and README files, or contact 'avida at alife.org', //
+// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
+//////////////////////////////////////////////////////////////////////////////
+
+#include "cConstSchedule.h"
+
+#include "cChangeList.h"
+#include "merit.hh"
+
+
+////////////////////
+// cConstSchedule
+////////////////////
+
+cConstSchedule::cConstSchedule(int _item_count)
+ : cSchedule(_item_count), is_active(_item_count)
+{
+ last_id = 0;
+ is_active.SetAll(false);
+}
+
+cConstSchedule::~cConstSchedule()
+{
+}
+
+bool cConstSchedule::OK()
+{
+ assert(last_id == 0 || last_id < item_count); // invalid last_id
+ return true;
+}
+
+void cConstSchedule::Adjust(int item_id, const cMerit & merit)
+{
+ if (cChangeList *change_list = GetChangeList()) {
+ change_list->MarkChange(item_id);
+ }
+ if (merit == 0.0) is_active[item_id] = false;
+ else is_active[item_id] = true;
+}
+
+
+int cConstSchedule::GetNextID()
+{
+ // Grab the next ID...
+ if (++last_id == item_count) last_id = 0;
+
+ // Make sure we actually have an active ID...
+ while (is_active[last_id] == false) {
+ if (++last_id == item_count) last_id = 0;
+ }
+ return last_id;
+}
Copied: trunk/source/tools/cConstSchedule.h (from rev 331, trunk/source/tools/const_schedule.hh)
Copied: trunk/source/tools/cCountTracker.cc (from rev 331, trunk/source/tools/count_tracker.cc)
===================================================================
--- trunk/source/tools/count_tracker.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cCountTracker.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -0,0 +1,36 @@
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1993 - 2003 California Institute of Technology //
+// //
+// Read the COPYING and README files, or contact 'avida at alife.org', //
+// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef COUNT_TRACKER_HH
+#include "cCountTracker.h"
+#endif
+
+// cCountTracker /////////////////////////////////////////////////////////////
+
+void cCountTracker::Inc()
+{
+ cur_count++;
+ total_count++;
+}
+
+void cCountTracker::Dec()
+{
+ cur_count--;
+}
+
+void cCountTracker::Next()
+{
+ last_count = cur_count;
+ cur_count = 0;
+}
+
+void cCountTracker::Clear()
+{
+ cur_count = 0;
+ last_count = 0;
+ total_count = 0;
+}
Copied: trunk/source/tools/cCountTracker.h (from rev 331, trunk/source/tools/count_tracker.hh)
Modified: trunk/source/tools/cCycleCheck.cc
===================================================================
--- trunk/source/tools/cCycleCheck.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/cCycleCheck.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -5,8 +5,8 @@
before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.
*/
-#include "cCycleCheck.hh"
-#include "cID.hh"
+#include "cCycleCheck.h"
+#include "cID.h"
#include <set>
Copied: trunk/source/tools/cCycleCheck.h (from rev 331, trunk/source/tools/cCycleCheck.hh)
Deleted: trunk/source/tools/cCycleCheck.hh
===================================================================
--- trunk/source/tools/cCycleCheck.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/cCycleCheck.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,66 +0,0 @@
-/*
-Copyright (C) 1993 - 2004 California Institute of Technology
-
-Read the COPYING and README files, or contact 'avida at alife.org',
-before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.
-*/
-
-#ifndef CYCLE_CHECK_HH
-#define CYCLE_CHECK_HH
-
-class cID;
-
-/*!
-\brief Internal class; used to prevent cycles in recursive operations on collections of classes or objects.
-
-\remarks
-This class is used internally to prevent cycles in recursive operations on collections of classes or objects; it is probably
-not well-suited for any other use.
-
-This class is (currently only) used in recursive unit-testing of classes and recursive verification of objects, to detect and
-prevent cycles in the recursion. Such classes should each have a unique identifying string, and such objects should each have
-a cID member variable. An instance of this class is carried through the process of recursive unit-testing, and as each class
-is encountered, the ckStr() member function is called with that class' identifying string; if that string has not been seen in
-the recursion then ckStr() returns \e true (and the class is unit-tested), and otherwise returns \e false. Similarly in
-recursive object-verification, each object's cID is checked by the ckID() function.
-
-This class also indicates to the testing code whether a unit-test or object-verification should be recursive; in that case
-recurse() returns \e true, and otherwise returns \e false.
-
-For more information about defining recursive unit-test suites and object-verification suites, see \ref recursiveTesting
-
-\ingroup recursiveTesting
-*/
-class cCycleCheck {
-private:
- struct cCycleCheckPrv;
-private:
- cCycleCheck(); // disabled.
-private:
- cCycleCheckPrv *m_cyck_prv;
- bool m_recurse;
-public:
- /*!\brief Returns \e true if ckStr() has not been called with string \e str as an argument. */
- bool ckStr(const char *str);
- /*!\brief Returns \e true if ckId() has not been called with identifier object \e id as an argument. */
- bool ckID(const cID &id);
- /*!\brief Returns \e true if this unit-test or object-verification should be recursive. */
- bool recurse(){ return m_recurse; }
-public:
- /*!
- \brief Constructs an object to detect cycles in recursive unit-testing and object verification.
-
- If \e recurse is \e true then the unit-test of a class will recurse into unit-tests of classes on which it depends, or the
- object verification of an object will recurse into verification of its sub-objects.
- */
- cCycleCheck(bool recurse);
- /*!
- \brief Destroys the cycle-checking object.
-
- Frees the list of classes encountered in the recursive unit-test, or the ids of objects encountered in the recursive
- verification.
- */
- ~cCycleCheck();
-};
-
-#endif
Copied: trunk/source/tools/cID.h (from rev 331, trunk/source/tools/cID.hh)
Deleted: trunk/source/tools/cID.hh
===================================================================
--- trunk/source/tools/cID.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/cID.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,43 +0,0 @@
-/*
-Copyright (C) 1993 - 2004 California Institute of Technology
-
-Read the COPYING and README files, or contact 'avida at alife.org',
-before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.
-*/
-
-#ifndef ID_HH
-#define ID_HH
-
-/*!
-\brief Provides a unique identifier for instances of a class.
-
-This class provides unique identifier objects that can be ordered for use as unique keys for elements of heterogeneous
-collections, where the types of the elements are unimportant.
-
-Instances of cID are used, for example, to detect cycles in recursive object verification, by keeping a list of cIDs of
-objects that have been verified, and which should not be later verified if they are encountered again in the recursion. In
-recursive object verification, objects of many types may be encountered, but for the purpose of preventing cycles in the
-recursion, the cID of each object is important, not its type.
-
-\note XXX : In the current implementation this is a dataless class; instances are distinguished by their addresses in memory.
-I don't know how portable this will be, but at least we have some abstraction to help find another way to order instances if
-we need to.
-*/
-class cID {
-public:
- /*!
- \brief Comparison operator, providing well-ordering for any collection of cID instances.
-
- \note XXX : Don't expect any particular order (although there is \e some well-defined order). The ordering might change if
- the current use of pointers to cID objects for their identification turns out to not work.
- */
- cID(){}
- bool operator<(const cID &rhs) const { return this < &rhs; }
- bool operator>(const cID &rhs) const { return this > &rhs; }
- bool operator<=(const cID &rhs) const { return this <= &rhs; }
- bool operator>=(const cID &rhs) const { return this >= &rhs; }
- bool operator==(const cID &rhs) const { return this == &rhs; }
- bool operator!=(const cID &rhs) const { return this != &rhs; }
-};
-
-#endif
Copied: trunk/source/tools/cVerifierSuiteRecurser.h (from rev 331, trunk/source/tools/cVerifierSuiteRecurser.hh)
===================================================================
--- trunk/source/tools/cVerifierSuiteRecurser.hh 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cVerifierSuiteRecurser.h 2005-10-06 23:54:52 UTC (rev 334)
@@ -0,0 +1,45 @@
+/*
+Copyright (C) 1993 - 2004 California Institute of Technology
+
+Read the COPYING and README files, or contact 'avida at alife.org',
+before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.
+*/
+
+#ifndef VERIFIER_SUITE_RECURSER_HH
+#define VERIFIER_SUITE_RECURSER_HH
+
+#ifndef CYCLE_CHECK_HH
+#include "cCycleCheck.h"
+#endif
+
+#ifndef TEST_CASE_H
+#include "yaktest/cTestCase.hh"
+#endif
+
+
+/*!
+\brief Internal class; base class for tVerifierSuiteRecurser.
+
+\remark This class is used internally as the superclass of tVerifierSuiteRecurser, and cannot be directly instantiated. Its
+purpose is stripping the template-argument part of a tVerifierSuiteRecurser object's type so that the type-stripped object can
+be passed to specialized instances of the tVerifierSuite template class. This class also removes code from
+tVerifierSuiteRecurser that need not be specific to tVerifierSuiteRecurser's template parameter (with the goal of reducing
+compilation time).
+
+\par See also
+tVerifierSuiteRecurser
+
+For more information about defining recursive unit-test suites and object-verification suites, see \ref recursiveTesting.
+
+\ingroup recursiveTesting
+*/
+class cVerifierSuiteRecurser : public cTestCase {
+private:
+ cVerifierSuiteRecurser(); // disabled.
+protected:
+ cVerifierSuiteRecurser(bool recurse): m_cyck(recurse) {}
+public:
+ cCycleCheck m_cyck;
+};
+
+#endif
Deleted: trunk/source/tools/cVerifierSuiteRecurser.hh
===================================================================
--- trunk/source/tools/cVerifierSuiteRecurser.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/cVerifierSuiteRecurser.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,45 +0,0 @@
-/*
-Copyright (C) 1993 - 2004 California Institute of Technology
-
-Read the COPYING and README files, or contact 'avida at alife.org',
-before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.
-*/
-
-#ifndef VERIFIER_SUITE_RECURSER_HH
-#define VERIFIER_SUITE_RECURSER_HH
-
-#ifndef CYCLE_CHECK_HH
-#include "cCycleCheck.hh"
-#endif
-
-#ifndef TEST_CASE_H
-#include "yaktest/cTestCase.hh"
-#endif
-
-
-/*!
-\brief Internal class; base class for tVerifierSuiteRecurser.
-
-\remark This class is used internally as the superclass of tVerifierSuiteRecurser, and cannot be directly instantiated. Its
-purpose is stripping the template-argument part of a tVerifierSuiteRecurser object's type so that the type-stripped object can
-be passed to specialized instances of the tVerifierSuite template class. This class also removes code from
-tVerifierSuiteRecurser that need not be specific to tVerifierSuiteRecurser's template parameter (with the goal of reducing
-compilation time).
-
-\par See also
-tVerifierSuiteRecurser
-
-For more information about defining recursive unit-test suites and object-verification suites, see \ref recursiveTesting.
-
-\ingroup recursiveTesting
-*/
-class cVerifierSuiteRecurser : public cTestCase {
-private:
- cVerifierSuiteRecurser(); // disabled.
-protected:
- cVerifierSuiteRecurser(bool recurse): m_cyck(recurse) {}
-public:
- cCycleCheck m_cyck;
-};
-
-#endif
Deleted: trunk/source/tools/change_list.cc
===================================================================
--- trunk/source/tools/change_list.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/change_list.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,72 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2005 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#include "change_list.hh"
-
-
-void cChangeList::ResizeClear(int capacity){
- m_change_list.ResizeClear(capacity);
- m_change_tracking.ResizeClear(capacity);
- m_change_list.SetAll(0);
- m_change_tracking.SetAll(false);
- m_change_count = 0;
-}
-
-cChangeList::cChangeList(int capacity)
-: m_change_list(0)
-, m_change_tracking(0)
-, m_change_count(0)
-{ ResizeClear(capacity); }
-
-int cChangeList::GetSize() const { return m_change_list.GetSize(); }
-
-int cChangeList::GetChangeCount() const { return m_change_count; }
-
-// Note that decreasing size invalidates stored changes.
-void cChangeList::Resize(int capacity) {
- if (capacity < m_change_list.GetSize()){
- ResizeClear(capacity);
- } else {
- m_change_list.Resize(capacity);
- m_change_tracking.Resize(capacity, false);
- }
-}
-
-// Unsafe version : assumes index is within change count.
-int cChangeList::GetChangeAt(int index) const {
- return m_change_list[index];
-}
-
-// Safe version : returns -1 if index is outside change count.
-int cChangeList::CheckChangeAt(int index) const {
- return (index < m_change_count) ? ((int) GetChangeAt(index)) : (-1);
-}
-
-// Unsafe version : assumes changed_index is within capacity.
-void cChangeList::MarkChange(int changed_index) {
- if (!m_change_tracking[changed_index]) {
- m_change_tracking[changed_index] = true;
- m_change_list[m_change_count] = changed_index;
- m_change_count++;
- }
-}
-
-// Safe version : will resize to accommodate changed_index greater
-// than capacity.
-void cChangeList::PushChange(int changed_index) {
- if (m_change_list.GetSize() <= changed_index) {
- Resize(changed_index + 1);
- }
- MarkChange(changed_index);
-}
-
-void cChangeList::Reset() {
- for (int i = 0; i < m_change_count; i++) {
- m_change_tracking[m_change_list[i]] = false;
- }
- m_change_count = 0;
-}
Deleted: trunk/source/tools/change_list.hh
===================================================================
--- trunk/source/tools/change_list.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/change_list.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,84 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2005 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef CHANGE_LIST_HH
-#define CHANGE_LIST_HH
-
-#ifndef TARRAY_HH
-#include "tArray.hh"
-#endif
-
-/**
- * This class provides an array of indices of changes to some list of
- * objects. Entries in the array of indices have the same order as
- * registered changes.
- **/
-
-class cChangeList {
-protected:
- /*
- Note that size of m_change_list is size of m_change_tracking, and that
- 0 <= m_change_count <= size of m_change_tracking.
- */
- // Number of changes.
- int m_change_count;
- /*
- List of changed indices. When n changes are listed, the first n
- entries of m_change_list store the indices, and the remaining entries
- are invalid.
- */
- tArray<int> m_change_list;
- // m_change_tracking[i] is true iff i is in m_change_list.
- tArray<bool> m_change_tracking;
-
-public:
- void ResizeClear(int capacity);
-
- // Constructor.
- explicit cChangeList(int capacity = 0);
-
- //// Assignment operator.
- //cChangeList & operator= (const cChangeList & rhs) {
- // m_change_list = rhs.m_change_list;
- // m_change_tracking = rhs.m_change_tracking;
- // m_change_count = rhs.m_change_count;
- //}
-
- //// Copy constructor.
- //explicit cChangeList(const cChangeList & rhs) : cChangeList(0) {
- // this->operator=(rhs);
- //}
-
- // Destructor.
- //virtual ~cChangeList(){}
-
- // Interface Methods ///////////////////////////////////////////////////////
-
- int GetSize() const;
-
- int GetChangeCount() const;
-
- // Note that decreasing size invalidates stored changes.
- void Resize(int capacity);
-
- // Unsafe version : assumes index is within change count.
- int GetChangeAt(int index) const;
-
- // Safe version : returns -1 if index is outside change count.
- int CheckChangeAt(int index) const;
-
- // Unsafe version : assumes changed_index is within capacity.
- void MarkChange(int changed_index);
-
- // Safe version : will resize to accommodate changed_index greater
- // than capacity.
- void PushChange(int changed_index);
-
- void Reset();
-};
-
-#endif
Deleted: trunk/source/tools/const_schedule.cc
===================================================================
--- trunk/source/tools/const_schedule.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/const_schedule.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,55 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#include "const_schedule.hh"
-
-#include "change_list.hh"
-#include "merit.hh"
-
-
-////////////////////
-// cConstSchedule
-////////////////////
-
-cConstSchedule::cConstSchedule(int _item_count)
- : cSchedule(_item_count), is_active(_item_count)
-{
- last_id = 0;
- is_active.SetAll(false);
-}
-
-cConstSchedule::~cConstSchedule()
-{
-}
-
-bool cConstSchedule::OK()
-{
- assert(last_id == 0 || last_id < item_count); // invalid last_id
- return true;
-}
-
-void cConstSchedule::Adjust(int item_id, const cMerit & merit)
-{
- if (cChangeList *change_list = GetChangeList()) {
- change_list->MarkChange(item_id);
- }
- if (merit == 0.0) is_active[item_id] = false;
- else is_active[item_id] = true;
-}
-
-
-int cConstSchedule::GetNextID()
-{
- // Grab the next ID...
- if (++last_id == item_count) last_id = 0;
-
- // Make sure we actually have an active ID...
- while (is_active[last_id] == false) {
- if (++last_id == item_count) last_id = 0;
- }
- return last_id;
-}
Deleted: trunk/source/tools/const_schedule.hh
===================================================================
--- trunk/source/tools/const_schedule.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/const_schedule.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,39 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef CONST_SCHEDULE_HH
-#define CONST_SCHEDULE_HH
-
-#ifndef SCHEDULE_HH
-#include "schedule.hh"
-#endif
-#ifndef TARRAY_HH
-#include "tArray.hh"
-#endif
-
-/**
- * This class rotates between all items to schedule, giving each equal time.
- **/
-
-class cMerit;
-template <class T> class tArray; // aggregate;
-
-class cConstSchedule : public cSchedule {
-private:
- int last_id;
- tArray<bool> is_active;
-public:
- cConstSchedule(int _item_count);
- ~cConstSchedule();
-
- bool OK();
- void Adjust(int item_id, const cMerit & merit);
-
- int GetNextID();
-};
-
-#endif
Deleted: trunk/source/tools/count_tracker.cc
===================================================================
--- trunk/source/tools/count_tracker.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/count_tracker.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,36 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef COUNT_TRACKER_HH
-#include "count_tracker.hh"
-#endif
-
-// cCountTracker /////////////////////////////////////////////////////////////
-
-void cCountTracker::Inc()
-{
- cur_count++;
- total_count++;
-}
-
-void cCountTracker::Dec()
-{
- cur_count--;
-}
-
-void cCountTracker::Next()
-{
- last_count = cur_count;
- cur_count = 0;
-}
-
-void cCountTracker::Clear()
-{
- cur_count = 0;
- last_count = 0;
- total_count = 0;
-}
Deleted: trunk/source/tools/count_tracker.hh
===================================================================
--- trunk/source/tools/count_tracker.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/count_tracker.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,30 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology //
-// //
-// Read the COPYING and README files, or contact 'avida at alife.org', //
-// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef COUNT_TRACKER_HH
-#define COUNT_TRACKER_HH
-
-class cCountTracker {
-private:
- int cur_count;
- int last_count;
- int total_count;
-public:
- cCountTracker() { Clear(); }
- ~cCountTracker() { ; }
-
- int GetCur() const { return cur_count; }
- int GetLast() const { return last_count; }
- int GetTotal() const { return total_count; }
-
- void Inc();
- void Dec();
- void Next();
- void Clear();
-};
-
-#endif
Modified: trunk/source/tools/integrated_schedule.cc
===================================================================
--- trunk/source/tools/integrated_schedule.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/integrated_schedule.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -7,7 +7,7 @@
#include "integrated_schedule.hh"
-#include "change_list.hh"
+#include "cChangeList.h"
#include "functions.hh"
#include "integrated_schedule_node.hh"
#include "merit.hh"
Modified: trunk/source/tools/prob_schedule.cc
===================================================================
--- trunk/source/tools/prob_schedule.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/prob_schedule.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -7,7 +7,7 @@
#include "prob_schedule.hh"
-#include "change_list.hh"
+#include "cChangeList.h"
#include "merit.hh"
#include "tools.hh"
Modified: trunk/source/tools/recursive_tests_decl_hdrs.hh
===================================================================
--- trunk/source/tools/recursive_tests_decl_hdrs.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/recursive_tests_decl_hdrs.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -50,7 +50,7 @@
#ifndef NDEBUG
#ifndef ID_HH
- #include "cID.hh"
+ #include "cID.h"
#endif
#ifndef RECURSIVE_TESTS_MACROS_HH
#include "recursive_tests_macros.hh"
Modified: trunk/source/tools/recursive_tests_defn_hdrs.hh
===================================================================
--- trunk/source/tools/recursive_tests_defn_hdrs.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/recursive_tests_defn_hdrs.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,10 +9,10 @@
#define RECURSIVE_TESTS_DEFN_HDRS_HH
#ifndef CYCLE_CHECK_HH
-#include "cCycleCheck.hh"
+#include "cCycleCheck.h"
#endif
#ifndef ID_HH
-#include "cID.hh"
+#include "cID.h"
#endif
#ifndef RECURSIVE_TESTS_MACROS_HH
#include "recursive_tests_macros.hh"
@@ -30,7 +30,7 @@
#include "tVerifierSuiteRecurser.hh"
#endif
#ifndef VERIFIER_SUITE_RECURSER_HH
-#include "cVerifierSuiteRecurser.hh"
+#include "cVerifierSuiteRecurser.h"
#endif
#ifndef TEST_CASE_H
Modified: trunk/source/tools/schedule.cc
===================================================================
--- trunk/source/tools/schedule.cc 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/schedule.cc 2005-10-06 23:54:52 UTC (rev 334)
@@ -7,7 +7,7 @@
#include "schedule.hh"
-#include "change_list.hh"
+#include "cChangeList.h"
////////////////
// cSchedule
Modified: trunk/source/tools/tUnitTestSuite.hh
===================================================================
--- trunk/source/tools/tUnitTestSuite.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/tUnitTestSuite.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#define T_UNIT_TEST_SUITE_HH
#ifndef CYCLE_CHECK_HH
-#include "cCycleCheck.hh"
+#include "cCycleCheck.h"
#endif
#ifndef TEST_CASE_H
#include "yaktest/cTestCase.hh"
Modified: trunk/source/tools/tUnitTestSuiteRecurser.hh
===================================================================
--- trunk/source/tools/tUnitTestSuiteRecurser.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/tUnitTestSuiteRecurser.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#define T_UNIT_TEST_SUITE_RECURSER_HH
#ifndef CYCLE_CHECK_HH
-#include "cCycleCheck.hh"
+#include "cCycleCheck.h"
#endif
#ifndef T_UNIT_TEST_SUITE_HH
#include "tUnitTestSuite.hh"
Modified: trunk/source/tools/tVerifierSuite.hh
===================================================================
--- trunk/source/tools/tVerifierSuite.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/tVerifierSuite.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -10,7 +10,7 @@
#endif
#ifndef VERIFIER_SUITE_RECURSER_HH
-#include "cVerifierSuiteRecurser.hh"
+#include "cVerifierSuiteRecurser.h"
#endif
/*!
Modified: trunk/source/tools/tVerifierSuiteRecurser.hh
===================================================================
--- trunk/source/tools/tVerifierSuiteRecurser.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/tVerifierSuiteRecurser.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -9,7 +9,7 @@
#define T_VERIFIER_SUITE_RECURSER_HH
#ifndef VERIFIER_SUITE_RECURSER_HH
-#include "cVerifierSuiteRecurser.hh"
+#include "cVerifierSuiteRecurser.h"
#endif
#ifndef T_VERIFIER_SUITE_HH
Modified: trunk/source/tools/tools.pri
===================================================================
--- trunk/source/tools/tools.pri 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/tools/tools.pri 2005-10-06 23:54:52 UTC (rev 334)
@@ -1,7 +1,7 @@
tools {
HEADERS += $$TOOLS_HH/indexed_block_struct.hh \
- $$TOOLS_HH/block_struct.hh \
+ $$TOOLS_HH/cBlockStruct.h \
$$TOOLS_HH/data_entry.hh \
$$TOOLS_HH/data_manager_base.hh \
$$TOOLS_HH/data_file.hh \
@@ -27,9 +27,9 @@
$$TOOLS_HH/weighted_index.hh \
$$TOOLS_HH/win32_mkdir_hack.hh
- SOURCES += $$TOOLS_CC/block_struct.cc \
- $$TOOLS_CC/const_schedule.cc \
- $$TOOLS_CC/count_tracker.cc \
+ SOURCES += $$TOOLS_CC/cBlockStruct.cc \
+ $$TOOLS_CC/cConstSchedule.cc \
+ $$TOOLS_CC/cCountTracker.cc \
$$TOOLS_CC/data_entry.cc \
$$TOOLS_CC/data_file.cc \
$$TOOLS_CC/data_file_manager.cc \
Modified: trunk/source/viewers/viewer.hh
===================================================================
--- trunk/source/viewers/viewer.hh 2005-10-06 23:30:43 UTC (rev 333)
+++ trunk/source/viewers/viewer.hh 2005-10-06 23:54:52 UTC (rev 334)
@@ -8,7 +8,7 @@
#ifndef VIEWERS_HH
#define VIEWERS_HH
-#ifndef AVIDA_HH
+#ifndef avida_h
#include "avida.h"
#endif
More information about the Avida-cvs
mailing list