[Avida-cvs] [avida-svn] r633 - in development: . Avida.xcodeproj source/actions source/analyze source/classification source/cpu source/drivers source/event source/main source/script source/targets/avida-viewer source/tools
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Tue May 2 15:33:16 PDT 2006
Author: brysonda
Date: 2006-05-02 18:33:15 -0400 (Tue, 02 May 2006)
New Revision: 633
Modified:
development/Avida.xcodeproj/project.pbxproj
development/CMakeLists.txt
development/source/actions/cAction.h
development/source/actions/cActionLibrary.h
development/source/analyze/cAnalyzeCommand.h
development/source/analyze/cAnalyzeCommandAction.h
development/source/analyze/cAnalyzeCommandDef.h
development/source/analyze/cAnalyzeCommandDefBase.h
development/source/analyze/cAnalyzeFlowCommand.h
development/source/analyze/cAnalyzeFlowCommandDef.h
development/source/analyze/cAnalyzeFunction.h
development/source/analyze/cAnalyzeGenotype.h
development/source/analyze/cAnalyzeJob.h
development/source/analyze/cAnalyzeJobQueue.h
development/source/analyze/cAnalyzeJobWorker.h
development/source/analyze/cAnalyzeUtil.h
development/source/analyze/cGenotypeBatch.h
development/source/classification/cClassificationManager.h
development/source/classification/cGenotype.h
development/source/classification/cGenotypeControl.h
development/source/classification/cGenotype_BirthData.h
development/source/classification/cGenotype_TestData.h
development/source/classification/cInjectGenotype.h
development/source/classification/cInjectGenotypeControl.h
development/source/classification/cInjectGenotypeElement.h
development/source/classification/cInjectGenotypeQueue.h
development/source/classification/cInjectGenotype_BirthData.h
development/source/classification/cLineage.h
development/source/classification/cSpecies.h
development/source/classification/cSpeciesControl.h
development/source/classification/cSpeciesQueue.h
development/source/cpu/cCPUMemory.h
development/source/cpu/cCPUStack.h
development/source/cpu/cCPUTestInfo.h
development/source/cpu/cCodeLabel.h
development/source/cpu/cHardware4Stack.h
development/source/cpu/cHardware4Stack_Thread.h
development/source/cpu/cHardwareBase.h
development/source/cpu/cHardwareCPU.h
development/source/cpu/cHardwareCPU_Thread.h
development/source/cpu/cHardwareManager.h
development/source/cpu/cHardwareSMT.h
development/source/cpu/cHardwareStatusPrinter.h
development/source/cpu/cHardwareTracer.h
development/source/cpu/cHardwareTracer_4Stack.h
development/source/cpu/cHardwareTracer_CPU.h
development/source/cpu/cHardwareTracer_SMT.h
development/source/cpu/cHardwareTracer_TestCPU.h
development/source/cpu/cHeadCPU.h
development/source/cpu/cHeadMultiMem.h
development/source/cpu/cInstLibCPU.h
development/source/cpu/cTestCPU.h
development/source/cpu/cTestCPUInterface.h
development/source/cpu/cTestUtil.h
development/source/cpu/sCPUStats.h
development/source/drivers/cAvidaDriver.h
development/source/drivers/cDefaultAnalyzeDriver.h
development/source/drivers/cDefaultRunDriver.h
development/source/drivers/cDriverManager.h
development/source/drivers/cFallbackWorldDriver.h
development/source/drivers/cWorldDriver.h
development/source/event/cEvent.h
development/source/event/cEventList.h
development/source/event/cEventListEntry.h
development/source/event/cEventListIterator.h
development/source/event/cEventManager.h
development/source/event/cEventTriggers.h
development/source/main/MyCodeArrayLessThan.h
development/source/main/cAvidaConfig.h
development/source/main/cAvidaTriggers.h
development/source/main/cBirthChamber.h
development/source/main/cEnvironment.h
development/source/main/cFitnessMatrix.h
development/source/main/cGenome.h
development/source/main/cGenomeUtil.h
development/source/main/cInstLibBase.h
development/source/main/cInstSet.h
development/source/main/cInstUtil.h
development/source/main/cInstruction.h
development/source/main/cLandscape.h
development/source/main/cLocalMutations.h
development/source/main/cMutation.h
development/source/main/cMutationLib.h
development/source/main/cMutationRates.h
development/source/main/cMxCodeArray.h
development/source/main/cOrgInterface.h
development/source/main/cOrgMessage.h
development/source/main/cOrgSeqMessage.h
development/source/main/cOrgSinkMessage.h
development/source/main/cOrgSourceMessage.h
development/source/main/cOrganism.h
development/source/main/cPhenotype.h
development/source/main/cPopulation.h
development/source/main/cPopulationCell.h
development/source/main/cPopulationInterface.h
development/source/main/cReaction.h
development/source/main/cReactionLib.h
development/source/main/cReactionProcess.h
development/source/main/cReactionRequisite.h
development/source/main/cReactionResult.h
development/source/main/cResource.h
development/source/main/cResourceCount.h
development/source/main/cResourceLib.h
development/source/main/cSpatialCountElem.h
development/source/main/cSpatialResCount.h
development/source/main/cStats.h
development/source/main/cTaskContext.h
development/source/main/cTaskEntry.h
development/source/main/cTaskLib.h
development/source/main/cWorld.h
development/source/script/cASLibrary.h
development/source/script/cASSymbol.h
development/source/script/cParser.h
development/source/script/cScriptObject.h
development/source/script/cSymbolTable.h
development/source/targets/avida-viewer/cBarScreen.h
development/source/targets/avida-viewer/cBaseTextWindow.h
development/source/targets/avida-viewer/cEnvironmentScreen.h
development/source/targets/avida-viewer/cHistScreen.h
development/source/targets/avida-viewer/cMapScreen.h
development/source/targets/avida-viewer/cMenuWindow.h
development/source/targets/avida-viewer/cOptionsScreen.h
development/source/targets/avida-viewer/cScreen.h
development/source/targets/avida-viewer/cStatsScreen.h
development/source/targets/avida-viewer/cSymbolUtil.h
development/source/targets/avida-viewer/cTextViewerDriver.h
development/source/targets/avida-viewer/cTextWindow.h
development/source/targets/avida-viewer/cView.h
development/source/targets/avida-viewer/cViewInfo.h
development/source/targets/avida-viewer/cZoomScreen.h
development/source/tools/cBlockStruct.h
development/source/tools/cConstSchedule.h
development/source/tools/cCountTracker.h
development/source/tools/cCycleCheck.h
development/source/tools/cDataEntry.cc
development/source/tools/cDataEntry.h
development/source/tools/cDataFile.h
development/source/tools/cDataFileManager.h
development/source/tools/cDataManager_Base.h
development/source/tools/cDefaultMessageDisplay.h
development/source/tools/cDoubleSum.h
development/source/tools/cFile.cc
development/source/tools/cFile.h
development/source/tools/cFixedBlock.h
development/source/tools/cFixedCoords.h
development/source/tools/cGenesis.h
development/source/tools/cHelpAlias.h
development/source/tools/cHelpEntry.h
development/source/tools/cHelpFullEntry.h
development/source/tools/cHelpManager.h
development/source/tools/cHelpType.h
development/source/tools/cHistogram.h
development/source/tools/cID.h
development/source/tools/cIndexedBlockStruct.h
development/source/tools/cInitFile.cc
development/source/tools/cInitFile.h
development/source/tools/cIntSum.h
development/source/tools/cIntegratedSchedule.h
development/source/tools/cIntegratedScheduleNode.h
development/source/tools/cMerit.h
development/source/tools/cMessageClass.h
development/source/tools/cMessageClosure.h
development/source/tools/cMessageDisplay.h
development/source/tools/cMessageType.h
development/source/tools/cProbSchedule.h
development/source/tools/cRandom.cc
development/source/tools/cRandom.h
development/source/tools/cRefBlock.h
development/source/tools/cRunningAverage.h
development/source/tools/cScaledBlock.h
development/source/tools/cSchedule.h
development/source/tools/cString.cc
development/source/tools/cString.h
development/source/tools/cStringIterator.h
development/source/tools/cStringList.cc
development/source/tools/cStringList.h
development/source/tools/cStringUtil.h
development/source/tools/cThread.h
development/source/tools/cTools.h
development/source/tools/cUInt.h
development/source/tools/cVerifierSuiteRecurser.h
development/source/tools/cWeightedIndex.h
Log:
Wrap all unit test functions within #ifdef ENABLE_UNIT_TESTS. This is disabled by default, excluding unit tests. The top level CMakeLists.txt has been updated to add -DENABLE_UNIT_TESTS when unit testing is turned on.
Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj 2006-05-02 17:12:51 UTC (rev 632)
+++ development/Avida.xcodeproj/project.pbxproj 2006-05-02 22:33:15 UTC (rev 633)
@@ -491,6 +491,7 @@
7005A70209BA0FA90007E16E /* cTestCPUInterface.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cTestCPUInterface.cc; sourceTree = "<group>"; };
7005A70909BA0FBE0007E16E /* cOrgInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cOrgInterface.h; sourceTree = "<group>"; };
700AE91B09DB65F200A073FD /* cTaskContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cTaskContext.h; sourceTree = "<group>"; };
+ 700E11BC0A0815B600B604CD /* cDataEntry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cDataEntry.cc; sourceTree = "<group>"; };
700E28CF0859FFD700CF158A /* tObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tObjectFactory.h; sourceTree = "<group>"; };
700E2B83085DE50C00CF158A /* avida-viewer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "avida-viewer"; sourceTree = BUILT_PRODUCTS_DIR; };
7013845F09028B3E0087ED2E /* cAvidaConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAvidaConfig.h; sourceTree = "<group>"; };
@@ -1525,6 +1526,7 @@
DCC314D8076253A2008F7A48 /* tools */ = {
isa = PBXGroup;
children = (
+ 700E11BC0A0815B600B604CD /* cDataEntry.cc */,
70B08B9008FB2E6B00FC65FE /* cTools.cc */,
70B08B9108FB2E6B00FC65FE /* cWeightedIndex.cc */,
70B08B8008FB2E5500FC65FE /* cTools.h */,
Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt 2006-05-02 17:12:51 UTC (rev 632)
+++ development/CMakeLists.txt 2006-05-02 22:33:15 UTC (rev 633)
@@ -1,66 +1,4 @@
-# This section defines default builtin configure options.
-
-IF(UNIX)
-
- IF(APPLE)
- SET(COMPILER_WARNING_FLAGS "-Wall -Wno-long-double -Wno-long-long")
- ELSE(APPLE)
- SET(COMPILER_WARNING_FLAGS "-Wall -Wno-long-long")
- ENDIF(APPLE)
-
- # Four types of c++ compilations:
- # - debug (Debug)
- # - minimum-size release (MinSizeRel)
- # - release (Release)
- # - release with debug info (RelWithDebInfo)
- SET(CMAKE_CXX_FLAGS_DEBUG
- "-g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during debug builds.")
- SET(CMAKE_CXX_FLAGS_MINSIZEREL
- "-Os -DNDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during release minsize builds.")
- SET(CMAKE_CXX_FLAGS_RELEASE
- "-O3 -ffast-math -DNDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during release builds.")
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
- "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during release builds.")
-
- # Four types of c compilations:
- # - debug (Debug)
- # - minimum-size release (MinSizeRel)
- # - release (Release)
- # - release with debug info (RelWithDebInfo)
- SET(CMAKE_C_FLAGS_DEBUG
- "-g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during debug builds.")
- SET(CMAKE_C_FLAGS_MINSIZEREL
- "-Os -DNDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during release minsize builds.")
- SET(CMAKE_C_FLAGS_RELEASE
- "-O3 -ffast-math -DNDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during release builds.")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO
- "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
- CACHE STRING "Flags used by the compiler during release builds.")
-
- # By default, show all build commands.
- SET(CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL
- "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only.")
-ENDIF(UNIX)
-
-SET(CMAKE_SKIP_RPATH TRUE CACHE INTERNAL "Fix Library Path Issues?")
-
-# Default build mode compiles c++ and c code with debug info and no
-# optimizations.
-SET(CMAKE_BUILD_TYPE
- "Release"
- CACHE STRING
- "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
-)
-
-
# This section introduces the Avida project to CMake. In this file, it
# must be between the configuration options above (otherwise it
# overrides their defaults) and the configuration options, cmake module
@@ -209,7 +147,10 @@
IF(AVD_UNIT_TESTS)
SET(UNIT_TESTS TRUE)
SET(BUILD_TESTING TRUE)
+ ADD_DEFINITIONS(-DENABLE_UNIT_TESTS)
ENABLE_TESTING()
+ELSE(AVD_UNIT_TESTS)
+ REMOVE_DEFINITIONS(_DENABLE_UNIT_TESTS)
ENDIF(AVD_UNIT_TESTS)
IF(BUILD_TESTING)
@@ -284,3 +225,66 @@
)
SUBDIRS(source support)
+
+# This section defines default builtin configure options.
+
+IF(UNIX)
+
+ IF(APPLE)
+ SET(COMPILER_WARNING_FLAGS "-Wall -Wno-long-double -Wno-long-long")
+ ELSE(APPLE)
+ SET(COMPILER_WARNING_FLAGS "-Wall -Wno-long-long")
+ ENDIF(APPLE)
+
+ # Four types of c++ compilations:
+ # - debug (Debug)
+ # - minimum-size release (MinSizeRel)
+ # - release (Release)
+ # - release with debug info (RelWithDebInfo)
+ SET(CMAKE_CXX_FLAGS_DEBUG
+ "-g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during debug builds.")
+ SET(CMAKE_CXX_FLAGS_MINSIZEREL
+ "-Os -DNDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during release minsize builds.")
+ SET(CMAKE_CXX_FLAGS_RELEASE
+ "-O3 -ffast-math -DNDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during release builds.")
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+ "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during release builds.")
+
+ # Four types of c compilations:
+ # - debug (Debug)
+ # - minimum-size release (MinSizeRel)
+ # - release (Release)
+ # - release with debug info (RelWithDebInfo)
+ SET(CMAKE_C_FLAGS_DEBUG
+ "-g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during debug builds.")
+ SET(CMAKE_C_FLAGS_MINSIZEREL
+ "-Os -DNDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during release minsize builds.")
+ SET(CMAKE_C_FLAGS_RELEASE
+ "-O3 -ffast-math -DNDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during release builds.")
+ SET(CMAKE_C_FLAGS_RELWITHDEBINFO
+ "-O2 -ffast-math -g ${COMPILER_WARNING_FLAGS} -DDEBUG -DUSE_tMemTrack=1"
+ CACHE STRING "Flags used by the compiler during release builds.")
+
+ # By default, show all build commands.
+ SET(CMAKE_VERBOSE_MAKEFILE TRUE CACHE BOOL
+ "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only.")
+ENDIF(UNIX)
+
+SET(CMAKE_SKIP_RPATH TRUE CACHE INTERNAL "Fix Library Path Issues?")
+
+# Default build mode compiles c++ and c code with debug info and no
+# optimizations.
+SET(CMAKE_BUILD_TYPE
+ "Release"
+ CACHE STRING
+ "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
+)
+
+
Modified: development/source/actions/cAction.h
===================================================================
--- development/source/actions/cAction.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/actions/cAction.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -37,6 +37,7 @@
virtual const cString GetDescription() = 0;
virtual void Process(cAvidaContext& ctx) = 0;
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -44,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/actions/cActionLibrary.h
===================================================================
--- development/source/actions/cActionLibrary.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/actions/cActionLibrary.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -25,6 +25,7 @@
public:
cActionLibrary() { ; }
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -32,7 +33,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeCommand.h
===================================================================
--- development/source/analyze/cAnalyzeCommand.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeCommand.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
*/
bool operator==(const cAnalyzeCommand &in) const { return &in == this; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeCommandAction.h
===================================================================
--- development/source/analyze/cAnalyzeCommandAction.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeCommandAction.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -43,6 +43,8 @@
action->Process(ctx);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -50,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeCommandDef.h
===================================================================
--- development/source/analyze/cAnalyzeCommandDef.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeCommandDef.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -35,6 +35,8 @@
(analyze->*CommandFunction)(args);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -42,7 +44,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeCommandDefBase.h
===================================================================
--- development/source/analyze/cAnalyzeCommandDefBase.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeCommandDefBase.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -30,6 +30,8 @@
const cString& GetName() const { return name; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -37,7 +39,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeFlowCommand.h
===================================================================
--- development/source/analyze/cAnalyzeFlowCommand.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeFlowCommand.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -34,6 +34,7 @@
tList<cAnalyzeCommand> * GetCommandList() { return &command_list; }
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -41,7 +42,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeFlowCommandDef.h
===================================================================
--- development/source/analyze/cAnalyzeFlowCommandDef.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeFlowCommandDef.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
virtual bool IsFlowCommand() { return true; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeFunction.h
===================================================================
--- development/source/analyze/cAnalyzeFunction.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeFunction.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -39,6 +39,8 @@
const cString & GetName() { return name; }
tList<cAnalyzeCommand> * GetCommandList() { return &command_list; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -46,7 +48,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeGenotype.h
===================================================================
--- development/source/analyze/cAnalyzeGenotype.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeGenotype.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -315,6 +315,7 @@
*/
bool operator==(const cAnalyzeGenotype &in) const { return &in == this; }
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -322,7 +323,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeJob.h
===================================================================
--- development/source/analyze/cAnalyzeJob.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeJob.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -26,6 +26,8 @@
virtual void Run(cAvidaContext& ctx) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -33,7 +35,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeJobQueue.h
===================================================================
--- development/source/analyze/cAnalyzeJobQueue.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeJobQueue.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -53,6 +53,8 @@
cRandom* GetRandom(int jobid) { return m_rng_pool[jobid & MT_RANDOM_INDEX_MASK]; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -60,7 +62,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeJobWorker.h
===================================================================
--- development/source/analyze/cAnalyzeJobWorker.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeJobWorker.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -27,6 +27,8 @@
public:
cAnalyzeJobWorker(cAnalyzeJobQueue* queue) : m_queue(queue) { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -34,7 +36,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/analyze/cAnalyzeUtil.h
===================================================================
--- development/source/analyze/cAnalyzeUtil.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cAnalyzeUtil.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -70,6 +70,7 @@
static void PrintInstructionAbundanceHistogram(cWorld* world, std::ofstream& fp);
// -- kgn
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -77,6 +78,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
+
#endif
Modified: development/source/analyze/cGenotypeBatch.h
===================================================================
--- development/source/analyze/cGenotypeBatch.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/analyze/cGenotypeBatch.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -44,6 +44,7 @@
void SetAligned(bool _val=true) { is_aligned = _val; }
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -51,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cClassificationManager.h
===================================================================
--- development/source/classification/cClassificationManager.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cClassificationManager.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -185,6 +185,8 @@
bool LoadClone(std::ifstream & fp);
bool OK();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -192,7 +194,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cGenotype.h
===================================================================
--- development/source/classification/cGenotype.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cGenotype.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -222,6 +222,8 @@
int GetTotalOrganisms() { return total_organisms; }
int GetTotalParasites() { return total_parasites; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -229,9 +231,10 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
+
inline int cGenotype::AddOrganism()
{
total_organisms++;
Modified: development/source/classification/cGenotypeControl.h
===================================================================
--- development/source/classification/cGenotypeControl.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cGenotypeControl.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -67,6 +67,8 @@
cGenotype * Next(int thread);
cGenotype * Prev(int thread);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -74,7 +76,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cGenotype_BirthData.h
===================================================================
--- development/source/classification/cGenotype_BirthData.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cGenotype_BirthData.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -49,6 +49,8 @@
// [0]=parent1, [1]=parent2, [2]&[3]=grandparents 1, [4]&[5]=grandparents 2
tArray<int> ancestor_ids;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -56,7 +58,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cGenotype_TestData.h
===================================================================
--- development/source/classification/cGenotype_TestData.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cGenotype_TestData.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -26,6 +26,8 @@
double colony_fitness;
int generations;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -33,7 +35,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cInjectGenotype.h
===================================================================
--- development/source/classification/cInjectGenotype.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cInjectGenotype.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -111,6 +111,8 @@
int GetNumInjected() { return num_injected; }
int GetTotalInjected() { return total_injected; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -118,7 +120,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/classification/cInjectGenotypeControl.h
===================================================================
--- development/source/classification/cInjectGenotypeControl.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cInjectGenotypeControl.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -65,6 +65,8 @@
cInjectGenotype * Next(int thread);
cInjectGenotype * Prev(int thread);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -72,7 +74,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cInjectGenotypeElement.h
===================================================================
--- development/source/classification/cInjectGenotypeElement.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cInjectGenotypeElement.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -37,6 +37,8 @@
void SetNext(cInjectGenotypeElement* in_next) { next = in_next; }
void SetPrev(cInjectGenotypeElement* in_prev) { prev = in_prev; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -44,7 +46,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cInjectGenotypeQueue.h
===================================================================
--- development/source/classification/cInjectGenotypeQueue.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cInjectGenotypeQueue.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -38,6 +38,8 @@
void Remove(cInjectGenotype & in_inject_genotype);
cInjectGenotype * Find(const cGenome & in_genome) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -45,7 +47,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cInjectGenotype_BirthData.h
===================================================================
--- development/source/classification/cInjectGenotype_BirthData.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cInjectGenotype_BirthData.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -38,6 +38,8 @@
//cSpecies * parent_species;
int num_offspring_genotypes; // Num offspring genotypes still in memory.
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -45,7 +47,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline cInjectGenotype_BirthData::cInjectGenotype_BirthData(int in_update_born)
Modified: development/source/classification/cLineage.h
===================================================================
--- development/source/classification/cLineage.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cLineage.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -169,6 +169,7 @@
double GetLineageStat2 () const { return m_lineage_stat2; }
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -176,7 +177,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cSpecies.h
===================================================================
--- development/source/classification/cSpecies.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cSpecies.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -92,6 +92,8 @@
int debug_num_threshold;
#endif
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -99,7 +101,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cSpeciesControl.h
===================================================================
--- development/source/classification/cSpeciesControl.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cSpeciesControl.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -56,6 +56,8 @@
inline int GetSize() const { return active_queue.GetSize(); }
inline int GetInactiveSize() const { return inactive_queue.GetSize(); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -63,7 +65,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/classification/cSpeciesQueue.h
===================================================================
--- development/source/classification/cSpeciesQueue.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/classification/cSpeciesQueue.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -39,6 +39,8 @@
inline int GetSize() const { return size; }
inline cSpecies * GetFirst() const { return first; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -46,7 +48,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cCPUMemory.h
===================================================================
--- development/source/cpu/cCPUMemory.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cCPUMemory.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -91,6 +91,8 @@
void Remove(int pos, int num_insts=1);
void Replace(int pos, int num_insts, const cGenome& in_genome);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -98,7 +100,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cCPUStack.h
===================================================================
--- development/source/cpu/cCPUStack.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cCPUStack.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -44,6 +44,8 @@
void SaveState(std::ostream& fp);
void LoadState(std::istream & fp);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -51,7 +53,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/cpu/cCPUTestInfo.h
===================================================================
--- development/source/cpu/cCPUTestInfo.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cCPUTestInfo.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -97,6 +97,8 @@
double GetGenotypeFitness();
double GetColonyFitness();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -104,7 +106,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cCodeLabel.h
===================================================================
--- development/source/cpu/cCodeLabel.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cCodeLabel.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -70,6 +70,8 @@
int AsIntFib(const int base) const;
int AsIntPolynomialCoefficent(const int base) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -77,7 +79,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
void cCodeLabel::AddNop(int nop_num) {
Modified: development/source/cpu/cHardware4Stack.h
===================================================================
--- development/source/cpu/cHardware4Stack.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardware4Stack.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -267,6 +267,8 @@
bool Inst_IO(cAvidaContext& ctx);
bool Inst_Inject(cAvidaContext& ctx);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -274,7 +276,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/cpu/cHardware4Stack_Thread.h
===================================================================
--- development/source/cpu/cHardware4Stack_Thread.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardware4Stack_Thread.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -62,6 +62,8 @@
int GetID() const { return id; }
void SetID(int _id) { id = _id; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -69,7 +71,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareBase.h
===================================================================
--- development/source/cpu/cHardwareBase.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareBase.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -144,6 +144,8 @@
// -------- No-Operation Instruction --------
bool Inst_Nop(cAvidaContext& ctx); // A no-operation instruction that does nothing!
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -151,7 +153,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareCPU.h
===================================================================
--- development/source/cpu/cHardwareCPU.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareCPU.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -425,6 +425,8 @@
//// Placebo ////
bool Inst_Skip(cAvidaContext& ctx);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -432,7 +434,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/cpu/cHardwareCPU_Thread.h
===================================================================
--- development/source/cpu/cHardwareCPU_Thread.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareCPU_Thread.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -61,6 +61,8 @@
int GetID() const { return id; }
void SetID(int _id) { id = _id; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -68,7 +70,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareManager.h
===================================================================
--- development/source/cpu/cHardwareManager.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareManager.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -45,6 +45,8 @@
const cInstSet& GetInstSet() const { return m_inst_set; }
cInstSet& GetInstSet() { return m_inst_set; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -52,7 +54,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareSMT.h
===================================================================
--- development/source/cpu/cHardwareSMT.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareSMT.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -300,6 +300,8 @@
bool Inst_RotateLeft(cAvidaContext& ctx); // 43
bool Inst_RotateRight(cAvidaContext& ctx); // 44
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -307,7 +309,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/cpu/cHardwareStatusPrinter.h
===================================================================
--- development/source/cpu/cHardwareStatusPrinter.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareStatusPrinter.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -64,6 +64,8 @@
virtual void TraceHardware_TestCPU(int time_used, int time_allocated, int size,
const cString& final_memory, const cString& child_memory);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -71,7 +73,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareTracer.h
===================================================================
--- development/source/cpu/cHardwareTracer.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareTracer.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -16,6 +16,8 @@
public:
virtual ~cHardwareTracer() { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -23,7 +25,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareTracer_4Stack.h
===================================================================
--- development/source/cpu/cHardwareTracer_4Stack.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareTracer_4Stack.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -18,6 +18,8 @@
virtual void TraceHardware_4Stack(cHardware4Stack &) = 0;
virtual void TraceHardware_4StackBonus(cHardware4Stack &) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -25,7 +27,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareTracer_CPU.h
===================================================================
--- development/source/cpu/cHardwareTracer_CPU.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareTracer_CPU.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -19,6 +19,8 @@
virtual void TraceHardware_CPU(cHardwareCPU &) = 0;
virtual void TraceHardware_CPUBonus(cHardwareCPU &) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -26,7 +28,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareTracer_SMT.h
===================================================================
--- development/source/cpu/cHardwareTracer_SMT.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareTracer_SMT.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -18,6 +18,8 @@
virtual void TraceHardware_SMT(cHardwareSMT &) = 0;
virtual void TraceHardware_SMTBonus(cHardwareSMT &) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -25,7 +27,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHardwareTracer_TestCPU.h
===================================================================
--- development/source/cpu/cHardwareTracer_TestCPU.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHardwareTracer_TestCPU.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -23,6 +23,8 @@
const cString &child_memory
) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -30,7 +32,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHeadCPU.h
===================================================================
--- development/source/cpu/cHeadCPU.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHeadCPU.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -123,6 +123,8 @@
// Test functions...
int TestParasite() const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -130,7 +132,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cHeadMultiMem.h
===================================================================
--- development/source/cpu/cHeadMultiMem.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cHeadMultiMem.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -62,6 +62,8 @@
bool AtEnd() const;
bool InMemory() const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -69,7 +71,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cInstLibCPU.h
===================================================================
--- development/source/cpu/cInstLibCPU.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cInstLibCPU.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -80,6 +80,8 @@
const cInstruction & GetInstDefault(){ return inst_default; }
const cInstruction & GetInstError(){ return inst_error; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -87,7 +89,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/cpu/cTestCPU.h
===================================================================
--- development/source/cpu/cTestCPU.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cTestCPU.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
public:
cTestResources(cWorld* world);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
class cTestCPU
Modified: development/source/cpu/cTestCPUInterface.h
===================================================================
--- development/source/cpu/cTestCPUInterface.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cTestCPUInterface.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -52,6 +52,8 @@
bool InjectParasite(cOrganism* parent, const cGenome& injected_code);
bool UpdateMerit(double new_merit);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -59,7 +61,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/cTestUtil.h
===================================================================
--- development/source/cpu/cTestUtil.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/cTestUtil.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
static void PrintGenome(cWorld* world, cInjectGenotype * genotype, const cGenome & genome,
cString filename="", int update_out=-1);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/cpu/sCPUStats.h
===================================================================
--- development/source/cpu/sCPUStats.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/cpu/sCPUStats.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -61,6 +61,8 @@
mut_stats.Clear();
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -68,7 +70,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/drivers/cAvidaDriver.h
===================================================================
--- development/source/drivers/cAvidaDriver.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/drivers/cAvidaDriver.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -26,6 +26,8 @@
virtual void Run() = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -33,7 +35,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/drivers/cDefaultAnalyzeDriver.h
===================================================================
--- development/source/drivers/cDefaultAnalyzeDriver.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/drivers/cDefaultAnalyzeDriver.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -48,6 +48,8 @@
void NotifyComment(const cString& in_string);
void NotifyWarning(const cString& in_string);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -55,7 +57,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/drivers/cDefaultRunDriver.h
===================================================================
--- development/source/drivers/cDefaultRunDriver.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/drivers/cDefaultRunDriver.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -48,6 +48,8 @@
void NotifyComment(const cString& in_string);
void NotifyWarning(const cString& in_string);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -55,7 +57,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/drivers/cDriverManager.h
===================================================================
--- development/source/drivers/cDriverManager.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/drivers/cDriverManager.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -47,6 +47,8 @@
static void Unregister(cAvidaDriver* drv);
static void Unregister(cWorldDriver* drv);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -54,7 +56,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/drivers/cFallbackWorldDriver.h
===================================================================
--- development/source/drivers/cFallbackWorldDriver.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/drivers/cFallbackWorldDriver.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -38,6 +38,8 @@
void NotifyComment(const cString& in_string);
void NotifyWarning(const cString& in_string);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -45,7 +47,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/drivers/cWorldDriver.h
===================================================================
--- development/source/drivers/cWorldDriver.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/drivers/cWorldDriver.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
virtual void NotifyComment(const cString& in_string) = 0;
virtual void NotifyWarning(const cString& in_string) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/event/cEvent.h
===================================================================
--- development/source/event/cEvent.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/event/cEvent.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -56,6 +56,8 @@
virtual const cString GetName() const = 0;
virtual const cString GetDescription() const = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -63,7 +65,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/event/cEventList.h
===================================================================
--- development/source/event/cEventList.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/event/cEventList.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -136,6 +136,8 @@
// cEventListIterator.
static void PrintEvent(cEventListEntry * event, std::ostream& os = std::cout);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -143,7 +145,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/event/cEventListEntry.h
===================================================================
--- development/source/event/cEventListEntry.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/event/cEventListEntry.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -105,6 +105,7 @@
cEventListEntry* GetNext() const { return m_next; }
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -112,7 +113,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/event/cEventListIterator.h
===================================================================
--- development/source/event/cEventListIterator.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/event/cEventListIterator.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -43,6 +43,8 @@
return *this;
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -50,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/event/cEventManager.h
===================================================================
--- development/source/event/cEventManager.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/event/cEventManager.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
void PrintAllEventDescriptions();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/event/cEventTriggers.h
===================================================================
--- development/source/event/cEventTriggers.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/event/cEventTriggers.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -39,6 +39,8 @@
double GetTriggerValue( eTriggerVariable trigger ) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -46,7 +48,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/MyCodeArrayLessThan.h
===================================================================
--- development/source/main/MyCodeArrayLessThan.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/MyCodeArrayLessThan.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -20,6 +20,8 @@
public:
bool operator()(const cMxCodeArray& x, const cMxCodeArray& y) const { return x < y; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -27,7 +29,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cAvidaConfig.h
===================================================================
--- development/source/main/cAvidaConfig.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cAvidaConfig.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -273,6 +273,8 @@
void GenerateOverides();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -280,7 +282,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
// Concept:
Modified: development/source/main/cAvidaTriggers.h
===================================================================
--- development/source/main/cAvidaTriggers.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cAvidaTriggers.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -38,6 +38,8 @@
double GetUpdate() const { return (double) m_stats.GetUpdate(); }
double GetGeneration() const { return m_stats.SumGeneration().Average(); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -45,7 +47,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cBirthChamber.h
===================================================================
--- development/source/main/cBirthChamber.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cBirthChamber.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -103,6 +103,8 @@
// Check the neighborhood for waiting genomes
bool GetNeighborWaiting(const int & parent_id, int world_x, int world_y);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -110,7 +112,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cEnvironment.h
===================================================================
--- development/source/main/cEnvironment.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cEnvironment.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -121,6 +121,8 @@
bool SetReactionValueMult(const cString & name, double value_mult);
bool SetReactionInst(const cString & name, cString inst_name);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -128,7 +130,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cFitnessMatrix.h
===================================================================
--- development/source/main/cFitnessMatrix.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cFitnessMatrix.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -152,6 +152,7 @@
void CalcFitnessMatrix( int depth_limit, double fitness_threshold_ratio, int ham_thresh, double error_rate_min, double error_rate_max, double error_rate_step, double vect_fmax, double vect_fstep, int diag_iters, bool write_ham_vector, bool write_full_vector );
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -159,7 +160,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cGenome.h
===================================================================
--- development/source/main/cGenome.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cGenome.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -57,6 +57,8 @@
int GetSize() const { return active_size; }
cString AsString() const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -64,7 +66,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cGenomeUtil.h
===================================================================
--- development/source/main/cGenomeUtil.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cGenomeUtil.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
static cGenome Cut(const cGenome& genome, int start, int end);
static cGenome Join(const cGenome& genome1, const cGenome& genome2);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cInstLibBase.h
===================================================================
--- development/source/main/cInstLibBase.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cInstLibBase.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -32,6 +32,8 @@
virtual const cInstruction & GetInstDefault() = 0;
virtual const cInstruction & GetInstError() = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -39,7 +41,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cInstSet.h
===================================================================
--- development/source/main/cInstSet.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cInstSet.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -169,6 +169,8 @@
}
// static const cInstruction & GetInstNone() { return inst_none; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -176,7 +178,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/main/cInstUtil.h
===================================================================
--- development/source/main/cInstUtil.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cInstUtil.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -44,6 +44,8 @@
// ========= Genome Construction =========
static cGenome RandomGenome(cAvidaContext& ctx, int length, const cInstSet & inst_set);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -51,7 +53,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cInstruction.h
===================================================================
--- development/source/main/cInstruction.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cInstruction.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
char GetSymbol() const;
void SetSymbol(char symbol);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cLandscape.h
===================================================================
--- development/source/main/cLandscape.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cLandscape.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -199,6 +199,8 @@
inline double GetTotalEntropy() const { return total_entropy; }
inline double GetComplexity() const { return complexity; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -206,7 +208,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cLocalMutations.h
===================================================================
--- development/source/main/cLocalMutations.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cLocalMutations.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -39,6 +39,8 @@
void IncCount(int id) { counts[id]++; }
void IncCount(int id, int num_mut) { counts[id] += num_mut; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -46,7 +48,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cMutation.h
===================================================================
--- development/source/main/cMutation.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cMutation.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -48,6 +48,8 @@
*/
bool operator==(const cMutation &in) const { return &in == this; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -55,7 +57,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cMutationLib.h
===================================================================
--- development/source/main/cMutationLib.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cMutationLib.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
const tArray<cMutation*>& GetMutationArray() const { return mutation_array; }
const tList<cMutation>& GetMutationList(int trigger) const { return trigger_list_array[trigger]; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cMutationRates.h
===================================================================
--- development/source/main/cMutationRates.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cMutationRates.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -94,6 +94,8 @@
void SetCrossoverProb(double in_prob) { divide.crossover_prob = in_prob; }
void SetAlignedCrossProb(double in) { divide.aligned_cross_prob = in; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -101,7 +103,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cMxCodeArray.h
===================================================================
--- development/source/main/cMxCodeArray.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cMxCodeArray.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -113,6 +113,8 @@
double TransitionProbability(const cMxCodeArray &other_gene, double errorRate) const;
void PrintTransitionList(std::ostream& fp, int size) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -120,7 +122,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
cInstruction & cMxCodeArray::operator[](int index)
Modified: development/source/main/cOrgInterface.h
===================================================================
--- development/source/main/cOrgInterface.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cOrgInterface.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -52,6 +52,8 @@
virtual bool InjectParasite(cOrganism* parent, const cGenome& injected_code) = 0;
virtual bool UpdateMerit(double new_merit) = 0;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -59,7 +61,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cOrgMessage.h
===================================================================
--- development/source/main/cOrgMessage.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cOrgMessage.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -39,6 +39,8 @@
void GetData(int & in_data);
void GetData(double & in_data);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -46,7 +48,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cOrgSeqMessage.h
===================================================================
--- development/source/main/cOrgSeqMessage.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cOrgSeqMessage.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -25,6 +25,8 @@
void SetReceived() { m_recvd = true; }
bool GetReceived() { return m_recvd; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -32,7 +34,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cOrgSinkMessage.h
===================================================================
--- development/source/main/cOrgSinkMessage.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cOrgSinkMessage.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -30,6 +30,8 @@
void SetValidated() { m_validated = true; }
bool GetValidated() { return m_validated; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -37,7 +39,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cOrgSourceMessage.h
===================================================================
--- development/source/main/cOrgSourceMessage.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cOrgSourceMessage.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -31,6 +31,8 @@
int GetCorrupted() { return m_corrupt; }
void SetCorrupted() { m_corrupt++; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -38,7 +40,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cOrganism.h
===================================================================
--- development/source/main/cOrganism.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cOrganism.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -261,6 +261,7 @@
void Fault(int fault_loc, int fault_type, cString fault_desc="");
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -268,7 +269,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cPhenotype.h
===================================================================
--- development/source/main/cPhenotype.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cPhenotype.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -281,6 +281,8 @@
bool& ChildFertile() { assert(initialized == true); return child_fertile; }
bool& IsMultiThread() { assert(initialized == true); return is_multi_thread; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -288,7 +290,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cPopulation.h
===================================================================
--- development/source/main/cPopulation.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cPopulation.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -187,6 +187,8 @@
void SetChangeList(cChangeList* change_list);
cChangeList* GetChangeList();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -194,7 +196,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cPopulationCell.h
===================================================================
--- development/source/main/cPopulationCell.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cPopulationCell.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -71,6 +71,8 @@
bool OK();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -78,7 +80,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cPopulationInterface.h
===================================================================
--- development/source/main/cPopulationInterface.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cPopulationInterface.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -61,6 +61,8 @@
bool InjectParasite(cOrganism* parent, const cGenome& injected_code);
bool UpdateMerit(double new_merit);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -68,7 +70,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cReaction.h
===================================================================
--- development/source/main/cReaction.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cReaction.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -63,6 +63,7 @@
double GetValue(int process_num = 0);
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -70,7 +71,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cReactionLib.h
===================================================================
--- development/source/main/cReactionLib.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cReactionLib.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
cReaction* GetReaction(const cString& name) const;
cReaction* GetReaction(int id) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cReactionProcess.h
===================================================================
--- development/source/main/cReactionProcess.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cReactionProcess.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -99,6 +99,8 @@
void SetDetectionError(double _in) { detection_error = _in; }
void SetMatchString(cString _in) { match_string = _in; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -106,7 +108,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cReactionRequisite.h
===================================================================
--- development/source/main/cReactionRequisite.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cReactionRequisite.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -53,6 +53,8 @@
*/
bool operator==(const cReactionRequisite& in) const { return &in == this; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -60,7 +62,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cReactionResult.h
===================================================================
--- development/source/main/cReactionResult.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cReactionResult.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -68,6 +68,8 @@
double GetMultBonus() { return bonus_mult; }
tArray<int>& GetInstArray() { return insts_triggered; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -75,7 +77,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cResource.h
===================================================================
--- development/source/main/cResource.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cResource.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -81,6 +81,8 @@
void SetYDiffuse(double _ydiffuse) { ydiffuse = _ydiffuse; }
void SetYGravity(double _ygravity) { ygravity = _ygravity; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -88,7 +90,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cResourceCount.h
===================================================================
--- development/source/main/cResourceCount.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cResourceCount.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -80,6 +80,8 @@
void ResizeSpatialGrids(int in_x, int in_y);
cSpatialResCount GetSpatialResource(int id) { return spatial_resource_count[id]; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -87,7 +89,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cResourceLib.h
===================================================================
--- development/source/main/cResourceLib.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cResourceLib.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
cResource* GetResource(const cString& res_name) const;
cResource* GetResource(int id) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cSpatialCountElem.h
===================================================================
--- development/source/main/cSpatialCountElem.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cSpatialCountElem.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -37,6 +37,8 @@
friend void FlowMatter(cSpatialCountElem&, cSpatialCountElem&, double, double, double, double,
int, int, double);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -44,7 +46,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cSpatialResCount.h
===================================================================
--- development/source/main/cSpatialResCount.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cSpatialResCount.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -67,6 +67,8 @@
void SetOutflowY1(int in_outflowY1) { outflowY1 = in_outflowY1; }
void SetOutflowY2(int in_outflowY2) { outflowY2 = in_outflowY2; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -74,7 +76,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cStats.h
===================================================================
--- development/source/main/cStats.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cStats.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -549,6 +549,8 @@
void PrintInstructionData(const cString& filename);
void PrintGenotypeMap(const cString& filename);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -556,7 +558,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/main/cTaskContext.h
===================================================================
--- development/source/main/cTaskContext.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cTaskContext.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -38,6 +38,8 @@
{
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -45,7 +47,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cTaskEntry.h
===================================================================
--- development/source/main/cTaskEntry.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cTaskEntry.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -45,6 +45,8 @@
const tTaskTest GetTestFun() const { return m_test_fun; }
const cString & GetInfo() const { return m_info; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -52,7 +54,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/main/cTaskLib.h
===================================================================
--- development/source/main/cTaskLib.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cTaskLib.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -220,6 +220,8 @@
double Task_NetSend(cTaskContext* ctx) const;
double Task_NetReceive(cTaskContext* ctx) const;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -227,7 +229,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/main/cWorld.h
===================================================================
--- development/source/main/cWorld.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/main/cWorld.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -107,6 +107,8 @@
void ReadEventListFile(const cString & filename);
void SyncEventList();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -114,7 +116,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/script/cASLibrary.h
===================================================================
--- development/source/script/cASLibrary.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/script/cASLibrary.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -26,6 +26,8 @@
public:
cASLibrary() { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -33,7 +35,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/script/cASSymbol.h
===================================================================
--- development/source/script/cASSymbol.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/script/cASSymbol.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -24,6 +24,8 @@
public:
cASSymbol(cString name) : m_name(name) { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -31,7 +33,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/script/cParser.h
===================================================================
--- development/source/script/cParser.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/script/cParser.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -40,6 +40,8 @@
cScriptObject* Parse(std::istream* input);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -47,7 +49,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/script/cScriptObject.h
===================================================================
--- development/source/script/cScriptObject.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/script/cScriptObject.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -17,6 +17,8 @@
public:
cScriptObject() { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -24,7 +26,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/script/cSymbolTable.h
===================================================================
--- development/source/script/cSymbolTable.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/script/cSymbolTable.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -26,6 +26,8 @@
public:
cSymbolTable() { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -33,7 +35,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cBarScreen.h
===================================================================
--- development/source/targets/avida-viewer/cBarScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cBarScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -29,6 +29,8 @@
void Update();
void DoInput(int in_char) { (void) in_char; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -36,7 +38,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cBaseTextWindow.h
===================================================================
--- development/source/targets/avida-viewer/cBaseTextWindow.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cBaseTextWindow.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
void Set(int _x, int _y) { x = _x; y = _y; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/targets/avida-viewer/cEnvironmentScreen.h
===================================================================
--- development/source/targets/avida-viewer/cEnvironmentScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cEnvironmentScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -43,6 +43,8 @@
void UpdateResource();
void UpdateReaction();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -50,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cHistScreen.h
===================================================================
--- development/source/targets/avida-viewer/cHistScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cHistScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
void Update();
void DoInput(int in_char);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cMapScreen.h
===================================================================
--- development/source/targets/avida-viewer/cMapScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cMapScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
// Virtual in map screen.
void Navigate();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/targets/avida-viewer/cMenuWindow.h
===================================================================
--- development/source/targets/avida-viewer/cMenuWindow.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cMenuWindow.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -43,6 +43,8 @@
inline void SetActive(int in_id) { active_id = in_id; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -50,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cOptionsScreen.h
===================================================================
--- development/source/targets/avida-viewer/cOptionsScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cOptionsScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -25,6 +25,8 @@
void Update();
void DoInput(int in_char) { (void) in_char; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -32,7 +34,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cScreen.h
===================================================================
--- development/source/targets/avida-viewer/cScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -78,6 +78,8 @@
virtual void DoMouseClick(int x, int y) { (void) x; (void) y; }
virtual void Exit() { ; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -85,7 +87,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/targets/avida-viewer/cStatsScreen.h
===================================================================
--- development/source/targets/avida-viewer/cStatsScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cStatsScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -33,6 +33,8 @@
void Update();
void DoInput(int in_char);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -40,7 +42,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cSymbolUtil.h
===================================================================
--- development/source/targets/avida-viewer/cSymbolUtil.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cSymbolUtil.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -23,6 +23,8 @@
static char GetThreadSymbol(const cPopulationCell & cell);
static char GetLineageSymbol( const cPopulationCell & cell );
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -30,7 +32,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cTextViewerDriver.h
===================================================================
--- development/source/targets/avida-viewer/cTextViewerDriver.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cTextViewerDriver.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -49,6 +49,8 @@
void NotifyComment(const cString& in_string);
void NotifyWarning(const cString& in_string);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -56,7 +58,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cTextWindow.h
===================================================================
--- development/source/targets/avida-viewer/cTextWindow.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cTextWindow.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -133,6 +133,8 @@
wattrset(win_id, COLOR_PAIR(color) | A_BOLD);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -140,7 +142,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cView.h
===================================================================
--- development/source/targets/avida-viewer/cView.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cView.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -88,6 +88,8 @@
// Methods called by sub-windows.
static void Redraw();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -95,7 +97,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/targets/avida-viewer/cViewInfo.h
===================================================================
--- development/source/targets/avida-viewer/cViewInfo.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cViewInfo.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -126,6 +126,8 @@
void SetThreadLock(int in_lock) { thread_lock = in_lock; }
void SetStepOrganism(int in_id) { step_organism_id = in_id; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -133,7 +135,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline void cViewInfo::DecMapMode()
Modified: development/source/targets/avida-viewer/cZoomScreen.h
===================================================================
--- development/source/targets/avida-viewer/cZoomScreen.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/targets/avida-viewer/cZoomScreen.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -129,6 +129,8 @@
// Other misc functions...
void AdvanceUpdate() { memory_offset = 0; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -136,7 +138,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cBlockStruct.h
===================================================================
--- development/source/tools/cBlockStruct.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cBlockStruct.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -229,6 +229,8 @@
inline int GetBlocksUsed() const { return fixed_used.GetBlockNum() + 1; }
inline void SetFixedSize(int in_fs) { fixed_size = in_fs; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -236,7 +238,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline void * cBlockStruct::Find(const cFixedCoords & search_coords) const
Modified: development/source/tools/cConstSchedule.h
===================================================================
--- development/source/tools/cConstSchedule.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cConstSchedule.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -45,6 +45,8 @@
int GetNextID();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -52,7 +54,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cCountTracker.h
===================================================================
--- development/source/tools/cCountTracker.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cCountTracker.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -31,6 +31,8 @@
void Next() { last_count = cur_count; cur_count = 0; }
void Clear() { cur_count = last_count = total_count = 0; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -38,7 +40,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cCycleCheck.h
===================================================================
--- development/source/tools/cCycleCheck.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cCycleCheck.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -65,6 +65,8 @@
*/
~cCycleCheck();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -72,7 +74,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cDataEntry.cc
===================================================================
--- development/source/tools/cDataEntry.cc 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDataEntry.cc 2006-05-02 22:33:15 UTC (rev 633)
@@ -9,6 +9,8 @@
#include "cDataEntry.h"
+#ifdef ENABLE_UNIT_TESTS
+
/*
Unit tests
*/
@@ -95,3 +97,4 @@
}
}
+#endif // ENABLE_UNIT_TESTS
Modified: development/source/tools/cDataEntry.h
===================================================================
--- development/source/tools/cDataEntry.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDataEntry.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -56,6 +56,8 @@
a.ArkvObj("html_table_flags", html_table_flags);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -63,7 +65,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline std::ostream& operator << (std::ostream& out, cDataEntry & entry)
Modified: development/source/tools/cDataFile.h
===================================================================
--- development/source/tools/cDataFile.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDataFile.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -143,6 +143,8 @@
**/
void Flush() { m_fp.flush(); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -150,7 +152,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cDataFileManager.h
===================================================================
--- development/source/tools/cDataFileManager.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDataFileManager.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -66,6 +66,8 @@
**/
bool Remove(const cString& name);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -73,7 +75,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline cDataFileManager::cDataFileManager(cString target_dir) : m_target_dir(target_dir)
Modified: development/source/tools/cDataManager_Base.h
===================================================================
--- development/source/tools/cDataManager_Base.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDataManager_Base.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -39,6 +39,8 @@
bool PrintRow(cDataFile& data_file, cString row_entries, char sep=' ');
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -46,7 +48,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cDefaultMessageDisplay.h
===================================================================
--- development/source/tools/cDefaultMessageDisplay.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDefaultMessageDisplay.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -48,6 +48,8 @@
cDefaultMessageDisplay(std::ostream* stream) : m_out(stream) { ; }
void out(cString& final_msg);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -55,7 +57,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
extern cDefaultMessageDisplay s_info_msg_cout;
Modified: development/source/tools/cDoubleSum.h
===================================================================
--- development/source/tools/cDoubleSum.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cDoubleSum.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -88,6 +88,8 @@
s4 -= w_val * w_val * w_val * w_val;
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -95,7 +97,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cFile.cc
===================================================================
--- development/source/tools/cFile.cc 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cFile.cc 2006-05-02 22:33:15 UTC (rev 633)
@@ -77,6 +77,9 @@
return true;
}
+
+#ifdef ENABLE_UNIT_TESTS
+
/*
Unit tests
*/
@@ -223,3 +226,5 @@
nFileTests::utFile_archiving_closed_file::test();
}
}
+
+#endif // ENABLE_UNIT_TESTS
Modified: development/source/tools/cFile.h
===================================================================
--- development/source/tools/cFile.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cFile.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -153,6 +153,8 @@
a.SplitLoadSave(*this, version);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -160,7 +162,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cFixedBlock.h
===================================================================
--- development/source/tools/cFixedBlock.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cFixedBlock.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -25,6 +25,8 @@
inline int GetStart() { return start_point; }
inline void SetStart(int in_sp) { start_point = in_sp; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -32,7 +34,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cFixedCoords.h
===================================================================
--- development/source/tools/cFixedCoords.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cFixedCoords.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -85,6 +85,8 @@
offset %= fixed_size;
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -92,7 +94,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cGenesis.h
===================================================================
--- development/source/tools/cGenesis.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cGenesis.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -92,6 +92,8 @@
_var = ReadInt(_name, _def.AsInt()) != 0;
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -99,7 +101,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cHelpAlias.h
===================================================================
--- development/source/tools/cHelpAlias.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cHelpAlias.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -33,6 +33,8 @@
bool IsAlias() const { return true; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -40,7 +42,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cHelpEntry.h
===================================================================
--- development/source/tools/cHelpEntry.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cHelpEntry.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -36,6 +36,8 @@
cString GetHTMLFilename() const { return cStringUtil::Stringf("help.%s.html", static_cast<const char*>(GetKeyword())); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -43,7 +45,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cHelpFullEntry.h
===================================================================
--- development/source/tools/cHelpFullEntry.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cHelpFullEntry.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -43,6 +43,8 @@
bool IsAlias() const { return false; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -50,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cHelpManager.h
===================================================================
--- development/source/tools/cHelpManager.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cHelpManager.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -54,6 +54,8 @@
void SetVerbose(bool _verbose = true) { verbose = _verbose; }
bool GetVerbose() const { return verbose; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -61,7 +63,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cHelpType.h
===================================================================
--- development/source/tools/cHelpType.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cHelpType.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -43,6 +43,8 @@
void PrintHTML();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -50,7 +52,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cHistogram.h
===================================================================
--- development/source/tools/cHistogram.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cHistogram.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -55,6 +55,8 @@
inline int GetMaxBin() { return max_bin; }
inline int GetNumBins() { return max_bin - min_bin + 1; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -62,7 +64,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline void cHistogram::Clear()
Modified: development/source/tools/cID.h
===================================================================
--- development/source/tools/cID.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cID.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -42,6 +42,8 @@
bool operator==(const cID &rhs) const { return this == &rhs; }
bool operator!=(const cID &rhs) const { return this != &rhs; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -49,7 +51,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cIndexedBlockStruct.h
===================================================================
--- development/source/tools/cIndexedBlockStruct.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cIndexedBlockStruct.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -104,6 +104,8 @@
else fixed_size = 1;
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -111,7 +113,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
inline int cIndexedBlockStruct::Find(cFixedCoords & search_coords) const
Modified: development/source/tools/cInitFile.cc
===================================================================
--- development/source/tools/cInitFile.cc 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cInitFile.cc 2006-05-02 22:33:15 UTC (rev 633)
@@ -253,6 +253,8 @@
}
+#ifdef ENABLE_UNIT_TESTS
+
/*
Unit tests
*/
@@ -400,3 +402,5 @@
nInitFileTests::utInitFile_archiving_closed_file::test();
}
}
+
+#endif // ENABLE_UNIT_TESTS
Modified: development/source/tools/cInitFile.h
===================================================================
--- development/source/tools/cInitFile.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cInitFile.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -207,6 +207,8 @@
a.ArkvObj("active_line", active_line);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -214,7 +216,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cIntSum.h
===================================================================
--- development/source/tools/cIntSum.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cIntSum.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -79,6 +79,8 @@
s4 -= w_val * w_val * w_val * w_val;
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -86,7 +88,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cIntegratedSchedule.h
===================================================================
--- development/source/tools/cIntegratedSchedule.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cIntegratedSchedule.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -57,6 +57,8 @@
bool OK();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -64,7 +66,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cIntegratedScheduleNode.h
===================================================================
--- development/source/tools/cIntegratedScheduleNode.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cIntegratedScheduleNode.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -82,6 +82,8 @@
inline cIntegratedScheduleNode * GetNext() { return next; }
inline cIntegratedScheduleNode * GetPrev() { return prev; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -89,7 +91,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cMerit.h
===================================================================
--- development/source/tools/cMerit.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cMerit.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -80,6 +80,8 @@
std::ostream& BinaryPrint(std::ostream& os = std::cout) const ;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -87,7 +89,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
std::ostream& operator<<(std::ostream& os, const cMerit & merit);
Modified: development/source/tools/cMessageClass.h
===================================================================
--- development/source/tools/cMessageClass.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cMessageClass.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -34,6 +34,8 @@
private:
bool _configured;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -41,7 +43,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
/*
Modified: development/source/tools/cMessageClosure.h
===================================================================
--- development/source/tools/cMessageClosure.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cMessageClosure.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -90,6 +90,8 @@
private:
void prefix(void);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -97,7 +99,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
/*
Modified: development/source/tools/cMessageDisplay.h
===================================================================
--- development/source/tools/cMessageDisplay.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cMessageDisplay.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -32,6 +32,8 @@
virtual void out(cString &final_msg){}
virtual void abort(){ abort(); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -39,7 +41,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
void setInfoDisplay(cMessageDisplay &info);
Modified: development/source/tools/cMessageType.h
===================================================================
--- development/source/tools/cMessageType.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cMessageType.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -13,17 +13,17 @@
class cMessageClass;
-class cMessageType{
+class cMessageType
+{
public:
- cMessageType(
- const char* type_name,
- cMessageClass& message_class
- );
-public:
const char* m_type_name;
const cMessageClass& m_message_class;
bool m_is_active;
+
+ cMessageType(const char* type_name, cMessageClass& message_class);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -31,7 +31,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cProbSchedule.h
===================================================================
--- development/source/tools/cProbSchedule.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cProbSchedule.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -45,6 +45,8 @@
void Adjust(int item_id, const cMerit& merit);
int GetNextID();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -52,7 +54,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cRandom.cc
===================================================================
--- development/source/tools/cRandom.cc 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cRandom.cc 2006-05-02 22:33:15 UTC (rev 633)
@@ -256,6 +256,8 @@
+#ifdef ENABLE_UNIT_TESTS
+
/*
Unit tests
*/
@@ -413,3 +415,5 @@
utRandom_archiving::test();
}
}
+
+#endif // ENABLE_UNIT_TESTS
Modified: development/source/tools/cRandom.h
===================================================================
--- development/source/tools/cRandom.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cRandom.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -226,6 +226,9 @@
a.ArkvObj("ma", ma);
a.ArkvObj("expRV", expRV);
}
+
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -233,7 +236,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/tools/cRefBlock.h
===================================================================
--- development/source/tools/cRefBlock.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cRefBlock.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -40,6 +40,8 @@
size = in_block.GetSize();
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -47,7 +49,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cRunningAverage.h
===================================================================
--- development/source/tools/cRunningAverage.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cRunningAverage.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -57,6 +57,8 @@
double Ave() const { return Average(); }
double Var() const { return Variance(); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -64,7 +66,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cScaledBlock.h
===================================================================
--- development/source/tools/cScaledBlock.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cScaledBlock.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -45,6 +45,8 @@
size = in_block.GetSize();
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -52,7 +54,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cSchedule.h
===================================================================
--- development/source/tools/cSchedule.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cSchedule.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -44,6 +44,8 @@
void SetSize(int _item_count);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -51,7 +53,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cString.cc
===================================================================
--- development/source/tools/cString.cc 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cString.cc 2006-05-02 22:33:15 UTC (rev 633)
@@ -645,6 +645,7 @@
}
+#ifdef ENABLE_UNIT_TESTS
/*
Unit tests
@@ -844,3 +845,5 @@
utString_archiving::test();
}
}
+
+#endif // ENABLE_UNIT_TESTS
Modified: development/source/tools/cString.h
===================================================================
--- development/source/tools/cString.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cString.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -573,6 +573,8 @@
// }}} End Internals
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -580,7 +582,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/tools/cStringIterator.h
===================================================================
--- development/source/tools/cStringIterator.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cStringIterator.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -45,6 +45,8 @@
bool AtRoot() const { return list_it.AtRoot(); }
bool AtEnd() const { return list_it.AtEnd(); }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -52,7 +54,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cStringList.cc
===================================================================
--- development/source/tools/cStringList.cc 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cStringList.cc 2006-05-02 22:33:15 UTC (rev 633)
@@ -73,6 +73,8 @@
}
+#ifdef ENABLE_UNIT_TESTS
+
/*
Unit tests
*/
@@ -186,3 +188,5 @@
nStringListTests::utStringList_archiving::test();
}
}
+
+#endif // ENABLE_UNIT_TESTS
Modified: development/source/tools/cStringList.h
===================================================================
--- development/source/tools/cStringList.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cStringList.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -72,6 +72,8 @@
a.ArkvObj("string_list", string_list);
}
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -79,7 +81,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cStringUtil.h
===================================================================
--- development/source/tools/cStringUtil.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cStringUtil.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -60,6 +60,8 @@
static cString Convert(int in_int);
static cString Convert(double in_double);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -67,7 +69,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cThread.h
===================================================================
--- development/source/tools/cThread.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cThread.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -38,6 +38,8 @@
void Stop();
void Join();
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -45,7 +47,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cTools.h
===================================================================
--- development/source/tools/cTools.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cTools.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -25,6 +25,8 @@
public:
static bool MkDir(const cString& dirname, bool verbose=false);
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -32,7 +34,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cUInt.h
===================================================================
--- development/source/tools/cUInt.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cUInt.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -189,6 +189,7 @@
}
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -196,7 +197,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
Modified: development/source/tools/cVerifierSuiteRecurser.h
===================================================================
--- development/source/tools/cVerifierSuiteRecurser.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cVerifierSuiteRecurser.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -44,6 +44,8 @@
public:
cCycleCheck m_cyck;
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -51,7 +53,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
Modified: development/source/tools/cWeightedIndex.h
===================================================================
--- development/source/tools/cWeightedIndex.h 2006-05-02 17:12:51 UTC (rev 632)
+++ development/source/tools/cWeightedIndex.h 2006-05-02 22:33:15 UTC (rev 633)
@@ -50,6 +50,8 @@
int GetLeftChild(int id) { return 2*id + 1; }
int GetRightChild(int id) { return 2*id + 2; }
+
+#ifdef ENABLE_UNIT_TESTS
public:
/**
* Run unit tests
@@ -57,7 +59,7 @@
* @param full Run full test suite; if false, just the fast tests.
**/
static void UnitTests(bool full = false);
-
+#endif
};
#endif
More information about the Avida-cvs
mailing list