[Avida-cvs] [Avida2-svn] r337 - in trunk: Avida2.xcodeproj source/bindings/Boost.Python source/cpu source/main source/testsuites/unit_testsuites source/testsuites/unit_testsuites/level_0 source/tools source/utils/hist_map source/utils/task_events source/viewers
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Thu Oct 6 18:02:36 PDT 2005
Author: brysonda
Date: 2005-10-06 21:02:35 -0400 (Thu, 06 Oct 2005)
New Revision: 337
Added:
trunk/source/tools/cFile.cc
trunk/source/tools/cFile.h
trunk/source/tools/cFixedBlock.cc
trunk/source/tools/cFixedBlock.h
trunk/source/tools/cFixedCoords.h
trunk/source/tools/cGenesis.cc
trunk/source/tools/cGenesis.h
trunk/source/tools/functions.h
Removed:
trunk/source/tools/file.cc
trunk/source/tools/file.hh
trunk/source/tools/fixed_block.cc
trunk/source/tools/fixed_block.hh
trunk/source/tools/fixed_coords.hh
trunk/source/tools/functions.hh
trunk/source/tools/genesis.cc
trunk/source/tools/genesis.hh
Modified:
trunk/Avida2.xcodeproj/project.pbxproj
trunk/source/bindings/Boost.Python/file-fixups.hh
trunk/source/bindings/Boost.Python/fixed_block.pyste
trunk/source/bindings/Boost.Python/fixed_coords.pyste
trunk/source/bindings/Boost.Python/genesis-fixups.hh
trunk/source/cpu/cHardware4Stack.cc
trunk/source/cpu/cHardwareCPU.cc
trunk/source/cpu/cHardwareSMT.cc
trunk/source/cpu/cTestCPU.cc
trunk/source/main/cAnalyzeGenotype.h
trunk/source/main/cBirthChamber.cc
trunk/source/main/cConfig.cc
trunk/source/main/cConfig.h
trunk/source/main/cGenomeUtil.cc
trunk/source/main/cInstUtil.cc
trunk/source/main/cOrganism.cc
trunk/source/main/cPopulation.cc
trunk/source/main/cSpatialResCount.cc
trunk/source/main/cSpecies.cc
trunk/source/main/cStats.cc
trunk/source/main/cStats.h
trunk/source/testsuites/unit_testsuites/file.t.cc
trunk/source/testsuites/unit_testsuites/fixed_coords.t.cc
trunk/source/testsuites/unit_testsuites/functions.t.cc
trunk/source/testsuites/unit_testsuites/genesis.t.cc
trunk/source/testsuites/unit_testsuites/level_0/fixed_block.t.cc
trunk/source/tools/CMakeLists.txt
trunk/source/tools/cBlockStruct.h
trunk/source/tools/histogram.cc
trunk/source/tools/indexed_block_struct.hh
trunk/source/tools/init_file.hh
trunk/source/tools/integrated_schedule.cc
trunk/source/tools/ref_block.hh
trunk/source/tools/scaled_block.hh
trunk/source/tools/string_list.cc
trunk/source/tools/string_util.cc
trunk/source/tools/tools.pri
trunk/source/utils/hist_map/Makefile
trunk/source/utils/hist_map/hist_map.cc
trunk/source/utils/hist_map/hist_map2.cc
trunk/source/utils/task_events/task_event_gen.cc
trunk/source/utils/task_events/task_event_gen.old.cc
trunk/source/viewers/zoom_screen.cc
Log:
Rename tools/f*, tools/g*
Modified: trunk/Avida2.xcodeproj/project.pbxproj
===================================================================
--- trunk/Avida2.xcodeproj/project.pbxproj 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/Avida2.xcodeproj/project.pbxproj 2005-10-07 01:02:35 UTC (rev 337)
@@ -11,9 +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 */; };
- 700E2B4F085DE50C00CF158A /* file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155C076253A4008F7A48 /* file.cc */; };
- 700E2B50085DE50C00CF158A /* fixed_block.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155E076253A4008F7A48 /* fixed_block.cc */; };
- 700E2B51085DE50C00CF158A /* genesis.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31562076253A4008F7A48 /* genesis.cc */; };
700E2B52085DE50C00CF158A /* help_alias.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31564076253A4008F7A48 /* help_alias.cc */; };
700E2B53085DE50C00CF158A /* help_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31568076253A4008F7A48 /* help_manager.cc */; };
700E2B54085DE50C00CF158A /* help_type.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3156A076253A4008F7A48 /* help_type.cc */; };
@@ -178,6 +175,10 @@
70B0885D08F5FE5800FC65FE /* cDataManager_Base.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0885108F5FE5800FC65FE /* cDataManager_Base.cc */; };
70B0885E08F5FE5800FC65FE /* cDefaultMessageDisplay.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0885208F5FE5800FC65FE /* cDefaultMessageDisplay.cc */; };
70B0885F08F5FE5800FC65FE /* cDoubleSum.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0885308F5FE5800FC65FE /* cDoubleSum.cc */; };
+ 70B0888508F603D400FC65FE /* cFile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0888308F603D400FC65FE /* cFile.cc */; };
+ 70B0888608F603D400FC65FE /* cGenesis.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0888408F603D400FC65FE /* cGenesis.cc */; };
+ 70B0888708F603D400FC65FE /* cFile.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0888308F603D400FC65FE /* cFile.cc */; };
+ 70B0888808F603D400FC65FE /* cGenesis.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0888408F603D400FC65FE /* cGenesis.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 */; };
@@ -262,9 +263,6 @@
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 */; };
- DCC316C407628753008F7A48 /* file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155C076253A4008F7A48 /* file.cc */; };
- DCC316C507628754008F7A48 /* fixed_block.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155E076253A4008F7A48 /* fixed_block.cc */; };
- DCC316C607628755008F7A48 /* genesis.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31562076253A4008F7A48 /* genesis.cc */; };
DCC316C707628757008F7A48 /* help_alias.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31564076253A4008F7A48 /* help_alias.cc */; };
DCC316C807628758008F7A48 /* help_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31568076253A4008F7A48 /* help_manager.cc */; };
DCC316C90762875A008F7A48 /* help_type.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3156A076253A4008F7A48 /* help_type.cc */; };
@@ -495,6 +493,14 @@
70B0885108F5FE5800FC65FE /* cDataManager_Base.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cDataManager_Base.cc; sourceTree = "<group>"; };
70B0885208F5FE5800FC65FE /* cDefaultMessageDisplay.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cDefaultMessageDisplay.cc; sourceTree = "<group>"; };
70B0885308F5FE5800FC65FE /* cDoubleSum.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cDoubleSum.cc; sourceTree = "<group>"; };
+ 70B0887D08F603C600FC65FE /* cFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cFile.h; sourceTree = "<group>"; };
+ 70B0887E08F603C600FC65FE /* cFixedBlock.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cFixedBlock.cc; sourceTree = "<group>"; };
+ 70B0887F08F603C600FC65FE /* cFixedBlock.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cFixedBlock.h; sourceTree = "<group>"; };
+ 70B0888008F603C600FC65FE /* cFixedCoords.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cFixedCoords.h; sourceTree = "<group>"; };
+ 70B0888108F603C600FC65FE /* cGenesis.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cGenesis.h; sourceTree = "<group>"; };
+ 70B0888208F603C600FC65FE /* functions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = functions.h; sourceTree = "<group>"; };
+ 70B0888308F603D400FC65FE /* cFile.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cFile.cc; sourceTree = "<group>"; };
+ 70B0888408F603D400FC65FE /* cGenesis.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cGenesis.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>"; };
@@ -1294,14 +1300,6 @@
DCC314D7076253A2008F7A48 /* text_test_interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = text_test_interpreter.h; sourceTree = "<group>"; };
DCC31547076253A4008F7A48 /* cCycleCheck.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCycleCheck.cc; sourceTree = "<group>"; };
DCC3154A076253A4008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
- DCC3155C076253A4008F7A48 /* file.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = file.cc; sourceTree = "<group>"; };
- DCC3155D076253A4008F7A48 /* file.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = file.hh; sourceTree = "<group>"; };
- DCC3155E076253A4008F7A48 /* fixed_block.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fixed_block.cc; sourceTree = "<group>"; };
- DCC3155F076253A4008F7A48 /* fixed_block.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = fixed_block.hh; sourceTree = "<group>"; };
- DCC31560076253A4008F7A48 /* fixed_coords.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = fixed_coords.hh; sourceTree = "<group>"; };
- DCC31561076253A4008F7A48 /* functions.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = functions.hh; sourceTree = "<group>"; };
- DCC31562076253A4008F7A48 /* genesis.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genesis.cc; sourceTree = "<group>"; };
- DCC31563076253A4008F7A48 /* genesis.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genesis.hh; sourceTree = "<group>"; };
DCC31564076253A4008F7A48 /* help_alias.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_alias.cc; sourceTree = "<group>"; };
DCC31565076253A4008F7A48 /* help_alias.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_alias.hh; sourceTree = "<group>"; };
DCC31566076253A4008F7A48 /* help_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_entry.hh; sourceTree = "<group>"; };
@@ -2715,6 +2713,14 @@
DCC314D8076253A2008F7A48 /* tools */ = {
isa = PBXGroup;
children = (
+ 70B0888308F603D400FC65FE /* cFile.cc */,
+ 70B0888408F603D400FC65FE /* cGenesis.cc */,
+ 70B0887D08F603C600FC65FE /* cFile.h */,
+ 70B0887E08F603C600FC65FE /* cFixedBlock.cc */,
+ 70B0887F08F603C600FC65FE /* cFixedBlock.h */,
+ 70B0888008F603C600FC65FE /* cFixedCoords.h */,
+ 70B0888108F603C600FC65FE /* cGenesis.h */,
+ 70B0888208F603C600FC65FE /* functions.h */,
70B0884E08F5FE5800FC65FE /* cDataEntry.cc */,
70B0884F08F5FE5800FC65FE /* cDataFile.cc */,
70B0885008F5FE5800FC65FE /* cDataFileManager.cc */,
@@ -2741,14 +2747,6 @@
70FB868608BFA02D00BDF589 /* tHashTable.hh */,
DCC31547076253A4008F7A48 /* cCycleCheck.cc */,
DCC3154A076253A4008F7A48 /* CMakeLists.txt */,
- DCC3155C076253A4008F7A48 /* file.cc */,
- DCC3155D076253A4008F7A48 /* file.hh */,
- DCC3155E076253A4008F7A48 /* fixed_block.cc */,
- DCC3155F076253A4008F7A48 /* fixed_block.hh */,
- DCC31560076253A4008F7A48 /* fixed_coords.hh */,
- DCC31561076253A4008F7A48 /* functions.hh */,
- DCC31562076253A4008F7A48 /* genesis.cc */,
- DCC31563076253A4008F7A48 /* genesis.hh */,
DCC31564076253A4008F7A48 /* help_alias.cc */,
DCC31565076253A4008F7A48 /* help_alias.hh */,
DCC31566076253A4008F7A48 /* help_entry.hh */,
@@ -3030,9 +3028,6 @@
700E2AF8085DE50C00CF158A /* avida.cc in Sources */,
700E2B43085DE50C00CF158A /* weighted_index.cc in Sources */,
700E2B44085DE50C00CF158A /* tools.cc in Sources */,
- 700E2B4F085DE50C00CF158A /* file.cc in Sources */,
- 700E2B50085DE50C00CF158A /* fixed_block.cc in Sources */,
- 700E2B51085DE50C00CF158A /* genesis.cc in Sources */,
700E2B52085DE50C00CF158A /* help_alias.cc in Sources */,
700E2B53085DE50C00CF158A /* help_manager.cc in Sources */,
700E2B54085DE50C00CF158A /* help_type.cc in Sources */,
@@ -3156,6 +3151,8 @@
70B0885D08F5FE5800FC65FE /* cDataManager_Base.cc in Sources */,
70B0885E08F5FE5800FC65FE /* cDefaultMessageDisplay.cc in Sources */,
70B0885F08F5FE5800FC65FE /* cDoubleSum.cc in Sources */,
+ 70B0888708F603D400FC65FE /* cFile.cc in Sources */,
+ 70B0888808F603D400FC65FE /* cGenesis.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3166,9 +3163,6 @@
DCC3166107628531008F7A48 /* avida.cc in Sources */,
DCC316B807628742008F7A48 /* weighted_index.cc in Sources */,
DCC316B907628744008F7A48 /* tools.cc in Sources */,
- DCC316C407628753008F7A48 /* file.cc in Sources */,
- DCC316C507628754008F7A48 /* fixed_block.cc in Sources */,
- DCC316C607628755008F7A48 /* genesis.cc in Sources */,
DCC316C707628757008F7A48 /* help_alias.cc in Sources */,
DCC316C807628758008F7A48 /* help_manager.cc in Sources */,
DCC316C90762875A008F7A48 /* help_type.cc in Sources */,
@@ -3282,6 +3276,8 @@
70B0885708F5FE5800FC65FE /* cDataManager_Base.cc in Sources */,
70B0885808F5FE5800FC65FE /* cDefaultMessageDisplay.cc in Sources */,
70B0885908F5FE5800FC65FE /* cDoubleSum.cc in Sources */,
+ 70B0888508F603D400FC65FE /* cFile.cc in Sources */,
+ 70B0888608F603D400FC65FE /* cGenesis.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/source/bindings/Boost.Python/file-fixups.hh
===================================================================
--- trunk/source/bindings/Boost.Python/file-fixups.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/bindings/Boost.Python/file-fixups.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -2,7 +2,7 @@
#define FILE_FIXUPS_HH
#ifndef FILE_HH
-#include "file.hh"
+#include "cFile.h"
#endif
#ifndef STRING_HH
#include "string.hh"
Modified: trunk/source/bindings/Boost.Python/fixed_block.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/fixed_block.pyste 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/bindings/Boost.Python/fixed_block.pyste 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,4 +1,4 @@
-cFixedBlock = Class("cFixedBlock", "fixed_block.hh")
+cFixedBlock = Class("cFixedBlock", "cFixedBlock.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/fixed_coords.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/fixed_coords.pyste 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/bindings/Boost.Python/fixed_coords.pyste 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,4 +1,4 @@
-cFixedCoords = Class("cFixedCoords", "fixed_coords.hh")
+cFixedCoords = Class("cFixedCoords", "cFixedCoords.h")
# vim: set ft=python:
Modified: trunk/source/bindings/Boost.Python/genesis-fixups.hh
===================================================================
--- trunk/source/bindings/Boost.Python/genesis-fixups.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/bindings/Boost.Python/genesis-fixups.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -2,7 +2,7 @@
#define GENESIS_FIXUPS_HH
#ifndef GENESIS_HH
-#include "genesis.hh"
+#include "cGenesis.h"
#endif
#ifndef STRING_HH
#include "string.hh"
Modified: trunk/source/cpu/cHardware4Stack.cc
===================================================================
--- trunk/source/cpu/cHardware4Stack.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/cpu/cHardware4Stack.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -11,7 +11,7 @@
#include "cConfig.h"
#include "cCPUTestInfo.h"
-#include "functions.hh"
+#include "functions.h"
#include "cGenomeUtil.h"
#include "cInstLibBase.h"
#include "cInstSet.h"
Modified: trunk/source/cpu/cHardwareCPU.cc
===================================================================
--- trunk/source/cpu/cHardwareCPU.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/cpu/cHardwareCPU.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,7 +9,7 @@
#include "cConfig.h"
#include "cCPUTestInfo.h"
-#include "functions.hh"
+#include "functions.h"
#include "cGenomeUtil.h"
#include "cGenotype.h"
#include "cHardwareTracer.h"
Modified: trunk/source/cpu/cHardwareSMT.cc
===================================================================
--- trunk/source/cpu/cHardwareSMT.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/cpu/cHardwareSMT.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -11,7 +11,7 @@
#include "cConfig.h"
#include "cCPUTestInfo.h"
-#include "functions.hh"
+#include "functions.h"
#include "cGenomeUtil.h"
#include "cInstLibBase.h"
#include "cInstSet.h"
Modified: trunk/source/cpu/cTestCPU.cc
===================================================================
--- trunk/source/cpu/cTestCPU.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/cpu/cTestCPU.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -10,7 +10,7 @@
#include "cCPUTestInfo.h"
#include "cConfig.h"
#include "cEnvironment.h"
-#include "functions.hh"
+#include "functions.h"
#include "cHardwareBase.h"
#include "cHardwareStatusPrinter.h"
#include "cInstSet.h"
Modified: trunk/source/main/cAnalyzeGenotype.h
===================================================================
--- trunk/source/main/cAnalyzeGenotype.h 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cAnalyzeGenotype.h 2005-10-07 01:02:35 UTC (rev 337)
@@ -11,7 +11,7 @@
#include <fstream>
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
#ifndef GENOME_HH
#include "cGenome.h"
Modified: trunk/source/main/cBirthChamber.cc
===================================================================
--- trunk/source/main/cBirthChamber.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cBirthChamber.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -16,7 +16,7 @@
#include "cConfig.h"
#endif
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
#ifndef GENEBANK_HH
#include "cGenebank.h"
Modified: trunk/source/main/cConfig.cc
===================================================================
--- trunk/source/main/cConfig.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cConfig.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,7 +9,7 @@
#include "defs.hh"
#include "cEventFactoryManager.h"
-#include "genesis.hh"
+#include "cGenesis.h"
#include "cPopulationEventFactory.h"
#include "tools.hh"
Modified: trunk/source/main/cConfig.h
===================================================================
--- trunk/source/main/cConfig.h 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cConfig.h 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,7 +9,7 @@
#define CONFIG_HH
#ifndef GENESIS_HH
-#include "genesis.hh"
+#include "cGenesis.h"
#endif
#ifndef STRING_LIST_HH
#include "string_list.hh"
Modified: trunk/source/main/cGenomeUtil.cc
===================================================================
--- trunk/source/main/cGenomeUtil.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cGenomeUtil.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -7,7 +7,7 @@
#include "cGenomeUtil.h"
-#include "functions.hh"
+#include "functions.h"
#include "cGenome.h"
Modified: trunk/source/main/cInstUtil.cc
===================================================================
--- trunk/source/main/cInstUtil.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cInstUtil.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -8,7 +8,7 @@
#include "cInstUtil.h"
#include "string.hh"
-#include "file.hh"
+#include "cFile.h"
#ifndef INIT_FILE_HH
#include "init_file.hh"
Modified: trunk/source/main/cOrganism.cc
===================================================================
--- trunk/source/main/cOrganism.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cOrganism.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -10,7 +10,7 @@
#include "cConfig.h"
#include "nHardware.h"
#include "cEnvironment.h"
-#include "functions.hh"
+#include "functions.h"
#include "cGenome.h"
#include "cGenomeUtil.h"
#include "cHardwareBase.h"
Modified: trunk/source/main/cPopulation.cc
===================================================================
--- trunk/source/main/cPopulation.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cPopulation.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -12,7 +12,7 @@
#include "cConstSchedule.h"
#include "cDataFile.h"
#include "cEnvironment.h"
-#include "functions.hh"
+#include "functions.h"
#include "cGenebank.h"
#include "cGenomeUtil.h"
#include "cGenotype.h"
Modified: trunk/source/main/cSpatialResCount.cc
===================================================================
--- trunk/source/main/cSpatialResCount.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cSpatialResCount.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -13,7 +13,7 @@
#include "cConfig.h"
#endif
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
cSpatialResCount::cSpatialResCount(int inworld_x, int inworld_y,
Modified: trunk/source/main/cSpecies.cc
===================================================================
--- trunk/source/main/cSpecies.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cSpecies.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -13,7 +13,7 @@
#include "cCPUTestInfo.h"
#endif
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
#ifndef GENOTYPE_HH
#include "cGenotype.h"
Modified: trunk/source/main/cStats.cc
===================================================================
--- trunk/source/main/cStats.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cStats.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,7 +9,7 @@
#include "cConfig.h"
#include "cDataFile.h"
-#include "functions.hh"
+#include "functions.h"
#include "string_util.hh"
#include "tDataEntry.hh"
Modified: trunk/source/main/cStats.h
===================================================================
--- trunk/source/main/cStats.h 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/main/cStats.h 2005-10-07 01:02:35 UTC (rev 337)
@@ -22,7 +22,7 @@
#include "cDoubleSum.h"
#endif
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
#ifndef INT_SUM_HH
#include "int_sum.hh"
Modified: trunk/source/testsuites/unit_testsuites/file.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/file.t.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/testsuites/unit_testsuites/file.t.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,7 +1,7 @@
#include <iostream>
#ifndef FILE_HH
-#include "file.hh"
+#include "cFile.h"
#endif
#ifndef TEST_CASE_H
#include "third-party/yaktest/cTestCase.hh"
Modified: trunk/source/testsuites/unit_testsuites/fixed_coords.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/fixed_coords.t.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/testsuites/unit_testsuites/fixed_coords.t.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,7 +1,7 @@
#include <iostream>
#ifndef FIXED_COORDS_HH
-#include "fixed_coords.hh"
+#include "cFixedCoords.h"
#endif
#ifndef TEST_CASE_H
#include "third-party/yaktest/cTestCase.hh"
Modified: trunk/source/testsuites/unit_testsuites/functions.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/functions.t.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/testsuites/unit_testsuites/functions.t.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,7 +1,7 @@
#include <iostream>
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
#ifndef TEST_CASE_H
#include "third-party/yaktest/cTestCase.hh"
Modified: trunk/source/testsuites/unit_testsuites/genesis.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/genesis.t.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/testsuites/unit_testsuites/genesis.t.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,7 +1,7 @@
#include <iostream>
#ifndef GENESIS_HH
-#include "genesis.hh"
+#include "cGenesis.h"
#endif
#ifndef TEST_CASE_H
#include "third-party/yaktest/cTestCase.hh"
Modified: trunk/source/testsuites/unit_testsuites/level_0/fixed_block.t.cc
===================================================================
--- trunk/source/testsuites/unit_testsuites/level_0/fixed_block.t.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/testsuites/unit_testsuites/level_0/fixed_block.t.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,5 +1,5 @@
#ifndef FIXED_BLOCK_HH
-#include "fixed_block.hh"
+#include "cFixedBlock.h"
#endif
#ifndef TEST_CASE_H
Modified: trunk/source/tools/CMakeLists.txt
===================================================================
--- trunk/source/tools/CMakeLists.txt 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/CMakeLists.txt 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,9 +9,9 @@
cDataManager_Base.cc
cDefaultMessageDisplay.cc
cDoubleSum.cc
- file.cc
- fixed_block.cc
- genesis.cc
+ cFile.cc
+ cFixedBlock.cc
+ cGenesis.cc
help_alias.cc
help_manager.cc
help_type.cc
Modified: trunk/source/tools/cBlockStruct.h
===================================================================
--- trunk/source/tools/cBlockStruct.h 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/cBlockStruct.h 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,10 +9,10 @@
#define BLOCK_STRUCT_HH
#ifndef FIXEDBLOCK_HH
-#include "fixed_block.hh"
+#include "cFixedBlock.h"
#endif
#ifndef FIXEDCOORDS_HH
-#include "fixed_coords.hh"
+#include "cFixedCoords.h"
#endif
#ifndef SCALED_BLOCK_HH
#include "scaled_block.hh"
Copied: trunk/source/tools/cFile.cc (from rev 331, trunk/source/tools/file.cc)
===================================================================
--- trunk/source/tools/file.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cFile.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -0,0 +1,116 @@
+//////////////////////////////////////////////////////////////////////////////
+// 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 FILE_HH
+#include "cFile.h"
+#endif
+
+#ifndef INIT_FILE_HH
+#include "init_file.hh"
+#endif
+#ifndef GENESIS_HH
+#include "cGenesis.h"
+#endif
+#ifndef STRING_ITERATOR_HH
+#include "string_iterator.hh"
+#endif
+
+#ifndef TOOLS_HH
+#include "tools.hh" // for g_debug global
+#endif
+
+#include <iostream>
+
+extern "C" {
+#include <stdlib.h>
+#include <errno.h> // needed for FOPEN error constants (MSVC)
+}
+
+
+using namespace std;
+
+
+////////////
+// cFile
+////////////
+
+
+
+//bool cFile::Open(cString _fname, int flags)
+// porting to gcc 3.1 -- k
+bool cFile::Open(cString _fname, ios::openmode flags)
+{
+ if( IsOpen() ) Close(); // If a file is already open, clost it first.
+ fp.open(_fname(), flags); // Open the new file.
+
+ // Test if there was an error, and if so, try again!
+ int err_id = fp.fail();
+ if( err_id ){
+ fp.clear();
+ fp.open(_fname(), flags);
+ }
+
+ // If there is still an error, determine its type and report it.
+ err_id = fp.fail();
+ if (err_id){
+ cString error_desc = "?? Unknown Error??";
+
+ // See if we can determine a more exact error type.
+ if (err_id == EACCES) error_desc = "Access denied";
+ else if (err_id == EINVAL) error_desc = "Invalid open flag or access mode";
+ else if (err_id == ENOENT) error_desc = "File or path not found";
+
+ // Print the error.
+ cerr << "Unable to open file '" << _fname
+ << "' : " << error_desc << endl;
+ return false;
+ }
+
+ filename = _fname;
+ is_open = true;
+
+ // Return true only if there were no problems...
+ return( fp.good() && !fp.fail() );
+}
+
+bool cFile::Close()
+{
+ if (is_open == true) {
+ fp.close();
+ return true;
+ }
+ return false;
+}
+
+bool cFile::ReadLine(cString & in_string)
+{
+ char cur_line[MAX_STRING_LENGTH];
+ cur_line[0]='\0';
+ fp.getline(cur_line, MAX_STRING_LENGTH);
+ if( fp.bad() ){
+ return false;
+ }
+ in_string = cur_line;
+ return true;
+}
+
+/*
+int cFile::CountLines()
+{
+ char cur_line[MAX_STRING_LENGTH];
+
+ Rewind();
+ int n_lines = -1;
+
+ do{
+ fp.getline(cur_line, MAX_STRING_LENGTH);
+ n_lines++;
+ } while( cur_line[0]!='\0' && !fp.eof() );
+
+ return n_lines;
+}
+*/
Copied: trunk/source/tools/cFile.h (from rev 331, trunk/source/tools/file.hh)
Copied: trunk/source/tools/cFixedBlock.cc (from rev 331, trunk/source/tools/fixed_block.cc)
===================================================================
--- trunk/source/tools/fixed_block.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cFixedBlock.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -0,0 +1,24 @@
+//////////////////////////////////////////////////////////////////////////////
+// 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 FIXED_BLOCK_HH
+#include "cFixedBlock.h"
+#endif
+
+////////////////////
+// cFixedBlock
+////////////////////
+
+cFixedBlock::cFixedBlock()
+{
+ start_point = 0;
+}
+
+cFixedBlock::~cFixedBlock()
+{
+}
+
Copied: trunk/source/tools/cFixedBlock.h (from rev 331, trunk/source/tools/fixed_block.hh)
Copied: trunk/source/tools/cFixedCoords.h (from rev 331, trunk/source/tools/fixed_coords.hh)
Copied: trunk/source/tools/cGenesis.cc (from rev 331, trunk/source/tools/genesis.cc)
===================================================================
--- trunk/source/tools/genesis.cc 2005-10-05 23:40:31 UTC (rev 331)
+++ trunk/source/tools/cGenesis.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -0,0 +1,97 @@
+//////////////////////////////////////////////////////////////////////////////
+// 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 GENESIS_HH
+#include "cGenesis.h"
+#endif
+
+using namespace std;
+
+/////////////////
+// cGenesis
+/////////////////
+
+cGenesis::cGenesis()
+{
+}
+
+cGenesis::cGenesis(const cString & in_filename) : cInitFile(in_filename)
+{
+ if( !IsOpen() ){
+ cerr<<"Failed to open '" << in_filename << "' file!!!\n" << endl;
+ }
+
+ Load();
+ Compress();
+ Close();
+}
+
+//int cGenesis::Open(cString _filename, int mode)
+// porting to gcc 3.1 -- k
+int cGenesis::Open(cString _filename, ios::openmode mode)
+{
+ if( IsOpen() ){
+ cerr << "Trying to reopen '" << _filename << "' file!!!\n" << endl;
+ return 0;
+ }
+
+ int base_ret = cFile::Open(_filename, mode);
+
+ if (IsOpen() == false) return base_ret; // Failed to open!
+
+ Load();
+ Compress();
+ Close();
+
+ return base_ret;
+}
+
+void cGenesis::AddInput(const cString & in_name, int in_value)
+{
+ cString in_string;
+ in_string.Set("%s %d", in_name(), in_value);
+ AddLine(in_string);
+}
+
+void cGenesis::AddInput(const cString & in_name, const cString & in_value)
+{
+ cString in_string;
+ in_string.Set("%s %s", in_name(), in_value());
+ AddLine(in_string);
+}
+
+int cGenesis::ReadInt(const cString & name, int base, bool warn) const
+{
+ if (name == "" || IsOpen() == false) return base;
+ cString cur_line;
+
+ if (!Find(cur_line, name, 0)) {
+ if (verbose == true && warn == true) {
+ cout << "Warning: " << name << " not in \"" << GetFilename()
+ << "\", defaulting to: " << base <<endl;
+ }
+ return base;
+ }
+
+ return cur_line.GetWord(1).AsInt();
+}
+
+double cGenesis::ReadFloat(const cString & name, float base, bool warn) const
+{
+ if (name == "" || IsOpen() == false) return base;
+ cString cur_line;
+
+ if (!Find(cur_line, name, 0)) {
+ if (verbose == true && warn == true) {
+ cout << "Warning: " << name << " not in \"" << GetFilename()
+ << "\", defaulting to: " << base <<endl;
+ }
+ return base;
+ }
+
+ return cur_line.GetWord(1).AsDouble();
+}
Copied: trunk/source/tools/cGenesis.h (from rev 331, trunk/source/tools/genesis.hh)
Deleted: trunk/source/tools/file.cc
===================================================================
--- trunk/source/tools/file.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/file.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,116 +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 FILE_HH
-#include "file.hh"
-#endif
-
-#ifndef INIT_FILE_HH
-#include "init_file.hh"
-#endif
-#ifndef GENESIS_HH
-#include "genesis.hh"
-#endif
-#ifndef STRING_ITERATOR_HH
-#include "string_iterator.hh"
-#endif
-
-#ifndef TOOLS_HH
-#include "tools.hh" // for g_debug global
-#endif
-
-#include <iostream>
-
-extern "C" {
-#include <stdlib.h>
-#include <errno.h> // needed for FOPEN error constants (MSVC)
-}
-
-
-using namespace std;
-
-
-////////////
-// cFile
-////////////
-
-
-
-//bool cFile::Open(cString _fname, int flags)
-// porting to gcc 3.1 -- k
-bool cFile::Open(cString _fname, ios::openmode flags)
-{
- if( IsOpen() ) Close(); // If a file is already open, clost it first.
- fp.open(_fname(), flags); // Open the new file.
-
- // Test if there was an error, and if so, try again!
- int err_id = fp.fail();
- if( err_id ){
- fp.clear();
- fp.open(_fname(), flags);
- }
-
- // If there is still an error, determine its type and report it.
- err_id = fp.fail();
- if (err_id){
- cString error_desc = "?? Unknown Error??";
-
- // See if we can determine a more exact error type.
- if (err_id == EACCES) error_desc = "Access denied";
- else if (err_id == EINVAL) error_desc = "Invalid open flag or access mode";
- else if (err_id == ENOENT) error_desc = "File or path not found";
-
- // Print the error.
- cerr << "Unable to open file '" << _fname
- << "' : " << error_desc << endl;
- return false;
- }
-
- filename = _fname;
- is_open = true;
-
- // Return true only if there were no problems...
- return( fp.good() && !fp.fail() );
-}
-
-bool cFile::Close()
-{
- if (is_open == true) {
- fp.close();
- return true;
- }
- return false;
-}
-
-bool cFile::ReadLine(cString & in_string)
-{
- char cur_line[MAX_STRING_LENGTH];
- cur_line[0]='\0';
- fp.getline(cur_line, MAX_STRING_LENGTH);
- if( fp.bad() ){
- return false;
- }
- in_string = cur_line;
- return true;
-}
-
-/*
-int cFile::CountLines()
-{
- char cur_line[MAX_STRING_LENGTH];
-
- Rewind();
- int n_lines = -1;
-
- do{
- fp.getline(cur_line, MAX_STRING_LENGTH);
- n_lines++;
- } while( cur_line[0]!='\0' && !fp.eof() );
-
- return n_lines;
-}
-*/
Deleted: trunk/source/tools/file.hh
===================================================================
--- trunk/source/tools/file.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/file.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,90 +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 FILE_HH
-#define FILE_HH
-
-#include <fstream>
-
-#ifndef STRING_HH
-#include "string.hh"
-#endif
-
-/**
- * This class encapsulates file handling. In comparison to @ref cDataFile
- * it has somewhat different features. It is more intended for reading files.
- * In particular, by default it does not create a file that doesn't exist.
- * Its main usage is for the class @ref cInitFile.
- **/
-
-class cString; // aggregate
-
-class cFile {
-private:
- cFile(const cFile &);
-protected:
- std::fstream fp;
- cString filename;
- bool is_open; // Have we successfully opened this file?
- bool verbose; // Should file be verbose about warnings to users?
-public:
- /**
- * The empty constructor does nothing.
- **/
- cFile() : filename(""), is_open(false), verbose(false) { ; }
-
- /**
- * This constructor opens a file of the given name.
- *
- * @param _filename The name of the file to open.
- **/
- cFile(cString _filename) : filename(""), is_open(false) { Open(_filename); }
-
- /**
- * The desctructor automatically closes the file.
- **/
- ~cFile() { if (is_open == true) fp.close(); filename = ""; }
-
- /**
- * @return The name of the file currently open.
- **/
- const cString & GetFilename() const { return filename; }
-
- /**
- * Open a file of the given name. If another file was open previously,
- * close that one first.
- *
- * @return 0 if something went wrong, and 1 otherwise.
- * @param _filename The name of the file to open.
- * @param mode The opening mode.
- **/
- //bool Open(cString _filename, int mode=(ios::in|ios::nocreate));
- // nocreate is no longer in the class ios -- k
- bool Open(cString _filename, std::ios::openmode mode=(std::ios::in));
-
- /**
- * Close the currently open file.
- **/
- bool Close();
-
- /**
- * Reads the next line in the file.
- **/
- bool ReadLine(cString & in_string);
-
- // Tests
- bool IsOpen() const { return is_open; }
- bool Fail() const { return (fp.fail()); }
- bool Good() const { return (fp.good()); }
- bool Eof() const { return (fp.eof()); }
- // int AtStart();
- // int AtEnd();
-
- void SetVerbose(bool _v=true) { verbose = _v; }
-};
-
-#endif
Deleted: trunk/source/tools/fixed_block.cc
===================================================================
--- trunk/source/tools/fixed_block.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/fixed_block.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,24 +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 FIXED_BLOCK_HH
-#include "fixed_block.hh"
-#endif
-
-////////////////////
-// cFixedBlock
-////////////////////
-
-cFixedBlock::cFixedBlock()
-{
- start_point = 0;
-}
-
-cFixedBlock::~cFixedBlock()
-{
-}
-
Deleted: trunk/source/tools/fixed_block.hh
===================================================================
--- trunk/source/tools/fixed_block.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/fixed_block.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,26 +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 FIXED_BLOCK_HH
-#define FIXED_BLOCK_HH
-
-/**
- * Class used by @ref cBlockStruct.
- **/
-
-class cFixedBlock {
-private:
- int start_point; // Starting point in the cScaledBlock array.
-public:
- cFixedBlock();
- ~cFixedBlock();
-
- inline int GetStart() { return start_point; }
- inline void SetStart(int in_sp) { start_point = in_sp; }
-};
-
-#endif
Deleted: trunk/source/tools/fixed_coords.hh
===================================================================
--- trunk/source/tools/fixed_coords.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/fixed_coords.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,88 +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 FIXED_COORDS_HH
-#define FIXED_COORDS_HH
-
-#ifndef UINT_HH
-#include "uint.hh"
-#endif
-
-/**
- * Class used by @ref cBlockStruct.
- *
- * It handles co-ordinates in terms of block number
- * and offset.
- **/
-
-class cUInt; // aggregate
-
-class cFixedCoords {
-private:
- int block_num;
- int offset;
-public:
- inline cFixedCoords() {
- block_num = 0;
- offset = 0;
- }
- inline cFixedCoords(int in_block, int in_offset) {
- block_num = in_block;
- offset = in_offset;
- }
-
- inline int GetBlockNum() const { return block_num; }
- inline int GetOffset() const { return offset; }
-
- inline cUInt AsCUInt(int in_fixed_size) const {
- cUInt temp;
- temp = block_num * in_fixed_size + offset;
- return temp;
- }
-
- inline void operator()(int in_block, int in_offset) {
- block_num = in_block;
- offset = in_offset;
- }
- inline void operator=(const cFixedCoords & in_coords) {
- block_num = in_coords.GetBlockNum();
- offset = in_coords.GetOffset();
- }
- inline int operator<(const cFixedCoords & in_coords) const {
- return ((block_num < in_coords.block_num) ||
- (block_num == in_coords.block_num && offset < in_coords.offset));
- }
- inline int operator<=(const cFixedCoords & in_coords) const {
- return ((block_num < in_coords.block_num) ||
- (block_num == in_coords.block_num && offset <= in_coords.offset));
- }
- inline int operator>(const cFixedCoords & in_coords) const {
- return !operator<=(in_coords);
- }
- inline int operator>=(const cFixedCoords & in_coords) const {
- return !operator<(in_coords);
- }
- inline int operator==(const cFixedCoords & in_coords) const {
- return (block_num == in_coords.GetBlockNum() &&
- offset == in_coords.GetOffset());
- }
-
- inline void Add(cFixedCoords & other_coord, int fixed_size) {
- block_num += other_coord.GetBlockNum();
- offset += other_coord.GetOffset();
- block_num += offset / fixed_size;
- offset %= fixed_size;
- }
- inline void Add(int in_block, int in_offset, int fixed_size) {
- block_num += in_block;
- offset += in_offset;
- block_num += offset / fixed_size;
- offset %= fixed_size;
- }
-};
-
-#endif
Copied: trunk/source/tools/functions.h (from rev 331, trunk/source/tools/functions.hh)
Deleted: trunk/source/tools/functions.hh
===================================================================
--- trunk/source/tools/functions.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/functions.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,160 +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 FUNCTIONS_HH
-#define FUNCTIONS_HH
-
-#include <iostream>
-#include <math.h>
-#include <stdio.h>
-#include <assert.h>
-
-#ifndef TARRAY_HH
-#include "tArray.hh"
-#endif
-
-template <class T> class tArray; // accessed
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-inline int Min(int in1, int in2);
-inline int Max(int in1, int in2);
-inline int Range(int value, int min, int max);
-inline int Mod(int value, int base);
-inline int Pow(int bas, int expon);
-inline double Log(double value);
-
-//////////////////////
-// Generic (inline) functions...
-//////////////////////
-
-namespace nFunctions {
-
- inline void Swap(int & in1, int & in2)
- {
-// cout << "Swapping " << in1 << " with " << in2 << endl;
- const int tmp = in1;
- in1 = in2;
- in2 = tmp;
-// cout << "Outputing " << in1 << " " << " and " << in2 << endl;
-
- }
-
- inline void Swap(double & in1, double & in2)
- {
- const double tmp = in1;
- in1 = in2;
- in2 = tmp;
- }
-
-}
-
-inline bool ToggleBool(bool & in_bool)
-{
- if (in_bool == true) in_bool = false;
- else in_bool = true;
- return in_bool;
-}
-
-inline int Min(int in1, int in2)
-{
- return (in1 > in2) ? in2 : in1;
-}
-
-inline int Max(int in1, int in2)
-{
- return (in1 < in2) ? in2 : in1;
-}
-
-inline double Max(double in1, double in2)
-{
- return (in1 < in2) ? in2 : in1;
-}
-
-inline int Range(int value, int min, int max)
-{
- value = (value < min) ? min : value;
- return (value > max) ? max : value;
-}
-
-inline int Mod(int value, int base)
-{
- value %= base;
- if (value < 0) value += base;
- return value;
-}
-
-inline int Pow(int base, int expon)
-{
- int value = 1;
- for (int i = 0; i < expon; i++) value *= base;
- return value;
-}
-
-inline double Log(double value)
-{
- assert(value > 0);
- return log(value);
-}
-
-/*
- * Special array functions...
- */
-
-inline int Min(const tArray<int> & test_array)
-{
- assert(test_array.GetSize() > 0);
-
- int min_val = test_array[0];
- for (int i = 1; i < test_array.GetSize(); i++) {
- if (test_array[i] < min_val) min_val = test_array[i];
- }
- return min_val;
-}
-
-inline int Max(const tArray<int> & test_array)
-{
- assert(test_array.GetSize() > 0);
-
- int max_val = test_array[0];
- for (int i = 1; i < test_array.GetSize(); i++) {
- if (test_array[i] > max_val) max_val = test_array[i];
- }
- return max_val;
-}
-
-inline int Sum(const tArray<int> & test_array)
-{
- int sum = 0;
- for (int i = 0; i < test_array.GetSize(); i++) {
- sum += test_array[i];
- }
- return sum;
-}
-
-inline int GridNeighbor(int cell_id, int size_x, int size_y, int diff_x,
- int diff_y)
-{
- // Routine to find a neighboring cell in an array that is
- // pretending to be a matrix
-
- int new_x = Mod(((cell_id % size_x) + diff_x), size_x);
- int new_y = Mod(((cell_id / size_x) + diff_y), size_y);
- return (new_y * size_x) + new_x;
-}
-
-// For QSORT in Divide_DoMutations ... MOVE THIS -- at TCC
-inline int IntCompareFunction(const void * a, const void * b)
-{
- if( *((int*)a) > *((int*)b) ) return 1;
- if( *((int*)a) < *((int*)b) ) return -1;
- return 0;
-}
-
-#endif
Deleted: trunk/source/tools/genesis.cc
===================================================================
--- trunk/source/tools/genesis.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/genesis.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,97 +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 GENESIS_HH
-#include "genesis.hh"
-#endif
-
-using namespace std;
-
-/////////////////
-// cGenesis
-/////////////////
-
-cGenesis::cGenesis()
-{
-}
-
-cGenesis::cGenesis(const cString & in_filename) : cInitFile(in_filename)
-{
- if( !IsOpen() ){
- cerr<<"Failed to open '" << in_filename << "' file!!!\n" << endl;
- }
-
- Load();
- Compress();
- Close();
-}
-
-//int cGenesis::Open(cString _filename, int mode)
-// porting to gcc 3.1 -- k
-int cGenesis::Open(cString _filename, ios::openmode mode)
-{
- if( IsOpen() ){
- cerr << "Trying to reopen '" << _filename << "' file!!!\n" << endl;
- return 0;
- }
-
- int base_ret = cFile::Open(_filename, mode);
-
- if (IsOpen() == false) return base_ret; // Failed to open!
-
- Load();
- Compress();
- Close();
-
- return base_ret;
-}
-
-void cGenesis::AddInput(const cString & in_name, int in_value)
-{
- cString in_string;
- in_string.Set("%s %d", in_name(), in_value);
- AddLine(in_string);
-}
-
-void cGenesis::AddInput(const cString & in_name, const cString & in_value)
-{
- cString in_string;
- in_string.Set("%s %s", in_name(), in_value());
- AddLine(in_string);
-}
-
-int cGenesis::ReadInt(const cString & name, int base, bool warn) const
-{
- if (name == "" || IsOpen() == false) return base;
- cString cur_line;
-
- if (!Find(cur_line, name, 0)) {
- if (verbose == true && warn == true) {
- cout << "Warning: " << name << " not in \"" << GetFilename()
- << "\", defaulting to: " << base <<endl;
- }
- return base;
- }
-
- return cur_line.GetWord(1).AsInt();
-}
-
-double cGenesis::ReadFloat(const cString & name, float base, bool warn) const
-{
- if (name == "" || IsOpen() == false) return base;
- cString cur_line;
-
- if (!Find(cur_line, name, 0)) {
- if (verbose == true && warn == true) {
- cout << "Warning: " << name << " not in \"" << GetFilename()
- << "\", defaulting to: " << base <<endl;
- }
- return base;
- }
-
- return cur_line.GetWord(1).AsDouble();
-}
Deleted: trunk/source/tools/genesis.hh
===================================================================
--- trunk/source/tools/genesis.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/genesis.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,99 +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 GENESIS_HH
-#define GENESIS_HH
-
-#ifndef INIT_FILE_HH
-#include "init_file.hh"
-#endif
-#ifndef STRING_HH
-#include "string.hh"
-#endif
-
-/**
- * A specialized initialization file class that is used for setting up
- * the way Avida should run.
- */
-
-class cString; // aggregate
-
-class cGenesis : public cInitFile {
-private:
- cGenesis(const cGenesis &);
-public:
- /**
- * The empty constructor creates a clean object.
- **/
- cGenesis();
-
- /**
- * This constructor opens the given initialization file, reads it in,
- * removes all comments, and closes it again.
- **/
- cGenesis(const cString & filename);
-
- /**
- * Opens an initialization file, reads it in, removes all comments, and
- * closes it again.
- **/
- //int Open(cString _filename, int mode=(ios::in|ios::nocreate));
- // porting to gcc 3.1
- // nocreate is no longer in the class ios -- k
- int Open(cString _filename, std::ios::openmode mode=(std::ios::in));
-
- /**
- * Convenience function. Adds an integer valued entry to the file in
- * memory. Uses @ref cInitFile::AddLine().
- **/
- void AddInput(const cString & in_name, int in_value);
-
- /**
- * Convenience function. Adds a string valued entry to the file in
- * memory. Uses @ref cInitFile::AddLine().
- **/
- void AddInput(const cString & in_name, const cString & in_value);
-
- /**
- * Reads an entry of type int. In case the entry does not exist,
- * the value of base is returned.
- *
- * @param name The name of the entry.
- * @param base The default value.
- * @param warn Warn user if not set?
- **/
- int ReadInt (const cString & name, int base=0, bool warn=true) const;
-
- /**
- * Reads an entry of type float. In case the entry does not exist,
- * the value of base is returned.
- *
- * @param name The name of the entry.
- * @param base The default value.
- * @param warn Warn user if not set?
- **/
- double ReadFloat (const cString & name, float base=0.0, bool warn=true) const;
-
- void Read(cString & _var, const cString & _name, const cString & _def="") {
- _var = ReadString(_name, _def);
- }
-
- void Read(int & _var, const cString & _name, const cString & _def="0") {
- _var = ReadInt(_name, _def.AsInt());
- }
-
- void Read(double & _var, const cString & _name, const cString & _def="0.0") {
- _var = ReadFloat(_name, _def.AsDouble());
- }
-
- void Read(bool & _var, const cString & _name, const cString & _def="0.0") {
- _var = ReadInt(_name, _def.AsInt()) != 0;
- }
-};
-
-#endif
-
Modified: trunk/source/tools/histogram.cc
===================================================================
--- trunk/source/tools/histogram.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/histogram.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -10,7 +10,7 @@
#endif
#ifndef FUNCTIONS_HH
-#include "functions.hh"
+#include "functions.h"
#endif
extern "C" {
Modified: trunk/source/tools/indexed_block_struct.hh
===================================================================
--- trunk/source/tools/indexed_block_struct.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/indexed_block_struct.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -19,10 +19,10 @@
#define INDEXED_BLOCK_STRUCT_HH
#ifndef FIXED_BLOCK_HH
-#include "fixed_block.hh"
+#include "cFixedBlock.h"
#endif
#ifndef FIXED_COORDS_HH
-#include "fixed_coords.hh"
+#include "cFixedCoords.h"
#endif
#ifndef REF_BLOCK_HH
#include "ref_block.hh"
Modified: trunk/source/tools/init_file.hh
===================================================================
--- trunk/source/tools/init_file.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/init_file.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -11,7 +11,7 @@
#include <iostream>
#ifndef FILE_HH
-#include "file.hh"
+#include "cFile.h"
#endif
#ifndef STRING_HH
#include "string.hh"
Modified: trunk/source/tools/integrated_schedule.cc
===================================================================
--- trunk/source/tools/integrated_schedule.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/integrated_schedule.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -8,7 +8,7 @@
#include "integrated_schedule.hh"
#include "cChangeList.h"
-#include "functions.hh"
+#include "functions.h"
#include "integrated_schedule_node.hh"
#include "merit.hh"
Modified: trunk/source/tools/ref_block.hh
===================================================================
--- trunk/source/tools/ref_block.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/ref_block.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,7 +9,7 @@
#define REF_BLOCK_HH
#ifndef FIXED_COORDS_HH
-#include "fixed_coords.hh"
+#include "cFixedCoords.h"
#endif
class cFixedCoords; // aggregate
Modified: trunk/source/tools/scaled_block.hh
===================================================================
--- trunk/source/tools/scaled_block.hh 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/scaled_block.hh 2005-10-07 01:02:35 UTC (rev 337)
@@ -9,7 +9,7 @@
#define SCALED_BLOCK_HH
#ifndef FIXED_COORDS_HH
-#include "fixed_coords.hh"
+#include "cFixedCoords.h"
#endif
/**
Modified: trunk/source/tools/string_list.cc
===================================================================
--- trunk/source/tools/string_list.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/string_list.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -5,7 +5,7 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#include "functions.hh"
+#include "functions.h"
#ifndef STRING_ITERATOR_HH
#include "string_iterator.hh"
#endif
Modified: trunk/source/tools/string_util.cc
===================================================================
--- trunk/source/tools/string_util.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/string_util.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -10,7 +10,7 @@
#endif
-#include "functions.hh"
+#include "functions.h"
#include "tMatrix.hh"
extern "C"{
Modified: trunk/source/tools/tools.pri
===================================================================
--- trunk/source/tools/tools.pri 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/tools/tools.pri 2005-10-07 01:02:35 UTC (rev 337)
@@ -5,9 +5,9 @@
$$TOOLS_HH/cDataEntry.h \
$$TOOLS_HH/cDataManager_Base.h \
$$TOOLS_HH/cDataFile.h \
- $$TOOLS_HH/file.hh \
- $$TOOLS_HH/fixed_block.hh \
- $$TOOLS_HH/functions.hh \
+ $$TOOLS_HH/cFile.h \
+ $$TOOLS_HH/cFixedBlock.h \
+ $$TOOLS_HH/functions.h \
$$TOOLS_HH/merit.hh \
$$TOOLS_HH/message_display.hh \
$$TOOLS_HH/message_display_hdrs.hh \
@@ -36,9 +36,9 @@
$$TOOLS_CC/cDataManager_Base.cc \
$$TOOLS_CC/cDefaultMessageDisplay.cc \
$$TOOLS_CC/cDoubleSum.cc \
- $$TOOLS_CC/file.cc \
- $$TOOLS_CC/fixed_block.cc \
- $$TOOLS_CC/genesis.cc \
+ $$TOOLS_CC/cFile.cc \
+ $$TOOLS_CC/cFixedBlock.cc \
+ $$TOOLS_CC/cGenesis.cc \
$$TOOLS_CC/help_alias.cc \
$$TOOLS_CC/help_manager.cc \
$$TOOLS_CC/help_type.cc \
Modified: trunk/source/utils/hist_map/Makefile
===================================================================
--- trunk/source/utils/hist_map/Makefile 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/utils/hist_map/Makefile 2005-10-07 01:02:35 UTC (rev 337)
@@ -27,7 +27,7 @@
default: $(TARGET)
### List Source Files in the Project #########################################
-SRC = hist_map2.cc ../../tools/file.cc \
+SRC = hist_map2.cc ../../tools/cFile.cc \
../../tools/init_file.cc ../../tools/string.cc \
../../tools/string_list.cc ../../tools/string_iterator.cc \
@@ -72,13 +72,13 @@
# DO NOT DELETE
hist_map2.o: ../../tools/tMatrix.hh ../../tools/tArray.hh
-hist_map2.o: ../../tools/string.hh ../../tools/file.hh
+hist_map2.o: ../../tools/string.hh ../../tools/cFile.h
hist_map2.o: ../../tools/init_file.hh ../../tools/string_list.hh
hist_map2.o: ../../tools/tList.hh
-../../tools/file.o: ../../tools/file.hh ../../tools/string.hh
+../../tools/file.o: ../../tools/cFile.h ../../tools/string.hh
../../tools/file.o: ../../tools/init_file.hh ../../tools/string_list.hh
../../tools/file.o: ../../tools/tList.hh ../../tools/tArray.hh
-../../tools/file.o: ../../tools/genesis.hh ../../tools/string_iterator.hh
+../../tools/file.o: ../../tools/cGenesis.h ../../tools/string_iterator.hh
../../tools/file.o: ../../tools/tools.hh ../../tools/random.hh
../../tools/init_file.o: ../../tools/init_file.hh ../../tools/string_list.hh
../../tools/init_file.o: ../../tools/tList.hh ../../tools/tArray.hh
Modified: trunk/source/utils/hist_map/hist_map.cc
===================================================================
--- trunk/source/utils/hist_map/hist_map.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/utils/hist_map/hist_map.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -7,7 +7,7 @@
#include "../../tools/tMatrix.hh"
#include "../../tools/string.hh"
-#include "../../tools/file.hh"
+#include "../../tools/cFile.h"
using namespace std;
Modified: trunk/source/utils/hist_map/hist_map2.cc
===================================================================
--- trunk/source/utils/hist_map/hist_map2.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/utils/hist_map/hist_map2.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -7,7 +7,7 @@
#include "../../tools/tMatrix.hh"
#include "../../tools/string.hh"
-#include "../../tools/file.hh"
+#include "../../tools/cFile.h"
#include "../../tools/init_file.hh"
Modified: trunk/source/utils/task_events/task_event_gen.cc
===================================================================
--- trunk/source/utils/task_events/task_event_gen.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/utils/task_events/task_event_gen.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,7 +1,7 @@
#include <iostream>
#include "../../tools/tArray.hh"
-#include "../../tools/file.hh"
+#include "../../tools/cFile.h"
#include "../../tools/random.hh"
#include "../../tools/string.hh"
#include "../../tools/init_file.hh"
Modified: trunk/source/utils/task_events/task_event_gen.old.cc
===================================================================
--- trunk/source/utils/task_events/task_event_gen.old.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/utils/task_events/task_event_gen.old.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -1,7 +1,7 @@
#include <iostream.h>
#include "../../tools/tArray.hh"
-#include "../../tools/file.hh"
+#include "../../tools/cFile.h"
#include "../../tools/random.hh"
#include "../../tools/string.hh"
#include "../../tools/init_file.hh"
Modified: trunk/source/viewers/zoom_screen.cc
===================================================================
--- trunk/source/viewers/zoom_screen.cc 2005-10-07 00:35:44 UTC (rev 336)
+++ trunk/source/viewers/zoom_screen.cc 2005-10-07 01:02:35 UTC (rev 337)
@@ -8,7 +8,7 @@
#ifndef ENVIRONMENT_HH
#include "cEnvironment.h"
#endif
-#include "functions.hh"
+#include "functions.h"
#include "cConfig.h"
#include "cGenebank.h"
More information about the Avida-cvs
mailing list