[Avida-SVN] r2713 - in branches/uml-merge: Avida.xcodeproj source source/main source/orchid
hjg at myxo.css.msu.edu
hjg at myxo.css.msu.edu
Mon Jul 7 06:02:59 PDT 2008
Author: hjg
Date: 2008-07-07 09:02:59 -0400 (Mon, 07 Jul 2008)
New Revision: 2713
Modified:
branches/uml-merge/Avida.xcodeproj/project.pbxproj
branches/uml-merge/source/defs.h
branches/uml-merge/source/main/cAvidaConfig.h
branches/uml-merge/source/main/cBirthChamber.cc
branches/uml-merge/source/orchid/cOrchidFactory.cc
branches/uml-merge/source/orchid/cOrchidFactory.h
Log:
added BuildOrchidOrganism implementation.
Modified: branches/uml-merge/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/uml-merge/Avida.xcodeproj/project.pbxproj 2008-07-04 09:32:46 UTC (rev 2712)
+++ branches/uml-merge/Avida.xcodeproj/project.pbxproj 2008-07-07 13:02:59 UTC (rev 2713)
@@ -434,7 +434,7 @@
42777E5B0C7F123600AFA4ED /* cOrgMessage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cOrgMessage.h; sourceTree = "<group>"; };
42948E3F0E1276BC000BEEDE /* cOrchidOrganism.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cOrchidOrganism.h; sourceTree = "<group>"; };
42948E400E1276BC000BEEDE /* cOrchidPopulation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cOrchidPopulation.h; sourceTree = "<group>"; };
- 42948E4C0E1278A2000BEEDE /* cOrchidFactory.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cOrchidFactory.cc; sourceTree = "<group>"; };
+ 42948E4C0E1278A2000BEEDE /* cOrchidFactory.cc */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = cOrchidFactory.cc; sourceTree = "<group>"; tabWidth = 2; usesTabs = 1; };
42948E510E127A18000BEEDE /* cOrchidOrganism.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cOrchidOrganism.cc; sourceTree = "<group>"; };
5629D80D0C3EE13500C5F152 /* cTextWindow.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTextWindow.cc; sourceTree = "<group>"; };
5629D80E0C3EE13500C5F152 /* cTextWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cTextWindow.h; sourceTree = "<group>"; };
@@ -456,7 +456,7 @@
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>"; };
7013846009028B3E0087ED2E /* cAvidaConfig.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cAvidaConfig.cc; sourceTree = "<group>"; };
- 701384A10902A16F0087ED2E /* defs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; };
+ 701384A10902A16F0087ED2E /* defs.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = defs.h; sourceTree = "<group>"; tabWidth = 2; usesTabs = 1; };
70166B8D0B519CFE009533A5 /* cTaskState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cTaskState.h; sourceTree = "<group>"; };
701D51CB09C645F50009B4F8 /* cAvidaContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cAvidaContext.h; sourceTree = "<group>"; };
701D9116094B773E008B845F /* cWorldDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cWorldDriver.h; sourceTree = "<group>"; };
@@ -1948,7 +1948,6 @@
DCC30C4D0762532C008F7A48 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
- compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 0;
mainGroup = DCC30C490762532C008F7A48;
productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;
Modified: branches/uml-merge/source/defs.h
===================================================================
--- branches/uml-merge/source/defs.h 2008-07-04 09:32:46 UTC (rev 2712)
+++ branches/uml-merge/source/defs.h 2008-07-07 13:02:59 UTC (rev 2713)
@@ -89,7 +89,7 @@
HARDWARE_TYPE_CPU_TRANSSMT,
HARDWARE_TYPE_CPU_EXPERIMENTAL,
HARDWARE_TYPE_CPU_GX,
- HARDWARE_TYPE_CPU_ORCHID
+ HARDWARE_TYPE_CPU_ORCHID
};
enum eTIMESLICE
Modified: branches/uml-merge/source/main/cAvidaConfig.h
===================================================================
--- branches/uml-merge/source/main/cAvidaConfig.h 2008-07-04 09:32:46 UTC (rev 2712)
+++ branches/uml-merge/source/main/cAvidaConfig.h 2008-07-07 13:02:59 UTC (rev 2713)
@@ -281,7 +281,7 @@
CONFIG_ADD_VAR(WORLD_Y, int, 60, "Height of the Avida world");
CONFIG_ADD_VAR(WORLD_GEOMETRY, int, 2, "1 = Bounded Grid\n2 = Torus\n3 = Clique");
CONFIG_ADD_VAR(RANDOM_SEED, int, 0, "Random number seed (0 for based on time)");
- CONFIG_ADD_VAR(HARDWARE_TYPE, int, 0, "0 = Original CPUs\n1 = New SMT CPUs\n2 = Transitional SMT\n3 = Experimental CPU\n4 = Gene Expression CPU");
+ CONFIG_ADD_VAR(HARDWARE_TYPE, int, 0, "0 = Original CPUs\n1 = New SMT CPUs\n2 = Transitional SMT\n3 = Experimental CPU\n4 = Gene Expression CPU\n5 = Orchid CPU");
CONFIG_ADD_VAR(SPECULATIVE, bool, 1, "Enable speculative execution");
CONFIG_ADD_VAR(BCAST_HOPS, int, 1, "Number of hops to broadcast an alarm");
CONFIG_ADD_VAR(ALARM_SELF, bool, 0, "Does sending an alarm move sender IP to alarm label?\n0=no\n1=yes");
Modified: branches/uml-merge/source/main/cBirthChamber.cc
===================================================================
--- branches/uml-merge/source/main/cBirthChamber.cc 2008-07-04 09:32:46 UTC (rev 2712)
+++ branches/uml-merge/source/main/cBirthChamber.cc 2008-07-07 13:02:59 UTC (rev 2713)
@@ -184,7 +184,7 @@
// If we're using Orchid, we have to build that facet of the organism:
if(m_world->GetConfig().ENABLE_ORCHID.Get()) {
- child_array[0]->SetOrchidOrganism(cOrchidFactory::BuildOrchidOrganism(parent.GetOrchidOrganism()));
+ child_array[0]->SetOrchidOrganism(cOrchidFactory::BuildOrchidOrganism(parent.GetOrchidOrganism(), m_world));
}
return true;
Modified: branches/uml-merge/source/orchid/cOrchidFactory.cc
===================================================================
--- branches/uml-merge/source/orchid/cOrchidFactory.cc 2008-07-04 09:32:46 UTC (rev 2712)
+++ branches/uml-merge/source/orchid/cOrchidFactory.cc 2008-07-07 13:02:59 UTC (rev 2713)
@@ -11,16 +11,23 @@
NOTE: I suspect that parent will be null for the ancestor... not sure about this.
*/
-cOrchidOrganism* cOrchidFactory::BuildOrchidOrganism(cOrchidOrganism* parent)
+cOrchidOrganism* cOrchidFactory::BuildOrchidOrganism(cOrchidOrganism* parent, cWorld* world)
{
- // This code used to live in cBirthChamber:
+
+ cOrchidOrganism* child = new cOrchidOrganism(world);
+
+ // Initialize the child with its parents information...
+
+ child->SetParentXMI(parent->GetUMLModel()->GetXMI());
+ child->SetParentBonus(parent->GetParentBonus());
+ child->SetParentScenarioCompletion(parent->GetUMLModel()->GetScenarioCompletion());
// For orchid -- provides the offspring with information about its parent's model.
// child_array[0]->SetParentXMI(parent.GetUMLModel()->GetXMI());
// child_array[0]->SetParentBonus(parent.GetParentBonus());
// child_array[0]->SetParentScenarioCompletion(parent.GetUMLModel()->GetScenarioCompletion());
- return 0;
+ return child;
}
Modified: branches/uml-merge/source/orchid/cOrchidFactory.h
===================================================================
--- branches/uml-merge/source/orchid/cOrchidFactory.h 2008-07-04 09:32:46 UTC (rev 2712)
+++ branches/uml-merge/source/orchid/cOrchidFactory.h 2008-07-07 13:02:59 UTC (rev 2713)
@@ -11,7 +11,7 @@
{
public:
//! Build an OrchidOrganism from its parent.
- static cOrchidOrganism* BuildOrchidOrganism(cOrchidOrganism* parent);
+ static cOrchidOrganism* BuildOrchidOrganism(cOrchidOrganism* parent, cWorld* world);
//! Build an OrchidPopulation.
static cOrchidPopulation* BuildOrchidPopulation(const cWorld* world);
};
More information about the Avida-cvs
mailing list