[Avida-cvs] [avida-svn] r868 - in development: Avida.xcodeproj documentation/notes source/actions source/event
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed Aug 9 12:23:28 PDT 2006
Author: brysonda
Date: 2006-08-09 15:23:27 -0400 (Wed, 09 Aug 2006)
New Revision: 868
Added:
development/source/actions/EnvironmentActions.cc
development/source/actions/EnvironmentActions.h
Modified:
development/Avida.xcodeproj/project.pbxproj
development/documentation/notes/release-milestones.txt
development/source/actions/CMakeLists.txt
development/source/actions/LandscapeActions.cc
development/source/actions/SConscript
development/source/actions/cActionLibrary.cc
development/source/event/cEventManager.cc
Log:
Add in stub for Environment actions.
Add topology manager into 2.7 milestones listing.
Add comment regarding the experimental nature of Mutational Neighborhood into the output file.
Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj 2006-08-09 19:06:31 UTC (rev 867)
+++ development/Avida.xcodeproj/project.pbxproj 2006-08-09 19:23:27 UTC (rev 868)
@@ -82,6 +82,9 @@
7054A1B609A810CB00038658 /* cAnalyzeJobWorker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7054A1B409A810CB00038658 /* cAnalyzeJobWorker.cc */; };
7054A1B809A810CB00038658 /* cAnalyzeJobWorker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7054A1B409A810CB00038658 /* cAnalyzeJobWorker.cc */; };
7054A1BA09A810CB00038658 /* cAnalyzeJobWorker.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7054A1B409A810CB00038658 /* cAnalyzeJobWorker.cc */; };
+ 705ABB3C0A8A6B3D00A6A80E /* EnvironmentActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 705ABB180A8A6A6000A6A80E /* EnvironmentActions.cc */; };
+ 705ABB3D0A8A6B4100A6A80E /* EnvironmentActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 705ABB180A8A6A6000A6A80E /* EnvironmentActions.cc */; };
+ 705ABB3E0A8A6B4400A6A80E /* EnvironmentActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 705ABB180A8A6A6000A6A80E /* EnvironmentActions.cc */; };
705ACD4F0A13FED5002D5BA0 /* PrintActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 705ACD4D0A13FED4002D5BA0 /* PrintActions.cc */; };
705ACD630A1403A5002D5BA0 /* PrintActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 705ACD4D0A13FED4002D5BA0 /* PrintActions.cc */; };
705ACD640A1403AA002D5BA0 /* PrintActions.cc in Sources */ = {isa = PBXBuildFile; fileRef = 705ACD4D0A13FED4002D5BA0 /* PrintActions.cc */; };
@@ -541,6 +544,8 @@
705788700A21FE8D00E85D8E /* cFixedCoords.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cFixedCoords.cc; sourceTree = "<group>"; };
705788710A21FE8D00E85D8E /* nTemplateTests.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nTemplateTests.cc; sourceTree = "<group>"; };
705788720A21FE8D00E85D8E /* nTemplateTests.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nTemplateTests.h; sourceTree = "<group>"; };
+ 705ABB170A8A6A6000A6A80E /* EnvironmentActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentActions.h; sourceTree = "<group>"; };
+ 705ABB180A8A6A6000A6A80E /* EnvironmentActions.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentActions.cc; sourceTree = "<group>"; };
705ACD4C0A13FED4002D5BA0 /* PrintActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintActions.h; sourceTree = "<group>"; };
705ACD4D0A13FED4002D5BA0 /* PrintActions.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrintActions.cc; sourceTree = "<group>"; };
70658C59085DF67D00486BED /* libncurses.5.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.5.4.dylib; path = /usr/lib/libncurses.5.4.dylib; sourceTree = "<absolute>"; };
@@ -829,7 +834,7 @@
70DCAC77097AF730002F8733 /* key_chart */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = key_chart; sourceTree = "<group>"; };
70DCAC78097AF730002F8733 /* viewer.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = viewer.cc; sourceTree = "<group>"; };
70DCAC9B097AF7C0002F8733 /* primitive.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = primitive.cc; sourceTree = "<group>"; };
- 70DCAD1C097AF7CC002F8733 /* avida-s */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "avida-s"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 70DCAD1C097AF7CC002F8733 /* avida-s */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = "avida-s"; sourceTree = BUILT_PRODUCTS_DIR; };
70DCAD1F097AF81A002F8733 /* AvidaScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AvidaScript.h; sourceTree = "<group>"; };
70DCAD20097AF81A002F8733 /* cLexer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cLexer.h; sourceTree = "<group>"; };
70DCAD21097AF81A002F8733 /* cLexer.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; path = cLexer.l; sourceTree = "<group>"; };
@@ -1023,6 +1028,8 @@
70C054C90A4F6E19002703C1 /* PopulationActions.cc */,
704ADBC30A6EEFC300666970 /* DriverActions.h */,
704ADBC40A6EEFC300666970 /* DriverActions.cc */,
+ 705ABB170A8A6A6000A6A80E /* EnvironmentActions.h */,
+ 705ABB180A8A6A6000A6A80E /* EnvironmentActions.cc */,
);
path = actions;
sourceTree = "<group>";
@@ -1936,6 +1943,7 @@
709D924E0A5D950E00D6A163 /* cMutationalNeighborhood.cc in Sources */,
7049F2DB0A66859F00640512 /* cHardwareTransSMT.cc in Sources */,
704ADBC80A6EEFC300666970 /* DriverActions.cc in Sources */,
+ 705ABB3E0A8A6B4400A6A80E /* EnvironmentActions.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2067,6 +2075,7 @@
709D924D0A5D950E00D6A163 /* cMutationalNeighborhood.cc in Sources */,
7049F2DA0A66859B00640512 /* cHardwareTransSMT.cc in Sources */,
704ADBC60A6EEFC300666970 /* DriverActions.cc in Sources */,
+ 705ABB3D0A8A6B4100A6A80E /* EnvironmentActions.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -2179,6 +2188,7 @@
709D924C0A5D950D00D6A163 /* cMutationalNeighborhood.cc in Sources */,
7049F2D90A66859700640512 /* cHardwareTransSMT.cc in Sources */,
704ADBF90A6EF3A300666970 /* DriverActions.cc in Sources */,
+ 705ABB3C0A8A6B3D00A6A80E /* EnvironmentActions.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: development/documentation/notes/release-milestones.txt
===================================================================
--- development/documentation/notes/release-milestones.txt 2006-08-09 19:06:31 UTC (rev 867)
+++ development/documentation/notes/release-milestones.txt 2006-08-09 19:23:27 UTC (rev 868)
@@ -68,6 +68,7 @@
+ Transition all applicable output files to cDataFile objects, as opposed to raw ostream
+ Serialization
- environment named regions
+- Topology manager
- Schedulable object framework (organism threads scheduled rather than organisms, events, etc.)
- Energy model
+ AvidaScript (AS) lexer
Modified: development/source/actions/CMakeLists.txt
===================================================================
--- development/source/actions/CMakeLists.txt 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/actions/CMakeLists.txt 2006-08-09 19:23:27 UTC (rev 868)
@@ -3,6 +3,7 @@
SET(libactions_a_SOURCES
cActionLibrary.cc
DriverActions.cc
+ EnvironmentActions.cc
LandscapeActions.cc
PopulationActions.cc
PrintActions.cc
Added: development/source/actions/EnvironmentActions.cc
===================================================================
--- development/source/actions/EnvironmentActions.cc 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/actions/EnvironmentActions.cc 2006-08-09 19:23:27 UTC (rev 868)
@@ -0,0 +1,18 @@
+/*
+ * EnvironmentActions.cc
+ * Avida
+ *
+ * Created by David Bryson on 8/9/06.
+ * Copyright 2006 Michigan State University. All rights reserved.
+ *
+ */
+
+#include "EnvironmentActions.h"
+
+#include "cAction.h"
+#include "cActionLibrary.h"
+
+
+void RegisterEnvironmentActions(cActionLibrary* action_lib)
+{
+}
Added: development/source/actions/EnvironmentActions.h
===================================================================
--- development/source/actions/EnvironmentActions.h 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/actions/EnvironmentActions.h 2006-08-09 19:23:27 UTC (rev 868)
@@ -0,0 +1,17 @@
+/*
+ * EnvironmentActions.h
+ * Avida
+ *
+ * Created by David Bryson on 8/9/06.
+ * Copyright 2006 Michigan State University. All rights reserved.
+ *
+ */
+
+#ifndef EnvironmentActions_h
+#define EnvironmentActions_h
+
+class cActionLibrary;
+
+void RegisterEnvironmentActions(cActionLibrary* action_lib);
+
+#endif
Modified: development/source/actions/LandscapeActions.cc
===================================================================
--- development/source/actions/LandscapeActions.cc 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/actions/LandscapeActions.cc 2006-08-09 19:23:27 UTC (rev 868)
@@ -854,6 +854,8 @@
cMutationalNeighborhoodResults* results = NULL;
sBatchEntry* entry = NULL;
cDataFile& df = m_world->GetDataFile(m_filename);
+ df.WriteComment("IMPORTANT: Mutational Neighborhood is *EXPERIMENTAL*");
+ df.WriteComment("Output data and format is subject to change in future releases.");
while (entry = m_batch.Pop()) {
results = new cMutationalNeighborhoodResults(entry->mutn);
results->PrintStats(df, entry->depth);
Modified: development/source/actions/SConscript
===================================================================
--- development/source/actions/SConscript 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/actions/SConscript 2006-08-09 19:23:27 UTC (rev 868)
@@ -7,6 +7,7 @@
'cAction.h',
'cActionLibrary.h',
'DriverActions.h',
+ 'EnvironmentActions.h',
'LandscapeActions.h',
'PopulationActions.h',
'PrintActions.h',
@@ -16,6 +17,7 @@
srcs = [
'cActionLibrary.cc',
'DriverActions.cc',
+ 'EnvironmentActions.cc',
'LandscapeActions.cc',
'PopulationActions.cc',
'PrintActions.cc',
Modified: development/source/actions/cActionLibrary.cc
===================================================================
--- development/source/actions/cActionLibrary.cc 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/actions/cActionLibrary.cc 2006-08-09 19:23:27 UTC (rev 868)
@@ -10,6 +10,7 @@
#include "cActionLibrary.h"
#include "DriverActions.h"
+#include "EnvironmentActions.h"
#include "LandscapeActions.h"
#include "PopulationActions.h"
#include "PrintActions.h"
@@ -21,6 +22,7 @@
cActionLibrary* actlib = new cActionLibrary();
RegisterDriverActions(actlib);
+ RegisterEnvironmentActions(actlib);
RegisterLandscapeActions(actlib);
RegisterPopulationActions(actlib);
RegisterPrintActions(actlib);
Modified: development/source/event/cEventManager.cc
===================================================================
--- development/source/event/cEventManager.cc 2006-08-09 19:06:31 UTC (rev 867)
+++ development/source/event/cEventManager.cc 2006-08-09 19:23:27 UTC (rev 868)
@@ -777,6 +777,7 @@
cEventManager::cEventManager(cWorld* world) : m_world(world)
{
+ // Population events --> Population Actions
REGISTER(compete_demes);
REGISTER(reset_demes);
REGISTER(print_deme_stats);
@@ -788,6 +789,8 @@
REGISTER(join_grid_row);
REGISTER(connect_cells);
REGISTER(disconnect_cells);
+
+ // Environment events --> Environment Action
REGISTER(inject_resource);
REGISTER(set_resource);
REGISTER(inject_scaled_resource);
More information about the Avida-cvs
mailing list