[Avida-cvs] [Avida2-svn] r267 - in branches/brysonda: Avida2.xcodeproj CMakeModules source/bindings/Boost.Python source/python/AvidaGui2
brysonda@myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed Jul 27 08:33:45 PDT 2005
Author: brysonda
Date: 2005-07-27 11:33:45 -0400 (Wed, 27 Jul 2005)
New Revision: 267
Removed:
branches/brysonda/source/bindings/Boost.Python/event_factory.pyste
Modified:
branches/brysonda/Avida2.xcodeproj/project.pbxproj
branches/brysonda/CMakeModules/AddPysteModule.cmake
branches/brysonda/source/bindings/Boost.Python/CMakeLists.txt
branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.cc
branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.hh
branches/brysonda/source/bindings/Boost.Python/event_factory_manager.pyste
branches/brysonda/source/bindings/Boost.Python/tList.pyste
branches/brysonda/source/python/AvidaGui2/pyAvida.py
Log:
Changes to pyste files to accomodate AvidaCore changes.
Modified: branches/brysonda/Avida2.xcodeproj/project.pbxproj
===================================================================
--- branches/brysonda/Avida2.xcodeproj/project.pbxproj 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/Avida2.xcodeproj/project.pbxproj 2005-07-27 15:33:45 UTC (rev 267)
@@ -598,6 +598,7 @@
70CD47EE089692AE0070D2DF /* test_cpu-fixups.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = "test_cpu-fixups.hh"; sourceTree = "<group>"; };
70CD47EF089692AE0070D2DF /* tVector_instantiations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tVector_instantiations.hh; sourceTree = "<group>"; };
70CD47F0089692AE0070D2DF /* tVector.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tVector.pyste; sourceTree = "<group>"; };
+ 70CD482C089702880070D2DF /* Avida-ED-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Avida-ED-Info.plist"; sourceTree = "<group>"; };
DCC30D300762539B008F7A48 /* 4stack_head.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = 4stack_head.pyste; sourceTree = "<group>"; };
DCC30D310762539B008F7A48 /* A.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = A.hh; sourceTree = "<group>"; };
DCC30D320762539B008F7A48 /* A.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = A.pyste; sourceTree = "<group>"; };
@@ -677,7 +678,6 @@
DCC30EF50762539D008F7A48 /* double_sum.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = double_sum.pyste; sourceTree = "<group>"; };
DCC30EF60762539D008F7A48 /* environment.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.pyste; sourceTree = "<group>"; };
DCC30EF70762539D008F7A48 /* event.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event.pyste; sourceTree = "<group>"; };
- DCC30EF80762539D008F7A48 /* event_factory.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_factory.pyste; sourceTree = "<group>"; };
DCC30EF90762539D008F7A48 /* event_factory_manager.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_factory_manager.pyste; sourceTree = "<group>"; };
DCC30EFA0762539D008F7A48 /* event_list.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_list.pyste; sourceTree = "<group>"; };
DCC30EFB0762539D008F7A48 /* event_list_entry.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_list_entry.pyste; sourceTree = "<group>"; };
@@ -1673,6 +1673,7 @@
DCC3164E07626CF3008F7A48 /* Products */,
70658C59085DF67D00486BED /* libncurses.5.4.dylib */,
703F684207B437B800C1CA76 /* status.xml */,
+ 70CD482C089702880070D2DF /* Avida-ED-Info.plist */,
);
sourceTree = "<group>";
};
@@ -1784,7 +1785,6 @@
DCC30EF50762539D008F7A48 /* double_sum.pyste */,
DCC30EF60762539D008F7A48 /* environment.pyste */,
DCC30EF70762539D008F7A48 /* event.pyste */,
- DCC30EF80762539D008F7A48 /* event_factory.pyste */,
DCC30EF90762539D008F7A48 /* event_factory_manager.pyste */,
DCC30EFA0762539D008F7A48 /* event_list.pyste */,
DCC30EFB0762539D008F7A48 /* event_list_entry.pyste */,
@@ -2936,6 +2936,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 700E2B7E085DE50C00CF158A /* Build configuration list for PBXNativeTarget "viewer" */;
buildPhases = (
+ 70CD485A08971DE50070D2DF /* ShellScript */,
700E2AF4085DE50C00CF158A /* Sources */,
700E2B6C085DE50C00CF158A /* Frameworks */,
700E2B6D085DE50C00CF158A /* CopyFiles */,
@@ -3032,6 +3033,22 @@
};
/* End PBXProject section */
+/* Begin PBXShellScriptBuildPhase section */
+ 70CD485A08971DE50070D2DF /* ShellScript */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "printenv\n";
+ };
+/* End PBXShellScriptBuildPhase section */
+
/* Begin PBXSourcesBuildPhase section */
700E2AF4085DE50C00CF158A /* Sources */ = {
isa = PBXSourcesBuildPhase;
Modified: branches/brysonda/CMakeModules/AddPysteModule.cmake
===================================================================
--- branches/brysonda/CMakeModules/AddPysteModule.cmake 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/CMakeModules/AddPysteModule.cmake 2005-07-27 15:33:45 UTC (rev 267)
@@ -2,7 +2,6 @@
INCLUDE_DIRECTORIES(${BOOST_INCLUDE_PATH} ${PYTHON_INCLUDE_PATH})
INCLUDE_DIRECTORIES(${ALL_INC_DIRS} ${PROJECT_SOURCE_DIR}/source/third-party/yaktest)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-#LINK_DIRECTORIES(${PY_BOOST_LIBRARIES})
IF(APPLE)
SET(BOOST_PYTHON_COMPILE_FLAGS "-no-cpp-precomp -ftemplate-depth-120 -fno-inline -fPIC -Wno-long-double -Wno-long-long -DBOOST_PYTHON_DYNAMIC_LIB")
@@ -31,10 +30,7 @@
#XXX
FOREACH(Entry ${${PysteBases}})
STRING(REGEX REPLACE "(.*)::(.*)" "\\1" PysteBase ${Entry})
- #STRING(REGEX REPLACE "(.*)::(.*)" "\\2" DepList ${Entry})
SET(${ModuleName}_CppFiles ${${ModuleName}_CppFiles} ${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/_${PysteBase}.cpp)
- #FILE(GLOB tmpfile "${PROJECT_SOURCE_DIR}/source/*/${PysteBase}.hh")
- #MESSAGE("found \"${PysteBase}.hh\" at \"${tmpfile}\".")
ENDFOREACH(Entry ${${PysteBases}})
SET(${ModuleName}_CppFiles ${${ModuleName}_CppFiles} ${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/_main.cpp)
@@ -57,20 +53,6 @@
ENDIF(${ExtraDepends})
#
- # A list of dummy cpp source files used as dependencies for
- # corresponding pyste files. Each of the dummy cpp files includes the
- # headers required by the corresponding pyste files.
- #
- # I couldn't think of any easier ways to trigger dependency tracking
- # for the pyste files.
- #
- #SET(Dummy_${ModuleName}_CppFiles)
- #FOREACH(PysteBase ${${PysteBases}})
- # SET(Dummy_${ModuleName}_CppFiles ${Dummy_${ModuleName}_CppFiles} ${CMAKE_CURRENT_SOURCE_DIR}/dummy_${PysteBase}.cc)
- #ENDFOREACH(PysteBase ${${PysteBases}})
- #ADD_LIBRARY(Dummy_${ModuleName} MODULE ${Dummy_${ModuleName}_CppFiles})
-
- #
# Make a list of pyste source files to parse, and for each such file, add the parsing command that produces the
# corresponding cpp source file.
#
@@ -78,8 +60,6 @@
SET(${ModuleName}_PysteCacheFiles)
#XXX
FOREACH(Entry ${${PysteBases}})
- #STRING(REGEX REPLACE "(.*)::" "\\1" PysteBase ${Entry})
- #STRING(REGEX REPLACE "::(.*)" "\\1" Args ${Entry})
STRING(REGEX REPLACE "(.*)::(.*)" "\\1" PysteBase ${Entry})
STRING(REGEX REPLACE "(.*)::(.*)" "\\2" Args ${Entry})
IF(Args)
@@ -94,12 +74,7 @@
${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/${PysteBase}.pystec)
FILE(GLOB HeaderFile "${PROJECT_SOURCE_DIR}/source/*/${PysteBase}.hh")
FILE(GLOB ThirdPartyHeaderFile "${PROJECT_SOURCE_DIR}/source/*/*/${PysteBase}.hh")
- #MESSAGE("\"${PysteBase}.hh\" dependencies :")
- #MESSAGE("...\"${HeaderFile}\"")
SET(DepList ${HeaderFile} ${ThirdPartyHeaderFile} ${DepList})
- #FOREACH(Dep ${DepList})
- # MESSAGE(" \"${Dep}\"")
- #ENDFOREACH(Dep ${DepList})
ADD_CUSTOM_COMMAND(COMMENT "${PysteBase} pyste cache file..."
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ModuleName}/${PysteBase}.pystec
@@ -207,12 +182,7 @@
FILE(GLOB HeaderFile "${PROJECT_SOURCE_DIR}/source/*/${PysteBase}.hh")
FILE(GLOB ThirdPartyHeaderFile "${PROJECT_SOURCE_DIR}/source/*/*/${PysteBase}.hh")
- #MESSAGE("\"${PysteBase}.hh\" dependencies :")
- #MESSAGE("...\"${HeaderFile}\"")
SET(DepList ${HeaderFile} ${ThirdPartyHeaderFile} ${DepList})
- #FOREACH(Dep ${DepList})
- # MESSAGE(" \"${Dep}\"")
- #ENDFOREACH(Dep ${DepList})
ADD_CUSTOM_COMMAND(COMMENT "${PysteBase} pyste cache file..."
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PysteBase}.pystec
@@ -256,8 +226,4 @@
INSTALL_TARGETS(${PackageLocation}/${ModuleName} $${ModuleName}/${PysteBase})
FILE(APPEND ${LIBRARY_OUTPUT_PATH}/${ModuleName}/__init__.py "from ${PysteBase} import *\n")
ENDFOREACH(Entry ${${PysteBases}})
- #FOREACH(Entry ${${PysteBases}})
- # STRING(REGEX REPLACE "(.*)::(.*)" "\\1" PysteBase ${Entry})
- # FILE(APPEND ${LIBRARY_OUTPUT_PATH}/${ModuleName}/__init__.py "del(${PysteBase})\n")
- #ENDFOREACH(Entry ${${PysteBases}})
ENDMACRO(ADD_PYSTE_PACKAGE)
Modified: branches/brysonda/source/bindings/Boost.Python/CMakeLists.txt
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/CMakeLists.txt 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/bindings/Boost.Python/CMakeLists.txt 2005-07-27 15:33:45 UTC (rev 267)
@@ -27,45 +27,16 @@
)
ENDFOREACH(PY_TEST_SUITE)
-#
-# kaben-brainstorms.
-#
-#SET(libkaben_brainstorms_SOURCES kaben_brainstorms.cc)
-#SET_SOURCE_FILES_PROPERTIES(${libkaben_brainstorms_SOURCES} PROPERTIES COMPILE_FLAGS ${BOOST_PYTHON_COMPILE_FLAGS})
-#ADD_LIBRARY(kaben_brainstorms MODULE ${libkaben_brainstorms_SOURCES})
-#SET_TARGET_PROPERTIES(kaben_brainstorms PROPERTIES PREFIX "")
-#TARGET_LINK_LIBRARIES(kaben_brainstorms main cpu event main tools ${BOOST_LIBRARY} ${PYTHON_LIBRARY})
-
#
# A test of python packaging.
#
SET(PyAvida_Pyste_Bases
- #A::${CMAKE_CURRENT_SOURCE_DIR}/A.hh:
- #B::${CMAKE_CURRENT_SOURCE_DIR}/B.hh:
- # XXX : cCallbackUtil is used by taking pointers to its member functions. Doesn't play well with Python; don't wrap it.
- #callback_util::
- # XXX : cBlockStruct is designed for use with raw pointers, and won't play well with Python. Hence, don't wrap it.
- #block_struct::
- # XXX : cScaledBlock is designed for use with raw pointers, and won't play well with Python. Hence, don't wrap it.
- #scaled_block::
-
# XXX I can't figure out how it works.
tArray::${CMAKE_CURRENT_SOURCE_DIR}/organism.pyste:${CMAKE_CURRENT_SOURCE_DIR}/merit.pyste:${CMAKE_CURRENT_SOURCE_DIR}/mutation.pyste:${CMAKE_CURRENT_SOURCE_DIR}/int_sum.pyste:
- # XXX Boost doesn't like that tMatrix returns refs to doubles.
- #tMatrix::
cpu_head::
- ###4stack_head::${CMAKE_CURRENT_SOURCE_DIR}/cpu_head.pyste:
- ###event::
- ###population_event::${CMAKE_CURRENT_SOURCE_DIR}/event.pyste:
- ###analyze_command_def::${CMAKE_CURRENT_SOURCE_DIR}/analyze_command_def_base.pyste:
- ###analyze_flow_command_def::${CMAKE_CURRENT_SOURCE_DIR}/analyze_command_def_base.pyste:
- ###random::
- ###tools::
- ###event_list_entry::
- ###analyze_command::
phenotype::
population_cell::
merit::
@@ -99,12 +70,9 @@
lineage_control::
mutation_lib::
organism::
- ###event_factory::
- ###population_event_factory::${CMAKE_CURRENT_SOURCE_DIR}/event_factory.pyste:
cpu_test_info::
hardware_factory::
event_factory_manager::
- #analyze_flow_command::${CMAKE_CURRENT_SOURCE_DIR}/analyze_command.pyste:
analyze_function::
genotype_batch::
inject_genotype::
@@ -183,7 +151,6 @@
file::${CMAKE_CURRENT_SOURCE_DIR}/file-fixups.hh # XXX XXX XXX
init_file::${CMAKE_CURRENT_SOURCE_DIR}/file.pyste # XXX XXX XXX
genesis::${CMAKE_CURRENT_SOURCE_DIR}/init_file.pyste:${CMAKE_CURRENT_SOURCE_DIR}/genesis-fixups.hh # XXX XXX XXX
- #hardware_base::${CPU_SRC_DIR}/hardware_base.hh # XXX XXX XXX
hardware_base::
hardware_4stack::${CMAKE_CURRENT_SOURCE_DIR}/hardware_base.pyste # XXX XXX XXX
hardware_cpu::${CMAKE_CURRENT_SOURCE_DIR}/hardware_base.pyste:${CMAKE_CURRENT_SOURCE_DIR}/hardware_cpu-fixups.hh # XXX XXX XXX
Modified: branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.cc
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.cc 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.cc 2005-07-27 15:33:45 UTC (rev 267)
@@ -1,40 +1,40 @@
#include "cpu_head-fixups.hh"
-bool cCPUHead_GetFlagCopied(cCPUHead &cpu_head){
+bool cHeadCPU_GetFlagCopied(cHeadCPU &cpu_head){
return cpu_head.FlagCopied();
}
-bool cCPUHead_GetFlagMutated(cCPUHead &cpu_head){
+bool cHeadCPU_GetFlagMutated(cHeadCPU &cpu_head){
return cpu_head.FlagMutated();
}
-bool cCPUHead_GetFlagExecuted(cCPUHead &cpu_head){
+bool cHeadCPU_GetFlagExecuted(cHeadCPU &cpu_head){
return cpu_head.FlagExecuted();
}
-bool cCPUHead_GetFlagBreakpoint(cCPUHead &cpu_head){
+bool cHeadCPU_GetFlagBreakpoint(cHeadCPU &cpu_head){
return cpu_head.FlagBreakpoint();
}
-bool cCPUHead_GetFlagPointMut(cCPUHead &cpu_head){
+bool cHeadCPU_GetFlagPointMut(cHeadCPU &cpu_head){
return cpu_head.FlagPointMut();
}
-bool cCPUHead_GetFlagCopyMut(cCPUHead &cpu_head){
+bool cHeadCPU_GetFlagCopyMut(cHeadCPU &cpu_head){
return cpu_head.FlagCopyMut();
}
-void cCPUHead_SetFlagCopied(cCPUHead &cpu_head, bool flag){
+void cHeadCPU_SetFlagCopied(cHeadCPU &cpu_head, bool flag){
cpu_head.FlagCopied() = flag;
}
-void cCPUHead_SetFlagMutated(cCPUHead &cpu_head, bool flag){
+void cHeadCPU_SetFlagMutated(cHeadCPU &cpu_head, bool flag){
cpu_head.FlagMutated() = flag;
}
-void cCPUHead_SetFlagExecuted(cCPUHead &cpu_head, bool flag){
+void cHeadCPU_SetFlagExecuted(cHeadCPU &cpu_head, bool flag){
cpu_head.FlagExecuted() = flag;
}
-void cCPUHead_SetFlagBreakpoint(cCPUHead &cpu_head, bool flag){
+void cHeadCPU_SetFlagBreakpoint(cHeadCPU &cpu_head, bool flag){
cpu_head.FlagBreakpoint() = flag;
}
-void cCPUHead_SetFlagPointMut(cCPUHead &cpu_head, bool flag){
+void cHeadCPU_SetFlagPointMut(cHeadCPU &cpu_head, bool flag){
cpu_head.FlagPointMut() = flag;
}
-void cCPUHead_SetFlagCopyMut(cCPUHead &cpu_head, bool flag){
+void cHeadCPU_SetFlagCopyMut(cHeadCPU &cpu_head, bool flag){
cpu_head.FlagCopyMut() = flag;
}
Modified: branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.hh
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.hh 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/bindings/Boost.Python/cpu_head-fixups.hh 2005-07-27 15:33:45 UTC (rev 267)
@@ -1,22 +1,22 @@
#ifndef CPU_HEAD_FIXUPS_HH
#define CPU_HEAD_FIXUPS_HH
-#ifndef CPU_HEAD_HH
-#include "cpu_head.hh"
+#ifndef HEAD_CPU_HH
+#include "head_cpu.hh"
#endif
-bool cCPUHead_GetFlagCopied(cCPUHead &);
-bool cCPUHead_GetFlagMutated(cCPUHead &);
-bool cCPUHead_GetFlagExecuted(cCPUHead &);
-bool cCPUHead_GetFlagBreakpoint(cCPUHead &);
-bool cCPUHead_GetFlagPointMut(cCPUHead &);
-bool cCPUHead_GetFlagCopyMut(cCPUHead &);
+bool cHeadCPU_GetFlagCopied(cHeadCPU &);
+bool cHeadCPU_GetFlagMutated(cHeadCPU &);
+bool cHeadCPU_GetFlagExecuted(cHeadCPU &);
+bool cHeadCPU_GetFlagBreakpoint(cHeadCPU &);
+bool cHeadCPU_GetFlagPointMut(cHeadCPU &);
+bool cHeadCPU_GetFlagCopyMut(cHeadCPU &);
-void cCPUHead_SetFlagCopied(cCPUHead &, bool);
-void cCPUHead_SetFlagMutated(cCPUHead &, bool);
-void cCPUHead_SetFlagExecuted(cCPUHead &, bool);
-void cCPUHead_SetFlagBreakpoint(cCPUHead &, bool);
-void cCPUHead_SetFlagPointMut(cCPUHead &, bool);
-void cCPUHead_SetFlagCopyMut(cCPUHead &, bool);
+void cHeadCPU_SetFlagCopied(cHeadCPU &, bool);
+void cHeadCPU_SetFlagMutated(cHeadCPU &, bool);
+void cHeadCPU_SetFlagExecuted(cHeadCPU &, bool);
+void cHeadCPU_SetFlagBreakpoint(cHeadCPU &, bool);
+void cHeadCPU_SetFlagPointMut(cHeadCPU &, bool);
+void cHeadCPU_SetFlagCopyMut(cHeadCPU &, bool);
#endif
Deleted: branches/brysonda/source/bindings/Boost.Python/event_factory.pyste
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/event_factory.pyste 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/bindings/Boost.Python/event_factory.pyste 2005-07-27 15:33:45 UTC (rev 267)
@@ -1,8 +0,0 @@
-
-Include("event.hh")
-Include("string.hh")
-
-cEventFactory = Class("cEventFactory", "event_factory.hh")
-set_policy(cEventFactory.ConstructEvent, return_internal_reference())
-
-# vim: set ft=python:
Modified: branches/brysonda/source/bindings/Boost.Python/event_factory_manager.pyste
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/event_factory_manager.pyste 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/bindings/Boost.Python/event_factory_manager.pyste 2005-07-27 15:33:45 UTC (rev 267)
@@ -1,5 +1,4 @@
-Include("event_factory.hh")
Include("event.hh")
cEventFactoryManager = Class("cEventFactoryManager", "event_factory_manager.hh")
Modified: branches/brysonda/source/bindings/Boost.Python/tList.pyste
===================================================================
--- branches/brysonda/source/bindings/Boost.Python/tList.pyste 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/bindings/Boost.Python/tList.pyste 2005-07-27 15:33:45 UTC (rev 267)
@@ -44,6 +44,7 @@
set_policy(list_iterator_type.NextConst , return_value_policy(reference_existing_object))
set_policy(list_iterator_type.PrevConst , return_value_policy(reference_existing_object))
set_policy(list_iterator_type.Get , return_value_policy(reference_existing_object))
+ set_policy(list_iterator_type.GetPos , return_value_policy(reference_existing_object))
set_policy(list_iterator_type.Next , return_value_policy(reference_existing_object))
set_policy(list_iterator_type.Prev , return_value_policy(reference_existing_object))
set_policy(list_iterator_type.Remove , return_value_policy(reference_existing_object))
Modified: branches/brysonda/source/python/AvidaGui2/pyAvida.py
===================================================================
--- branches/brysonda/source/python/AvidaGui2/pyAvida.py 2005-07-26 20:03:23 UTC (rev 266)
+++ branches/brysonda/source/python/AvidaGui2/pyAvida.py 2005-07-27 15:33:45 UTC (rev 267)
@@ -29,9 +29,7 @@
return None
self.m_environment.GetInstSet().SetInstLib(cHardwareCPU.GetInstLib())
- cHardwareUtil.LoadInstSet_CPUOriginal(
- cConfig.GetInstFilename(),
- self.m_environment.GetInstSet())
+ cHardwareUtil.LoadInstSet(cConfig.GetInstFilename(), self.m_environment.GetInstSet())
cConfig.SetNumInstructions(self.m_environment.GetInstSet().GetSize())
cConfig.SetNumTasks(self.m_environment.GetTaskLib().GetSize())
cConfig.SetNumReactions(self.m_environment.GetReactionLib().GetSize())
More information about the Avida-cvs
mailing list