[Avida-cvs] [Avida2-svn] r136 - in
branches/developers/kaben-organism-scope/source:
bindings/Boost.Python cpu main python python/AvidaGui2 tools
kaben at myxo.css.msu.edu
kaben at myxo.css.msu.edu
Mon Apr 11 18:40:52 PDT 2005
Author: kaben
Date: 2005-04-11 21:40:51 -0400 (Mon, 11 Apr 2005)
New Revision: 136
Added:
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_status_printer.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_4stack.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_cpu.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_test_cpu.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer-fixups.cc
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.hh
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.cc
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.hh
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector_instantiations.hh
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.cc
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.hh
Modified:
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/4stack_head.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/A.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/B.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/CMakeLists.txt
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def_base.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command_def.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_function.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_genotype.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_analyze.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_base.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_population.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_triggers.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/birth_chamber.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/block_struct.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cCycleCheck.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cID.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cStringable.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestCase.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestProblem.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestResult.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTextTestInterpreter.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/callback_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/code_label.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/config.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/const_schedule.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/count_tracker.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_head.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_memory.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stack.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stats.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_test_info.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_entry.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file_manager.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_manager_base.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/double_sum.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/environment.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory_manager.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_entry.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_iterator.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_triggers.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/file.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fitness_matrix.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_block.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_coords.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genebank.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genesis.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_batch.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_birth_data.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_control.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_test_data.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack_thread.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_base.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu_thread.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_factory.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_alias.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_entry.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_full_entry.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_manager.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_type.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/histogram.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/indexed_block_struct.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/init_file.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genebank.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_birth_data.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_control.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_element.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_queue.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_base.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_cpu.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_set.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/instruction.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/int_sum.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule_node.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/kaben_brainstorms.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/landscape.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage_control.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/local_mutations.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/memory_flags.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/merit.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_lib.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_rates.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mx_code_array.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/my_code_array_less_than.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/org_message.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/organism.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/phenotype.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_cell.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event_factory.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_interface.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/prob_schedule.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_avida_driver.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/random.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_lib.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_process.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_requisite.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_result.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/ref_block.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_lib.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/running_average.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/scaled_block.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/schedule.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_count_elem.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_res_count.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_control.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_queue.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/stats.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_iterator.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_list.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tArray.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tBuffer.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tDictionary.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tList.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tMatrix.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_entry.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_lib.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_util.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tools.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/uint.pyste
branches/developers/kaben-organism-scope/source/bindings/Boost.Python/weighted_index.pyste
branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.cc
branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.hh
branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.cc
branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.hh
branches/developers/kaben-organism-scope/source/cpu/hardware_factory.cc
branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.cc
branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.hh
branches/developers/kaben-organism-scope/source/cpu/hardware_tracer_test_cpu.hh
branches/developers/kaben-organism-scope/source/cpu/test_cpu.cc
branches/developers/kaben-organism-scope/source/main/analyze.cc
branches/developers/kaben-organism-scope/source/main/avida_driver_population.cc
branches/developers/kaben-organism-scope/source/main/genotype.cc
branches/developers/kaben-organism-scope/source/main/organism.cc
branches/developers/kaben-organism-scope/source/main/population.cc
branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeCtrl.py
branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriCanvasView.py
branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyTemporaryReloads.py
branches/developers/kaben-organism-scope/source/python/setup_osx.py.in
branches/developers/kaben-organism-scope/source/tools/const_schedule.cc
branches/developers/kaben-organism-scope/source/tools/integrated_schedule.cc
branches/developers/kaben-organism-scope/source/tools/prob_schedule.cc
Log:
* Created pyHardwareTracer object that can be used to trace organism
execution.
* Removed extra include guards from a bunch of c++ files.
* Added vim modelines to lots of pyste files (to indicate to vim that
these files are written in Python).
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/4stack_head.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/4stack_head.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/4stack_head.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
set_policy(c4StackHead.FlagPointMut, return_internal_reference())
set_policy(c4StackHead.FlagCopyMut, return_internal_reference())
set_policy(c4StackHead.FlagBreakpoint, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/A.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/A.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/A.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
A = Class("A", "A.hh")
C = Class("C", "A.hh")
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/B.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/B.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/B.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
Import("A.pyste")
B = Class("B", "B.hh")
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/CMakeLists.txt
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/CMakeLists.txt 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/CMakeLists.txt 2005-04-12 01:40:51 UTC (rev 136)
@@ -182,9 +182,15 @@
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::${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
+ hardware_tracer::
+ hardware_tracer_cpu::
+ hardware_tracer_4stack::
+ hardware_tracer_test_cpu::
+ hardware_status_printer::
hardware_util:: # XXX XXX XXX
inst_lib_base:: # XXX XXX XXX
inst_lib_cpu::${CMAKE_CURRENT_SOURCE_DIR}/inst_lib_base.pyste # XXX XXX XXX
@@ -202,6 +208,7 @@
task_lib:: # XXX XXX XXX
test_cpu:: # XXX XXX XXX
tList::${CMAKE_CURRENT_SOURCE_DIR}/string.pyste # XXX XXX XXX
+ tVector::
)
SET(PyAvida_Extra_Cpp_Files
AB.cc
@@ -209,6 +216,8 @@
genesis-fixups.cc
hardware_cpu-fixups.cc
py_avida_driver-fixups.cc
+ py_hardware_tracer-fixups.cc
+ resource_count-fixups.cc
test_cpu-fixups.cc
)
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
Include("environment.hh")
cAnalyze = Class("cAnalyze", "analyze.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
cAnalyzeCommand = Class("cAnalyzeCommand", "analyze_command.hh")
set_policy(cAnalyzeCommand.GetCommandList, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
Import("analyze_command_def_base.pyste")
cAnalyzeCommandDef = Class("cAnalyzeCommandDef", "analyze_command_def.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def_base.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def_base.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_command_def_base.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,5 @@
Include("analyze_command.hh")
cAnalyzeCommandDefBase = Class("cAnalyzeCommandDefBase", "analyze_command_def_base.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
cAnalyzeFlowCommand = Class("cAnalyzeFlowCommand", "analyze_flow_command.hh")
set_policy(cAnalyzeFlowCommand.GetCommandList, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command_def.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command_def.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_flow_command_def.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
Import("analyze_command_def_base.pyste")
cAnalyzeFlowCommandDef = Class("cAnalyzeFlowCommandDef", "analyze_flow_command_def.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_function.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_function.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_function.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
cAnalyzeFunction = Class("cAnalyzeFunction", "analyze_function.hh")
set_policy(cAnalyzeFunction.GetCommandList, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_genotype.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_genotype.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_genotype.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
Include("inst_set.hh")
cAnalyzeGenotype = Class("cAnalyzeGenotype", "analyze_genotype.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/analyze_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
Include("inst_set.hh")
cAnalyzeUtil = Class("cAnalyzeUtil", "analyze_util.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -9,3 +9,4 @@
Function("SetupAvidaPython", "avida-fixups.hh")
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_analyze.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_analyze.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_analyze.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
Include("string.hh")
cAvidaDriver_Analyze = Class("cAvidaDriver_Analyze", "avida_driver_analyze.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_base.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_base.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_base.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
""")
cAvidaDriver_Base = Class("cAvidaDriver_Base", "avida_driver_base.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_population.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_population.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_driver_population.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -6,3 +6,4 @@
cAvidaDriver_Population = Class("cAvidaDriver_Population", "avida_driver_population.hh")
set_policy(cAvidaDriver_Population.GetPopulation, return_internal_reference())
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_triggers.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_triggers.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/avida_triggers.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,6 @@
+
Import("event_triggers.pyste")
+
cAvidaTriggers = Class("cAvidaTriggers", "avida_triggers.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/birth_chamber.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/birth_chamber.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/birth_chamber.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("organism.hh")
Include("genebank.hh")
@@ -2 +3,3 @@
cBirthChamber = Class("cBirthChamber", "birth_chamber.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/block_struct.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/block_struct.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/block_struct.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cBlockStruct = Class("cBlockStruct", "block_struct.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cCycleCheck.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cCycleCheck.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cCycleCheck.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,4 @@
cCycleCheck = Class("cCycleCheck", "cCycleCheck.hh")
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cID.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cID.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cID.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
+
cID = Class("cID", "cID.hh")
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cStringable.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cStringable.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cStringable.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
cStringable = Class("cStringable", "cStringable.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestCase.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestCase.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestCase.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,4 +1,6 @@
+
cTestCase = Class("cTestCase", "cTestCase.hh")
+
# cTestCase recursively 'adopts' other cTestCase instances, i.e.,
# removes responsibility from the user for deleting adopted instances.
# This doesn't play well with python because python really wants to
@@ -6,9 +8,14 @@
# shared-pointers removes responsibility for deleting the instances from
# cTestCase, Python, and users' code. Deleting becomes responsibility of
# the shared_ptr. shared_ptr saves the day.
+
holder(cTestCase, lambda classname: "boost::shared_ptr<%s>" % classname)
+
# adoptTestCase takes raw pointers. We don't want to let python use it.
exclude(cTestCase.adoptTestCase)
+
# pyAdoptTestCase takes shared_ptr instances. We want python to use
# pyAdoptTestCase to make a cTestCase adopt another test case.:
rename(cTestCase.pyAdoptTestCase, "adoptTestCase")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestProblem.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestProblem.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestProblem.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cTestProblem = Class("cTestProblem", "cTestProblem.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestResult.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestResult.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTestResult.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -33,3 +33,5 @@
set_policy(cTestResult.failures, return_value_policy(return_by_value))
set_wrapper(cTestResult.errors, errors_wrapper)
set_wrapper(cTestResult.failures, failures_wrapper)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTextTestInterpreter.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTextTestInterpreter.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cTextTestInterpreter.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cTextTestInterpreter = Class("cTextTestInterpreter", "cTextTestInterpreter.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/callback_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/callback_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/callback_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cCallbackUtil = Class("cCallbackUtil", "callback_util.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/code_label.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/code_label.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/code_label.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cCodeLabel = Class("cCodeLabel", "code_label.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/config.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/config.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/config.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -10,3 +10,5 @@
set_policy(cConfig.GetStartCreature, return_value_policy(reference_existing_object))
set_policy(cConfig.GetCloneFilename, return_value_policy(reference_existing_object))
set_policy(cConfig.GetLoadPopFilename, return_value_policy(reference_existing_object))
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/const_schedule.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/const_schedule.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/const_schedule.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Import("schedule.pyste")
Include("merit.hh")
@@ -3,2 +4,4 @@
cConstSchedule = Class("cConstSchedule", "const_schedule.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/count_tracker.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/count_tracker.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/count_tracker.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
cCountTracker = Class("cCountTracker", "count_tracker.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_head.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_head.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_head.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -13,3 +13,5 @@
set_policy(cCPUHead.GetCurHardware, return_internal_reference())
set_policy(cCPUHead.GetMainHardware, return_internal_reference())
set_policy(cCPUHead.FlagBreakpoint, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_memory.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_memory.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_memory.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Import("genome.pyste")
cCPUMemory = Class("cCPUMemory", "cpu_memory.hh")
@@ -8,3 +9,5 @@
set_policy(cCPUMemory.FlagCopyMut, return_internal_reference())
set_policy(cCPUMemory.FlagInjected, return_internal_reference())
set_policy(cCPUMemory.FlagBreakpoint, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stack.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stack.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stack.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cCPUStack = Class("cCPUStack", "cpu_stack.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stats.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stats.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_stats.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
sCPUStats = Class("sCPUStats", "cpu_stats.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_test_info.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_test_info.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/cpu_test_info.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -10,3 +10,5 @@
set_policy(cCPUTestInfo.GetColonyOrganism, return_internal_reference())
# Another reason to use ref-counting... Dangerous return value policy in use:
set_policy(cCPUTestInfo.GetTracer, return_value_policy(reference_existing_object))
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_entry.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_entry.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_entry.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
cDataEntry = Class("cDataEntry", "data_entry.hh")
exclude(cDataEntry.operator['<<'])
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
cDataFile = Class("cDataFile", "data_file.hh")
set_policy(cDataFile.GetOFStream, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file_manager.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file_manager.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_file_manager.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("data_file.hh")
Include("string.hh")
@@ -4,3 +5,5 @@
cDataFileManager = Class("cDataFileManager", "data_file_manager.hh")
exclude(cDataFileManager.GetOFStream)
set_policy(cDataFileManager.Get, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_manager_base.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_manager_base.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/data_manager_base.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
Include("data_file.hh")
cDataManager_Base = Class("cDataManager_Base", "data_manager_base.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/double_sum.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/double_sum.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/double_sum.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
cDoubleSum = Class("cDoubleSum", "double_sum.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/environment.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/environment.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/environment.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -9,3 +9,5 @@
set_policy(cEnvironment.GetTaskLib, return_internal_reference())
set_policy(cEnvironment.GetInstSet, return_internal_reference())
set_policy(cEnvironment.GetMutRates, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cEvent = Class("cEvent", "event.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
cEventFactory = Class("cEventFactory", "event_factory.hh")
set_policy(cEventFactory.ConstructEvent, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory_manager.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory_manager.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_factory_manager.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
cEventFactoryManager = Class("cEventFactoryManager", "event_factory_manager.hh")
set_policy(cEventFactoryManager.ConstructEvent, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("event_factory_manager.hh")
cEventList = Class("cEventList", "event_list.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_entry.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_entry.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_entry.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
set_policy(cEventListEntry.GetEvent, return_internal_reference())
set_policy(cEventListEntry.GetPrev, return_internal_reference())
set_policy(cEventListEntry.GetNext, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_iterator.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_iterator.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_list_iterator.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cEventListIterator = Class("cEventListIterator", "event_list_iterator.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_triggers.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_triggers.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/event_triggers.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cEventTriggers = Class("cEventTriggers", "event_triggers.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/file.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/file.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/file.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
exclude(cFile.Open)
add_method(cFile, "cFileOpenWrapper")
rename(cFile.cFileOpenWrapper, "Open")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fitness_matrix.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fitness_matrix.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fitness_matrix.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
Include("inst_set.hh")
cFitnessMatrix = Class("cFitnessMatrix", "fitness_matrix.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_block.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_block.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_block.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cFixedBlock = Class("cFixedBlock", "fixed_block.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_coords.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_coords.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/fixed_coords.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cFixedCoords = Class("cFixedCoords", "fixed_coords.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genebank.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genebank.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genebank.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -14,3 +14,5 @@
set_policy(cGenebank.GetGenotype, return_internal_reference())
set_policy(cGenebank.NextGenotype, return_internal_reference())
set_policy(cGenebank.ResetThread, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genesis.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genesis.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genesis.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
exclude(cGenesis.Open)
add_method(cGenesis, "cGenesisOpenWrapper")
rename(cGenesis.cGenesisOpenWrapper, "Open")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cGenome = Class("cGenome", "genome.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genome_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cGenomeUtil = Class("cGenomeUtil", "genome_util.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
set_policy(cGenotype.GetParentSpecies, return_internal_reference())
set_policy(cGenotype.GetNext, return_internal_reference())
set_policy(cGenotype.GetPrev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_batch.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_batch.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_batch.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,5 @@
cGenotypeBatch = Class("cGenotypeBatch", "genotype_batch.hh")
set_policy(cGenotypeBatch.List, return_internal_reference())
set_policy(cGenotypeBatch.Name, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_birth_data.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_birth_data.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_birth_data.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("inst_set.hh")
Include("species.hh")
Include("genotype.hh")
@@ -3,2 +4,4 @@
cGenotype_BirthData = Class("cGenotype_BirthData", "genotype_birth_data.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_control.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_control.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_control.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
set_policy(cGenotypeControl.ResetHistoric, return_internal_reference())
set_policy(cGenotypeControl.Next, return_internal_reference())
set_policy(cGenotypeControl.Prev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_test_data.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_test_data.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/genotype_test_data.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,3 @@
cGenotype_TestData = Class("cGenotype_TestData", "genotype_test_data.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -34,3 +34,5 @@
cHardware4Stack.AdvanceIP returns a reference to a bool;
rewrap by hand.
""")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack_thread.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack_thread.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_4stack_thread.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("hardware_base.hh")
Include("inject_genotype.hh")
@@ -2 +3,3 @@
cHardware4Stack_Thread = Class("cHardware4Stack_Thread", "hardware_4stack_thread.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_base.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_base.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_base.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -10,3 +10,5 @@
set_policy(cHardwareBase.GetOrganism, return_internal_reference())
set_policy(cHardwareBase.GetMemory, return_internal_reference())
exclude(cHardwareBase.ViewerLock)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("mutation.hh")
Include("inst_lib_cpu.hh")
Include("inst_set.hh")
@@ -21,16 +22,17 @@
### probably neither can Boost.Python -- with references to builtin
### types (I think). Possible solution is creating a
### cRegister class to wrap the int.
-#set_policy(cHardwareCPU.Register, return_value_policy(reference_existing_object))
exclude(cHardwareCPU.Register)
add_method(cHardwareCPU, "cHardwareCPU_GetRegister");
+add_method(cHardwareCPU, "cHardwareCPU_SetRegister");
rename(cHardwareCPU.cHardwareCPU_GetRegister, "GetRegister");
-add_method(cHardwareCPU, "cHardwareCPU_SetRegister");
rename(cHardwareCPU.cHardwareCPU_SetRegister, "SetRegister");
-class_code(cHardwareCPU, '.add_property("Register", &cHardwareCPU_GetRegister, &cHardwareCPU_SetRegister)');
+class_code(cHardwareCPU, '.add_property("m_register", &cHardwareCPU_GetRegister, &cHardwareCPU_SetRegister)');
set_policy(cHardwareCPU.Memory, return_internal_reference())
set_policy(cHardwareCPU.GetMemory, return_internal_reference())
set_policy(cHardwareCPU.GetOrganism, return_internal_reference())
exclude(cHardwareCPU.ViewerLock)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu_thread.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu_thread.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_cpu_thread.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("hardware_base.hh")
cHardwareCPU_Thread = Class("cHardwareCPU_Thread", "hardware_cpu_thread.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_factory.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_factory.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_factory.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
cHardwareFactory = Class("cHardwareFactory", "hardware_factory.hh")
set_policy(cHardwareFactory.Create, return_internal_reference())
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_status_printer.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_status_printer.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_status_printer.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,13 @@
+
+Include("hardware_cpu.hh")
+Include("hardware_4stack.hh")
+Include("organism.hh")
+
+Import("hardware_tracer.pyste")
+Import("hardware_tracer_cpu.pyste")
+Import("hardware_tracer_4stack.pyste")
+Import("hardware_tracer_test_cpu.pyste")
+
+cHardwareStatusPrinter = Class("cHardwareStatusPrinter", "hardware_status_printer.hh")
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,4 @@
+
+cHardwareTracer = Class("cHardwareTracer", "hardware_tracer.hh")
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_4stack.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_4stack.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_4stack.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,6 @@
+
+Include("hardware_4stack.hh")
+
+cHardwareTracer_4Stack = Class("cHardwareTracer_4Stack", "hardware_tracer_4stack.hh")
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_cpu.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_cpu.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_cpu.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,6 @@
+
+Include("hardware_cpu.hh")
+
+cHardwareTracer_CPU = Class("cHardwareTracer_CPU", "hardware_tracer_cpu.hh")
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_test_cpu.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_test_cpu.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_tracer_test_cpu.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,6 @@
+
+Include("string.hh")
+
+cHardwareTracer_TestCPU = Class("cHardwareTracer_TestCPU", "hardware_tracer_test_cpu.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/hardware_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
cHardwareUtil = Class("cHardwareUtil", "hardware_util.hh")
set_policy(cHardwareUtil.DefaultInstSet, return_value_policy(reference_existing_object))
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_alias.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_alias.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_alias.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -6,3 +6,5 @@
cHelpAlias = Class("cHelpAlias", "help_alias.hh")
set_policy(cHelpAlias.GetType, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_entry.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_entry.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_entry.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
cHelpEntry = Class("cHelpEntry", "help_entry.hh")
set_policy(cHelpEntry.GetType, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_full_entry.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_full_entry.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_full_entry.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
cHelpFullEntry = Class("cHelpFullEntry", "help_full_entry.hh")
set_policy(cHelpFullEntry.GetType, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_manager.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_manager.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_manager.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
cHelpManager = Class("cHelpManager", "help_manager.hh")
set_policy(cHelpManager.FindEntry, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_type.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_type.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/help_type.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -8,3 +8,5 @@
set_policy(cHelpType.AddEntry, return_internal_reference())
set_policy(cHelpType.AddAlias, return_internal_reference())
set_policy(cHelpType.FindEntry, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/histogram.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/histogram.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/histogram.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cHistogram = Class("cHistogram", "histogram.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/indexed_block_struct.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/indexed_block_struct.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/indexed_block_struct.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cIndexedBlockStruct = Class("cIndexedBlockStruct", "indexed_block_struct.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/init_file.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/init_file.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/init_file.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Import("file.pyste")
cInitFile = Class("cInitFile", "init_file.hh")
@@ -2 +3,3 @@
set_policy(cInitFile.GetFormat, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genebank.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genebank.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genebank.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -11,3 +11,5 @@
set_policy(cInjectGenebank.GetInjectGenotype, return_internal_reference())
set_policy(cInjectGenebank.NextInjectGenotype, return_internal_reference())
set_policy(cInjectGenebank.ResetThread, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
set_policy(cInjectGenotype.GetName, return_internal_reference())
set_policy(cInjectGenotype.GetNext, return_internal_reference())
set_policy(cInjectGenotype.GetPrev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_birth_data.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_birth_data.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_birth_data.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("inject_genotype.hh")
cInjectGenotype_BirthData = Class("cInjectGenotype_BirthData", "inject_genotype_birth_data.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_control.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_control.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_control.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
set_policy(cInjectGenotypeControl.ResetHistoric, return_internal_reference())
set_policy(cInjectGenotypeControl.Next, return_internal_reference())
set_policy(cInjectGenotypeControl.Prev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_element.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_element.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_element.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
set_policy(cInjectGenotypeElement.GetInjectGenotype, return_internal_reference())
set_policy(cInjectGenotypeElement.GetNext, return_internal_reference())
set_policy(cInjectGenotypeElement.GetPrev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_queue.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_queue.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inject_genotype_queue.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
cInjectGenotypeQueue = Class("cInjectGenotypeQueue", "inject_genotype_queue.hh")
set_policy(cInjectGenotypeQueue.Find, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_base.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_base.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_base.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -6,3 +6,5 @@
set_policy(cInstLibBase.GetNopName, return_value_policy(reference_existing_object))
set_policy(cInstLibBase.GetInstDefault, return_value_policy(reference_existing_object))
set_policy(cInstLibBase.GetInstError, return_value_policy(reference_existing_object))
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_cpu.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_cpu.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_lib_cpu.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -9,3 +9,4 @@
set_policy(cInstLibCPU.GetInstDefault, return_value_policy(reference_existing_object))
set_policy(cInstLibCPU.GetInstError, return_value_policy(reference_existing_object))
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_set.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_set.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_set.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
cInstSet = Class("cInstSet", "inst_set.hh")
set_policy(cInstSet.GetInstLib, return_value_policy(reference_existing_object))
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/inst_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
Include("inst_set.hh")
cInstUtil = Class("cInstUtil", "inst_util.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/instruction.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/instruction.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/instruction.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cInstruction = Class("cInstruction", "instruction.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/int_sum.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/int_sum.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/int_sum.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cIntSum = Class("cIntSum", "int_sum.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Import("schedule.pyste")
Include("merit.hh")
@@ -3,2 +4,4 @@
cIntegratedSchedule = Class("cIntegratedSchedule", "integrated_schedule.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule_node.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule_node.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/integrated_schedule_node.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,5 @@
cIntegratedScheduleNode = Class("cIntegratedScheduleNode", "integrated_schedule_node.hh")
set_policy(cIntegratedScheduleNode.GetNext, return_internal_reference())
set_policy(cIntegratedScheduleNode.GetPrev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/kaben_brainstorms.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/kaben_brainstorms.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/kaben_brainstorms.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -15,3 +15,5 @@
##endif
#""")
#Function("SetupAvida", "avida.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/landscape.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/landscape.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/landscape.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("inst_set.hh")
Include("fstream")
@@ -3,2 +4,4 @@
cLandscape = Class("cLandscape", "landscape.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("genotype.hh")
cLineage = Class("cLineage", "lineage.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage_control.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage_control.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/lineage_control.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
set_policy(cLineageControl.GetMaxFitnessLineage, return_internal_reference())
set_policy(cLineageControl.GetBestLineage, return_internal_reference())
set_policy(cLineageControl.GetDominantLineage, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/local_mutations.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/local_mutations.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/local_mutations.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("mutation_lib.hh")
cLocalMutations = Class("cLocalMutations", "local_mutations.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/memory_flags.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/memory_flags.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/memory_flags.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cMemoryFlags = Class("cMemoryFlags", "memory_flags.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/merit.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/merit.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/merit.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
exclude(cMerit.BinaryPrint)
# operator is for ostreams; ditch it.
exclude(cMerit.operator['<<'])
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cMutation = Class("cMutation", "mutation.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_lib.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_lib.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_lib.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
cMutationLib = Class("cMutationLib", "mutation_lib.hh")
set_policy(cMutationLib.AddMutation, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_rates.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_rates.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mutation_rates.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cMutationRates = Class("cMutationRates", "mutation_rates.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mx_code_array.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mx_code_array.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/mx_code_array.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("my_code_array_less_than.hh")
Include("genome.hh")
@@ -2 +3,3 @@
cMxCodeArray = Class("cMxCodeArray", "mx_code_array.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/my_code_array_less_than.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/my_code_array_less_than.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/my_code_array_less_than.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
MyCodeArrayLessThan = Class("MyCodeArrayLessThan", "my_code_array_less_than.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/org_message.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/org_message.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/org_message.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cOrgMessage = Class("cOrgMessage", "org_message.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/organism.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/organism.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/organism.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -26,3 +26,5 @@
""")
exclude(cOrganism.SaveState)
exclude(cOrganism.LoadState)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/phenotype.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/phenotype.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/phenotype.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -32,3 +32,5 @@
exclude(cPhenotype.CrossNum)
exclude(cPhenotype.ChildFertile)
exclude(cPhenotype.IsMultiThread)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -21,3 +21,5 @@
cPopulation.GetEnvironment().
""")
set_policy(cPopulation.GetEnvironment, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_cell.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_cell.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_cell.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
set_policy(cPopulationCell.GetOrganism, return_internal_reference())
set_policy(cPopulationCell.ConnectionList, return_internal_reference())
set_policy(cPopulationCell.MutationRates, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,6 @@
+
Import("event.pyste")
+
cPopulationEvent = Class("cPopulationEvent", "population_event.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event_factory.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event_factory.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_event_factory.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -7,3 +7,5 @@
cPopulationEventFactory = Class("cPopulationEventFactory", "population_event_factory.hh")
set_policy(cPopulationEventFactory.ConstructEvent, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_interface.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_interface.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/population_interface.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -65,3 +65,5 @@
exclude(cPopulationInterface.SetFun_UpdateMerit)
Function("BuildTestPopInterface", "population_interface-fixups.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/prob_schedule.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/prob_schedule.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/prob_schedule.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Import("schedule.pyste")
Include("merit.hh")
@@ -3,2 +4,4 @@
cProbSchedule = Class("cProbSchedule", "prob_schedule.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_avida_driver.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_avida_driver.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_avida_driver.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,4 @@
pyAvidaDriver = Class("pyAvidaDriver", "py_avida_driver.hh")
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer-fixups.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer-fixups.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer-fixups.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,44 @@
+#include "py_hardware_tracer.hh"
+
+#include "hardware_4stack.hh"
+#include "hardware_cpu.hh"
+#include "hardware_tracer.hh"
+#include "hardware_tracer_4stack.hh"
+#include "hardware_tracer_cpu.hh"
+#include "hardware_tracer_test_cpu.hh"
+
+#include <iostream>
+
+
+void pyHardwareTracerBase::TraceHardware_CPU(cHardwareCPU &hardware){
+ std::cout
+ << "pyHardwareTracerBase::TraceHardware_CPU not implemented."
+ << std::endl;
+}
+void pyHardwareTracerBase::TraceHardware_4Stack(cHardware4Stack &hardware){
+ std::cout
+ << "pyHardwareTracerBase::TraceHardware_4Stack not implemented."
+ << std::endl;
+}
+void pyHardwareTracerBase::TraceHardware_CPUBonus(cHardwareCPU &hardware){
+ std::cout
+ << "pyHardwareTracerBase::TraceHardware_CPUBonus not implemented."
+ << std::endl;
+}
+void pyHardwareTracerBase::TraceHardware_4StackBonus(cHardware4Stack &hardware){
+ std::cout
+ << "pyHardwareTracerBase::TraceHardware_4StackBonus not implemented."
+ << std::endl;
+}
+void pyHardwareTracerBase::TraceHardware_TestCPU(
+ int time_used,
+ int time_allocated,
+ int size,
+ const cString &final_memory,
+ const cString &child_memory
+){
+ std::cout
+ << "pyHardwareTracerBase::TraceHardware_TestCPU not implemented."
+ << std::endl;
+}
+
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,46 @@
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 1993 - 2004 California Institute of Technology //
+// //
+// Read the COPYING and README files, or contact 'avida at alife.org', //
+// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef PY_HARDWARE_TRACER_HH
+#define PY_HARDWARE_TRACER_HH
+
+#ifndef HARDWARE_TRACER_HH
+#include "hardware_tracer.hh"
+#endif
+#ifndef HARDWARE_TRACER_4STACK_HH
+#include "hardware_tracer_4stack.hh"
+#endif
+#ifndef HARDWARE_TRACER_CPU_HH
+#include "hardware_tracer_cpu.hh"
+#endif
+#ifndef HARDWARE_TRACER_TEST_CPU_HH
+#include "hardware_tracer_test_cpu.hh"
+#endif
+
+class cString;
+class pyHardwareTracerBase :
+ public cHardwareTracer
+, public cHardwareTracer_CPU
+, public cHardwareTracer_4Stack
+, public cHardwareTracer_TestCPU
+{
+public:
+ pyHardwareTracerBase(){}
+ virtual void TraceHardware_CPU(cHardwareCPU &hardware);
+ virtual void TraceHardware_4Stack(cHardware4Stack &hardware);
+ virtual void TraceHardware_CPUBonus(cHardwareCPU &hardware);
+ virtual void TraceHardware_4StackBonus(cHardware4Stack &hardware);
+ virtual void TraceHardware_TestCPU(
+ int time_used,
+ int time_allocated,
+ int size,
+ const cString &final_memory,
+ const cString &child_memory
+ );
+};
+
+#endif
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/py_hardware_tracer.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,13 @@
+
+Include("hardware_4stack.hh")
+Include("hardware_cpu.hh")
+Include("string.hh")
+
+Import("hardware_tracer.pyste")
+Import("hardware_tracer_4stack.pyste")
+Import("hardware_tracer_cpu.pyste")
+Import("hardware_tracer_test_cpu.pyste")
+
+pyHardwareTracerBase = Class("pyHardwareTracerBase", "py_hardware_tracer.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/random.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/random.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/random.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,5 @@
Include("tList.hh")
cRandom = Class("cRandom", "random.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -7,3 +7,5 @@
set_policy(cReaction.GetTask, return_internal_reference())
set_policy(cReaction.AddProcess, return_internal_reference())
set_policy(cReaction.AddRequisite, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_lib.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_lib.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_lib.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -6,3 +6,4 @@
set_policy(cReactionLib.AddReaction, return_internal_reference())
set_policy(cReactionLib.GetReaction, return_internal_reference())
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_process.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_process.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_process.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
set_policy(cReactionProcess.GetResource, return_internal_reference())
set_policy(cReactionProcess.GetProduct, return_internal_reference())
set_policy(cReactionProcess.GetDetect, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_requisite.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_requisite.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_requisite.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
Include("reaction.hh")
cReactionRequisite = Class("cReactionRequisite", "reaction_requisite.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_result.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_result.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/reaction_result.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
cReactionResult = Class("cReactionResult", "reaction_result.hh")
set_policy(cReactionResult.GetInstArray, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/ref_block.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/ref_block.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/ref_block.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cRefBlock = Class("cRefBlock", "ref_block.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cResource = Class("cResource", "resource.hh")
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,6 @@
+
+#include "resource_count-fixups.hh"
+
+const cResourceCount &cResourceCount_SetTo(cResourceCount &lhs, cResourceCount &rhs){
+ return lhs = rhs;
+}
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count-fixups.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,10 @@
+#ifndef RESOURCE_COUNT_FIXUPS_HH
+#define RESOURCE_COUNT_FIXUPS_HH
+
+#ifndef RESOURCE_COUNT_HH
+#include "resource_count.hh"
+#endif
+
+const cResourceCount &cResourceCount_SetTo(cResourceCount &lhs, cResourceCount &rhs);
+
+#endif
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_count.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,5 +1,5 @@
-cResourceCount = Class("cResourceCount", "resource_count.hh")
+cResourceCount = Class("cResourceCount", "resource_count-fixups.hh")
set_policy(cResourceCount.GetResources, return_internal_reference())
set_policy(cResourceCount.GetCellResources, return_internal_reference())
set_policy(cResourceCount.GetResourcesGeometry, return_internal_reference())
@@ -7,6 +7,9 @@
exclude(cResourceCount.Setup)
+add_method(cResourceCount, "cResourceCount_SetTo");
+rename(cResourceCount.cResourceCount_SetTo, "SetTo");
+
print("""
FIXME for resource_count.pyste:
Reenable cResourceCount.Setup(). This will take some work -- the c++
@@ -14,3 +17,4 @@
system.
""")
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_lib.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_lib.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/resource_lib.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,3 +5,5 @@
cResourceLib = Class("cResourceLib", "resource_lib.hh")
set_policy(cResourceLib.AddResource, return_internal_reference())
set_policy(cResourceLib.GetResource, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/running_average.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/running_average.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/running_average.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cRunningAverage = Class("cRunningAverage", "running_average.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/scaled_block.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/scaled_block.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/scaled_block.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,5 @@
cScaledBlock = Class("cScaledBlock", "scaled_block.hh")
set_policy(cScaledBlock.GetData, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/schedule.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/schedule.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/schedule.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("merit.hh")
cSchedule = Class("cSchedule", "schedule.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_count_elem.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_count_elem.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_count_elem.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cSpatialCountElem = Class("cSpatialCountElem", "spatial_count_elem.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_res_count.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_res_count.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/spatial_res_count.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cSpatialResCount = Class("cSpatialResCount", "spatial_res_count.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -4,3 +4,5 @@
cSpecies = Class("cSpecies", "species.hh")
set_policy(cSpecies.GetNext, return_internal_reference())
set_policy(cSpecies.GetPrev, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_control.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_control.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_control.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -9,3 +9,5 @@
set_policy(cSpeciesControl.GetFirst, return_internal_reference())
set_policy(cSpeciesControl.GetFirstInactive, return_internal_reference())
set_policy(cSpeciesControl.GetFirstGarbage, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_queue.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_queue.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/species_queue.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
cSpeciesQueue = Class("cSpeciesQueue", "species_queue.hh")
set_policy(cSpeciesQueue.GetFirst, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/stats.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/stats.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/stats.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -31,3 +31,5 @@
set_policy(cStats.SumExeInst, return_internal_reference())
set_policy(cStats.GetDataFileOFStream, return_internal_reference())
set_policy(cStats.GetDataFile, return_internal_reference())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -19,3 +19,5 @@
set_policy(cString.ClipEnd, return_self())
set_policy(cString.ToLower, return_self())
set_policy(cString.ToUpper, return_self())
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_iterator.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_iterator.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_iterator.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,6 @@
+
Include("string_list.hh")
cStringIterator = Class("cStringIterator", "string_iterator.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_list.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_list.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_list.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
that I have't yet approached).
- What to do about tList and memory-management issues?
""")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/string_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,2 +1,4 @@
cStringUtil = Class("cStringUtil", "string_util.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tArray.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tArray.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tArray.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,6 +1,8 @@
-# dir(specialized_type._DeclarationInfo__attributes) :
-# {'__code__': ['.def("__len__", &tArray_int_len)', '.def("__getitem__", &tArray_int_getitem)', '.def("__setitem__", &tArray_int_setitem)'], 'exclude': False, 'include': 'tArray_instantiations.hh', 'name': 'tArray_int'}
+
+# Functions providing python 'len()' and '[]' for class specializations
+# of tArray.
+
def addClass__len__Wrapper(spec_str, spec_type):
len_wrapper_name = "tArray_" + spec_str + "_len"
class_code(spec_type, '.def("__len__", &' + len_wrapper_name + ')');
@@ -25,6 +27,11 @@
tArray_class_T_setitem<>(array, i, item);
}"""
+
+# Functions providing python '[]' for fundamental type specializations
+# of tArray. The 'len()' functionality provided for class types can be
+# reused here.
+
def addFundamental__getitem__Wrapper(spec_str, spec_type):
getitem_wrapper_name = "tArray_" + spec_str + "_getitem"
class_code(spec_type, '.def("__getitem__", &' + getitem_wrapper_name + ')');
@@ -41,6 +48,9 @@
tArray_class_T_setitem<>(array, i, item);
}"""
+
+# Function to wrap class type specializations of tArray.
+
def commonClassWrapperFactors(spec_str, spec_type):
exclude(spec_type.ElementAt)
decl_code_str = ""
@@ -49,6 +59,9 @@
decl_code_str += addClass__setitem__Wrapper(spec_str, spec_type)
return decl_code_str
+
+# Function to wrap fundamental type specializations of tArray.
+
def commonFundamentalWrapperFactors(spec_str, spec_type):
exclude(spec_type.ElementAt)
decl_code_str = ""
@@ -69,6 +82,9 @@
declaration_code_string = ""
+
+# Commands to specialize tArray for various types.
+
pOrganism_str = "pOrganism"
tArray_pOrganism = tArray(pOrganism_str)
declaration_code_string += commonClassWrapperFactors(pOrganism_str, tArray_pOrganism)
@@ -94,59 +110,6 @@
declaration_code_string += commonFundamentalWrapperFactors(int_str, tArray_int)
-
-
-#for specialization in class_specializers:
-# specialized_type = tArray(specialization)
-# exclude(specialized_type.ResizeClear)
-# exclude(specialized_type.ElementAt)
-# #
-# len_wrapper_name = "tArray_" + specialization + "_len"
-# getitem_wrapper_name = "tArray_" + specialization + "_getitem"
-# setitem_wrapper_name = "tArray_" + specialization + "_setitem"
-# #
-# declaration_code_string += """
-#inline int """ + len_wrapper_name + "(tArray<" + specialization + """> &array) {
-# return tArray_class_T_len<>(array);
-#}"""
-# declaration_code_string += """
-#inline """ + specialization + " &" + getitem_wrapper_name + "(tArray<" + specialization + """> &array, int i) {
-# return tArray_class_T_getitem<>(array, i);
-#}"""
-# declaration_code_string += """
-#inline void """ + setitem_wrapper_name + "(tArray<" + specialization + "> &array, int i, " + specialization + """ &item) {
-# tArray_class_T_setitem<>(array, i, item);
-#}"""
-# #
-# class_code(specialized_type, '.def("__len__", &' + len_wrapper_name + ')');
-# class_code(specialized_type, '.def("__getitem__", &' + getitem_wrapper_name + ', return_internal_reference< 1 >())');
-# class_code(specialized_type, '.def("__setitem__", &' + setitem_wrapper_name + ')');
-
-
-#for specialization in fundamental_specializers:
-# specialized_type = tArray(specialization)
-# exclude(specialized_type.ResizeClear)
-# exclude(specialized_type.ElementAt)
-# #
-# len_wrapper_name = "tArray_" + specialization + "_len"
-# getitem_wrapper_name = "tArray_" + specialization + "_getitem"
-# setitem_wrapper_name = "tArray_" + specialization + "_setitem"
-# #
-# declaration_code_string += """
-#inline int """ + len_wrapper_name + "(tArray<" + specialization + """> &array) {
-# return tArray_class_T_len<>(array);
-#}"""
-# declaration_code_string += """
-#inline """ + specialization + " " + getitem_wrapper_name + "(tArray<" + specialization + """> &array, int i) {
-# return tArray_fundamental_T_getitem<>(array, i);
-#}"""
-# declaration_code_string += """
-#inline void """ + setitem_wrapper_name + "(tArray<" + specialization + "> &array, int i, " + specialization + """ item) {
-# tArray_class_T_setitem<>(array, i, item);
-#}"""
-# #
-# class_code(specialized_type, '.def("__len__", &' + len_wrapper_name + ')');
-# class_code(specialized_type, '.def("__getitem__", &' + getitem_wrapper_name + ')');
-# class_code(specialized_type, '.def("__setitem__", &' + setitem_wrapper_name + ')');
-
declaration_code(declaration_code_string)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tBuffer.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tBuffer.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tBuffer.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -6,3 +6,5 @@
for specialization in template_specializers:
specialized_type = tBuffer(specialization)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tDictionary.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tDictionary.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tDictionary.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -6,3 +6,5 @@
for specialization in template_specializers:
specialized_type = tDictionary(specialization)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tList.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tList.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tList.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -55,3 +55,5 @@
set_policy(const_list_iterator_type.Get , return_value_policy(reference_existing_object))
set_policy(const_list_iterator_type.Next , return_value_policy(reference_existing_object))
set_policy(const_list_iterator_type.Prev , return_value_policy(reference_existing_object))
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tMatrix.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tMatrix.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tMatrix.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -12,3 +12,5 @@
set_policy(specialized_type.ElementAt, return_internal_reference())
set_policy(specialized_type.operator['()'], return_internal_reference())
set_policy(specialized_type.operator['[]'], return_internal_reference())
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,11 @@
+
+tVector = Template("tVector", "tVector_instantiations.hh")
+
+template_specializers = [
+ "int",
+ ]
+
+for typename in template_specializers:
+ vector_type = tVector(typename)
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector_instantiations.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector_instantiations.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tVector_instantiations.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,2 @@
+
+#include "tVector.hh"
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_entry.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_entry.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_entry.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -3,3 +3,5 @@
# GetTestFun returns a instance method pointer, doesn't play well with
# Python.
exclude(cTaskEntry.GetTestFun)
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_lib.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_lib.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/task_lib.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,5 @@
cTaskLib = Class("cTaskLib", "task_lib.hh")
set_policy(cTaskLib.AddTask, return_internal_reference())
+
+# vim: set ft=python:
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,9 @@
+
+#include "test_cpu-fixups.hh"
+
+bool cTestCPU_GetUseResources(cTestCPU &test_cpu){
+ return test_cpu.UseResources();
+}
+void cTestCPU_SetUseResources(cTestCPU &test_cpu, bool value){
+ test_cpu.UseResources() = value;
+}
Added: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu-fixups.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -0,0 +1,11 @@
+#ifndef TEST_CPU_FIXUPS_HH
+#define TEST_CPU_FIXUPS_HH
+
+#ifndef TEST_CPU_HH
+#include "test_cpu.hh"
+#endif
+
+bool cTestCPU_GetUseResources(cTestCPU &test_cpu);
+void cTestCPU_SetUseResources(cTestCPU &test_cpu, bool value);
+
+#endif
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_cpu.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -27,3 +27,5 @@
- cTestCPU.GetResources needs autopointer to protect ownership.
- cTestCPU.GetResourceCount needs autopointer to protect ownership.
""")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_util.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_util.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/test_util.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1,3 +1,4 @@
+
Include("genome.hh")
Include("inject_genotype.hh")
Include("genotype.hh")
@@ -3,2 +4,4 @@
cTestUtil = Class("cTestUtil", "test_util.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tools.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tools.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/tools.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,3 +2,5 @@
Include("string.hh")
cTools = Class("cTools", "tools.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/uint.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/uint.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/uint.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,3 @@
cUInt = Class("cUInt", "uint.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/bindings/Boost.Python/weighted_index.pyste
===================================================================
--- branches/developers/kaben-organism-scope/source/bindings/Boost.Python/weighted_index.pyste 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/bindings/Boost.Python/weighted_index.pyste 2005-04-12 01:40:51 UTC (rev 136)
@@ -1 +1,4 @@
+
cWeightedIndex = Class("cWeightedIndex", "weighted_index.hh")
+
+# vim: set ft=python:
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -261,6 +261,29 @@
}
+cHardware4Stack::cHardware4Stack(const cHardware4Stack &hardware_4stack)
+: cHardwareBase(hardware_4stack.organism, hardware_4stack.inst_set)
+, m_functions(hardware_4stack.m_functions)
+, memory_array(hardware_4stack.memory_array)
+, threads(hardware_4stack.threads)
+, thread_id_chart(hardware_4stack.thread_id_chart)
+, cur_thread(hardware_4stack.cur_thread)
+, mal_active(hardware_4stack.mal_active)
+, inst_cost(hardware_4stack.inst_cost)
+#ifdef INSTRUCTION_COSTS
+, inst_ft_cost(hardware_4stack.inst_ft_cost)
+, inst_remainder(hardware_4stack.inst_remainder)
+#endif
+{
+ for(int i = 0; i < NUM_GLOBAL_STACKS; i++){
+ global_stacks[i] = hardware_4stack.global_stacks[i];
+ }
+ for(int i = 0; i < sizeof(slice_array)/sizeof(float); i++){
+ slice_array[i] = hardware_4stack.slice_array[i];
+ }
+}
+
+
cHardware4Stack::~cHardware4Stack()
{
}
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_4stack.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -109,6 +109,7 @@
public:
cHardware4Stack(cOrganism * in_organism, cInstSet * in_inst_set);
+ explicit cHardware4Stack(const cHardware4Stack &);
~cHardware4Stack();
void Recycle(cOrganism * new_organism, cInstSet * in_inst_set);
static cInstLibBase *GetInstLib();
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -382,6 +382,25 @@
}
+cHardwareCPU::cHardwareCPU(const cHardwareCPU &hardware_cpu)
+: cHardwareBase(hardware_cpu.organism, hardware_cpu.inst_set)
+, m_functions(hardware_cpu.m_functions)
+, memory(hardware_cpu.memory)
+, global_stack(hardware_cpu.global_stack)
+, thread_time_used(hardware_cpu.thread_time_used)
+, threads(hardware_cpu.threads)
+, thread_id_chart(hardware_cpu.thread_id_chart)
+, cur_thread(hardware_cpu.cur_thread)
+, mal_active(hardware_cpu.mal_active)
+, advance_ip(hardware_cpu.advance_ip)
+#ifdef INSTRUCTION_COSTS
+, inst_cost(hardware_cpu.inst_cost)
+, inst_ft_cost(hardware_cpu.inst_ft_cost)
+#endif
+{
+}
+
+
cHardwareCPU::~cHardwareCPU()
{
}
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_cpu.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -105,6 +105,7 @@
public:
cHardwareCPU(cOrganism * in_organism, cInstSet * in_inst_set);
+ explicit cHardwareCPU(const cHardwareCPU &);
~cHardwareCPU();
void Recycle(cOrganism * new_organism, cInstSet * in_inst_set);
static cInstLibCPU *GetInstLib();
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_factory.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_factory.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_factory.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,25 +5,13 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef HARDWARE_FACTORY_HH
#include "hardware_factory.hh"
-#endif
-#ifndef HARDWARE_BASE_HH
#include "hardware_base.hh"
-#endif
-#ifndef HARDWARE_CPU_HH
#include "hardware_cpu.hh"
-#endif
-#ifndef HARDWARE_4STACK_HH
#include "hardware_4stack.hh"
-#endif
-#ifndef INST_SET_HH
#include "inst_set.hh"
-#endif
-#ifndef ORGANISM_HH
#include "organism.hh"
-#endif
using namespace std;
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -15,6 +15,7 @@
#include "string.hh"
#include "string_util.hh"
+#include <fstream>
cHardwareStatusPrinter::cHardwareStatusPrinter(ostream &trace_fp)
: m_trace_fp(trace_fp)
@@ -59,18 +60,19 @@
void cHardwareStatusPrinter::TraceHardware_TestCPU(
int time_used,
int time_allocated,
- cOrganism &organism
+ int size,
+ const cString &final_memory,
+ const cString &child_memory
){
if (time_used == time_allocated) {
m_trace_fp << endl << "TIMEOUT: No offspring produced." << endl;
}
- else if (organism.GetHardware().GetMemory().GetSize() == 0) {
+ else if (size == 0) {
m_trace_fp << endl << "ORGANISM DEATH: No offspring produced." << endl;
}
else {
- m_trace_fp << endl << "Final Memory: "
- << organism.GetHardware().GetMemory().AsString() << endl
- << "Child Memory: " << organism.ChildGenome().AsString()
- << endl;
+ m_trace_fp
+ << endl << "Final Memory: " << final_memory
+ << endl << "Child Memory: " << child_memory << endl;
}
}
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_status_printer.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -33,7 +33,6 @@
class cHardwareBase;
class cHardwareCPU;
class cHardware4Stack;
-class cOrganism;
class cHardwareStatusPrinter :
public cHardwareTracer,
@@ -57,7 +56,9 @@
virtual void TraceHardware_TestCPU(
int time_used,
int time_allocated,
- cOrganism &organism
+ int size,
+ const cString &final_memory,
+ const cString &child_memory
);
};
Modified: branches/developers/kaben-organism-scope/source/cpu/hardware_tracer_test_cpu.hh
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/hardware_tracer_test_cpu.hh 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/hardware_tracer_test_cpu.hh 2005-04-12 01:40:51 UTC (rev 136)
@@ -8,12 +8,14 @@
#ifndef HARDWARE_TRACER_TEST_CPU_HH
#define HARDWARE_TRACER_TEST_CPU_HH
-class cOrganism;
+class cString;
struct cHardwareTracer_TestCPU {
virtual void TraceHardware_TestCPU(
int time_used,
int time_allocated,
- cOrganism &organism
+ int size,
+ const cString &final_memory,
+ const cString &child_memory
) = 0;
};
Modified: branches/developers/kaben-organism-scope/source/cpu/test_cpu.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/cpu/test_cpu.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/cpu/test_cpu.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -144,7 +144,13 @@
if (cHardwareTracer_TestCPU * tracer_test_cpu
= dynamic_cast<cHardwareTracer_TestCPU *>(tracer)
){
- tracer_test_cpu->TraceHardware_TestCPU(time_used, time_allocated, organism);
+ tracer_test_cpu->TraceHardware_TestCPU(
+ time_used,
+ time_allocated,
+ organism.GetHardware().GetMemory().GetSize(),
+ organism.GetHardware().GetMemory().AsString(),
+ organism.ChildGenome().AsString()
+ );
}
}
Modified: branches/developers/kaben-organism-scope/source/main/analyze.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/main/analyze.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/main/analyze.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -1168,6 +1168,7 @@
cTestCPU::TestGenome(test_info, genotype->GetGenome());
if (verbose) cout << " Tracing: " << filename << endl;
+ trace_fp.close();
}
if(useResources) {
Modified: branches/developers/kaben-organism-scope/source/main/avida_driver_population.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/main/avida_driver_population.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/main/avida_driver_population.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,61 +5,25 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef AVIDA_DRIVER_POPULATION_HH
#include "avida_driver_population.hh"
-#endif
-#ifndef AVIDA_TRIGGERS_HH
#include "avida_triggers.hh"
-#endif
-#ifndef CALLBACK_UTIL_HH
#include "callback_util.hh"
-#endif
-#ifndef CONFIG_HH
#include "config.hh"
-#endif
-#ifndef EVENT_FACTORY_MANAGER_HH
#include "event_factory_manager.hh"
-#endif
-#ifndef EVENT_LIST_HH
#include "event_list.hh"
-#endif
-#ifndef GENEBANK_HH
#include "genebank.hh"
-#endif
-#ifndef GENOTYPE_HH
#include "genotype.hh"
-#endif
-#ifndef HARDWARE_BASE_HH
#include "hardware_base.hh"
-#endif
-#ifndef HARDWARE_FACTORY_HH
#include "hardware_factory.hh"
-#endif
-#ifndef INIT_FILE_HH
#include "init_file.hh"
-#endif
-#ifndef ORGANISM_HH
#include "organism.hh"
-#endif
-#ifndef POPULATION_HH
#include "population.hh"
-#endif
-#ifndef POPULATION_CELL_HH
#include "population_cell.hh"
-#endif
-#ifndef POPULATION_EVENT_FACTORY_HH
#include "population_event_factory.hh"
-#endif
-#ifndef POPULATION_INTERFACE_HH
#include "population_interface.hh"
-#endif
-#ifndef STRING_HH
#include "string.hh"
-#endif
-#ifndef TOOLS_HH
#include "tools.hh"
-#endif
#include <iostream>
Modified: branches/developers/kaben-organism-scope/source/main/genotype.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/main/genotype.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/main/genotype.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,34 +5,16 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef GENOTYPE_HH
#include "genotype.hh"
-#endif
-#ifndef CONFIG_HH
#include "config.hh"
-#endif
-#ifndef CPU_TEST_INFO_HH
#include "cpu_test_info.hh"
-#endif
-#ifndef GENOME_UTIL_HH
#include "genome_util.hh"
-#endif
-#ifndef MERIT_HH
#include "merit.hh"
-#endif
-#ifndef ORGANISM_HH
#include "organism.hh"
-#endif
-#ifndef PHENOTYPE_HH
#include "phenotype.hh"
-#endif
-#ifndef TEST_CPU_HH
#include "test_cpu.hh"
-#endif
-#ifndef TOOLS_HH
#include "tools.hh"
-#endif
using namespace std;
Modified: branches/developers/kaben-organism-scope/source/main/organism.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/main/organism.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/main/organism.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,55 +5,23 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef ORGANISM_HH
#include "organism.hh"
-#endif
-#ifndef CONFIG_HH
#include "config.hh"
-#endif
-#ifndef CPU_DEFS_HH
#include "cpu_defs.hh"
-#endif
-#ifndef ENVIRONMENT_HH
#include "environment.hh"
-#endif
-#ifndef FUNCTIONS_HH
#include "functions.hh"
-#endif
-#ifndef GENOME_HH
#include "genome.hh"
-#endif
-#ifndef GENOME_UTIL_HH
#include "genome_util.hh"
-#endif
-#ifndef HARDWARE_BASE_HH
#include "hardware_base.hh"
-#endif
-#ifndef INJECT_GENOTYPE_HH
#include "inject_genotype.hh"
-#endif
-#ifndef INST_SET_HH
#include "inst_set.hh"
-#endif
-#ifndef INST_UTIL_HH
#include "inst_util.hh"
-#endif
-#ifndef ORG_MESSAGE_HH
#include "org_message.hh"
-#endif
-#ifndef STRING_UTIL_HH
#include "string_util.hh"
-#endif
-#ifndef TARRAY_HH
#include "tArray.hh"
-#endif
-#ifndef TOOLS_HH
#include "tools.hh"
-#endif
-#ifndef TLIST_HH
#include "tList.hh"
-#endif
#include <iomanip>
Modified: branches/developers/kaben-organism-scope/source/main/population.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/main/population.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/main/population.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,92 +5,35 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef POPULATION_HH
#include "population.hh"
-#endif
-
-#ifndef CONFIG_HH
#include "config.hh"
-#endif
-#ifndef CONST_SCHEDULE_HH
#include "const_schedule.hh"
-#endif
-#ifndef DATA_FILE_HH
#include "data_file.hh"
-#endif
-#ifndef ENVIRONMENT_HH
#include "environment.hh"
-#endif
-#ifndef FUNCTIONS_HH
#include "functions.hh"
-#endif
-#ifndef GENEBANK_HH
#include "genebank.hh"
-#endif
-#ifndef GENOME_UTIL_HH
#include "genome_util.hh"
-#endif
-#ifndef GENOTYPE_HH
#include "genotype.hh"
-#endif
-#ifndef HARDWARE_BASE_HH
#include "hardware_base.hh"
-#endif
-#ifndef HARDWARE_FACTORY_HH
#include "hardware_factory.hh"
-#endif
-#ifndef HARDWARE_4STACK_HH
#include "hardware_4stack.hh"
-#endif
-#ifndef HARDWARE_UTIL_HH
#include "hardware_util.hh"
-#endif
-#ifndef INIT_FILE_HH
#include "init_file.hh"
-#endif
-#ifndef INJECT_GENEBANK_HH
#include "inject_genebank.hh"
-#endif
-#ifndef INJECT_GENOTYPE_HH
#include "inject_genotype.hh"
-#endif
-#ifndef INST_UTIL_HH
#include "inst_util.hh"
-#endif
-#ifndef INTEGRATED_SCHEDULE_HH
#include "integrated_schedule.hh"
-#endif
-#ifndef LINEAGE_HH
#include "lineage.hh"
-#endif
-#ifndef LINEAGE_CONTROL_HH
#include "lineage_control.hh"
-#endif
-#ifndef ORGANISM_HH
#include "organism.hh"
-#endif
-#ifndef PHENOTYPE_HH
#include "phenotype.hh"
-#endif
-#ifndef POPULATION_CELL_HH
#include "population_cell.hh"
-#endif
-#ifndef PROB_SCHEDULE_HH
#include "prob_schedule.hh"
-#endif
-#ifndef RESOURCE_HH
#include "resource.hh"
-#endif
-#ifndef SPECIES_HH
#include "species.hh"
-#endif
-#ifndef STATS_HH
#include "stats.hh"
-#endif
-#ifndef TASK_ENTRY_HH
#include "task_entry.hh"
-#endif
#include <fstream>
#include <vector>
Modified: branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeCtrl.py
===================================================================
--- branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2005-04-12 01:40:51 UTC (rev 136)
@@ -2,8 +2,10 @@
from pyOrganismScopeView import pyOrganismScopeView
-import AvidaCore
+from AvidaCore import cAnalyzeGenotype, cGenome, cInstUtil, cString
+from pyHardwareTracer import pyHardwareTracer
+
from qt import *
import os
@@ -33,148 +35,153 @@
if(old_avida): del old_avida
def setDebugOrganismFileSlot(self, organism_filename):
+ print "pyOrganismScopeCtrl.setDebugOrganismFileSlot"
if self.m_avida:
- # Analysis files.
- genebank_dirname = self.m_session_mdl.m_tempdir
- organism_file_basename = os.path.basename(str(organism_filename))
- analyze_filename = '%s/organism_analyze.cfg' % self.m_session_mdl.m_tempdir
- trace_filename = '%s/%s.trace' % (genebank_dirname, organism_file_basename)
- genotype_filename = '%s/%s.gen' % (genebank_dirname, organism_file_basename)
+ inst_set = self.m_avida.m_environment.GetInstSet()
+ genome = cGenome(cInstUtil.LoadGenome(cString(organism_filename.ascii()), inst_set) )
+ genotype = cAnalyzeGenotype(genome, inst_set)
+ hardware_tracer = pyHardwareTracer()
+ hardware_tracer.traceAnalyzeGenotype(genotype, self.m_avida.m_environment, should_use_resources = False)
+ pass
+ #if self.m_avida:
+ # # Analysis files.
+ # genebank_dirname = self.m_session_mdl.m_tempdir
+ # organism_file_basename = os.path.basename(str(organism_filename))
+ # analyze_filename = '%s/organism_analyze.cfg' % self.m_session_mdl.m_tempdir
+ # trace_filename = '%s/%s.trace' % (genebank_dirname, organism_file_basename)
+ # genotype_filename = '%s/%s.gen' % (genebank_dirname, organism_file_basename)
- # Analysis results files.
- is_viable_info_filename = '%s/is_viable.info' % self.m_session_mdl.m_tempdir
- gestation_time_info_filename = '%s/gestation_time.info' % self.m_session_mdl.m_tempdir
- fitness_info_filename = '%s/fitness.info' % self.m_session_mdl.m_tempdir
- size_info_filename = '%s/size.info' % self.m_session_mdl.m_tempdir
- genome_info_filename = '%s/genome.info' % self.m_session_mdl.m_tempdir
- tasks_info_filename = '%s/tasks.info' % self.m_session_mdl.m_tempdir
- ihead_info_filename = '%s/ihead.info' % self.m_session_mdl.m_tempdir
- rhead_info_filename = '%s/rhead.info' % self.m_session_mdl.m_tempdir
- whead_info_filename = '%s/whead.info' % self.m_session_mdl.m_tempdir
- fhead_info_filename = '%s/fhead.info' % self.m_session_mdl.m_tempdir
+ # # Analysis results files.
+ # is_viable_info_filename = '%s/is_viable.info' % self.m_session_mdl.m_tempdir
+ # gestation_time_info_filename = '%s/gestation_time.info' % self.m_session_mdl.m_tempdir
+ # fitness_info_filename = '%s/fitness.info' % self.m_session_mdl.m_tempdir
+ # size_info_filename = '%s/size.info' % self.m_session_mdl.m_tempdir
+ # genome_info_filename = '%s/genome.info' % self.m_session_mdl.m_tempdir
+ # tasks_info_filename = '%s/tasks.info' % self.m_session_mdl.m_tempdir
+ # ihead_info_filename = '%s/ihead.info' % self.m_session_mdl.m_tempdir
+ # rhead_info_filename = '%s/rhead.info' % self.m_session_mdl.m_tempdir
+ # whead_info_filename = '%s/whead.info' % self.m_session_mdl.m_tempdir
+ # fhead_info_filename = '%s/fhead.info' % self.m_session_mdl.m_tempdir
- # Create a temporary analyze file using organism file name.
- analyze_file = open(analyze_filename, 'w')
- analyze_file.write('LOAD_ORGANISM %s\n' % organism_filename)
- analyze_file.write('RECALCULATE\n')
- analyze_file.write('TRACE %s\n' % genebank_dirname)
- analyze_file.write('PRINT %s\n' % genebank_dirname)
- analyze_file.close()
+ # # Create a temporary analyze file using organism file name.
+ # analyze_file = open(analyze_filename, 'w')
+ # analyze_file.write('LOAD_ORGANISM %s\n' % organism_filename)
+ # analyze_file.write('RECALCULATE\n')
+ # analyze_file.write('TRACE %s\n' % genebank_dirname)
+ # analyze_file.write('PRINT %s\n' % genebank_dirname)
+ # analyze_file.close()
- # Create an analyze object using the temporary analyze file and
- # the environment of the current avida object.
- AvidaCore.cConfig.SetAnalyzeFilename(AvidaCore.cString(analyze_filename))
- avida_driver_analyze = AvidaCore.cAvidaDriver_Analyze(
- False, self.m_avida.m_environment)
- avida_driver_analyze.Run()
+ # # Create an analyze object using the temporary analyze file and
+ # # the environment of the current avida object.
+ # AvidaCore.cConfig.SetAnalyzeFilename(AvidaCore.cString(analyze_filename))
+ # avida_driver_analyze = AvidaCore.cAvidaDriver_Analyze(False, self.m_avida.m_environment)
+ # avida_driver_analyze.Run()
- # Extract organism viability, gestation time, fitness, and size numbers.
- os.system( 'cat ' + genotype_filename + ' | grep Is | grep Viable | cut -d\ -f4-20 > ' + is_viable_info_filename)
- os.system( 'cat ' + genotype_filename + ' | grep Gestation | cut -d\ -f4-20 > ' + gestation_time_info_filename)
- os.system( 'cat ' + genotype_filename + ' | grep Fitness | cut -d\ -f4-20 > ' + fitness_info_filename)
- os.system( 'cat ' + genotype_filename + ' | grep Genome | cut -d\ -f4-20 > ' + size_info_filename)
- # Extract genome info.
- os.system( 'cat ' + trace_filename + ' | grep Mem | cut -d\ -f6 > ' + genome_info_filename)
- # Extract the tasks done at each point in execution.
- os.system( 'cat ' + trace_filename + ' | grep Task | cut -d\ -f9-17 > ' + tasks_info_filename)
- # Extract the instruction pointer locations from the trace file.
- os.system( 'cat ' + trace_filename + ' | grep IP | cut -d\ -f2 | cut -b4-7 > ' + ihead_info_filename)
- # Extract the read/write/flow head info.
- os.system( 'cat ' + trace_filename + ' | grep "R-Head" | cut -d\ -f3 | cut -d\: -f2 > ' + rhead_info_filename)
- os.system( 'cat ' + trace_filename + ' | grep "W-Head" | cut -d\ -f4 | cut -d\: -f2 > ' + whead_info_filename)
- os.system( 'cat ' + trace_filename + ' | grep "F-Head" | cut -d\ -f5 | cut -d\: -f2 > ' + fhead_info_filename)
+ # # Extract organism viability, gestation time, fitness, and size numbers.
+ # os.system( 'cat ' + genotype_filename + ' | grep Is | grep Viable | cut -d\ -f4-20 > ' + is_viable_info_filename)
+ # os.system( 'cat ' + genotype_filename + ' | grep Gestation | cut -d\ -f4-20 > ' + gestation_time_info_filename)
+ # os.system( 'cat ' + genotype_filename + ' | grep Fitness | cut -d\ -f4-20 > ' + fitness_info_filename)
+ # os.system( 'cat ' + genotype_filename + ' | grep Genome | cut -d\ -f4-20 > ' + size_info_filename)
+ # # Extract genome info.
+ # os.system( 'cat ' + trace_filename + ' | grep Mem | cut -d\ -f6 > ' + genome_info_filename)
+ # # Extract the tasks done at each point in execution.
+ # os.system( 'cat ' + trace_filename + ' | grep Task | cut -d\ -f9-17 > ' + tasks_info_filename)
+ # # Extract the instruction pointer locations from the trace file.
+ # os.system( 'cat ' + trace_filename + ' | grep IP | cut -d\ -f2 | cut -b4-7 > ' + ihead_info_filename)
+ # # Extract the read/write/flow head info.
+ # os.system( 'cat ' + trace_filename + ' | grep "R-Head" | cut -d\ -f3 | cut -d\: -f2 > ' + rhead_info_filename)
+ # os.system( 'cat ' + trace_filename + ' | grep "W-Head" | cut -d\ -f4 | cut -d\: -f2 > ' + whead_info_filename)
+ # os.system( 'cat ' + trace_filename + ' | grep "F-Head" | cut -d\ -f5 | cut -d\: -f2 > ' + fhead_info_filename)
- # Load organism viability, gestation time, fitness, and size.
- def load_info(info_filename):
- info_file = file(info_filename, 'rU')
- info = info_file.read()
- info_file.close()
- return info.strip()
+ # # Load organism viability, gestation time, fitness, and size.
+ # def load_info(info_filename):
+ # info_file = file(info_filename, 'rU')
+ # info = info_file.read()
+ # info_file.close()
+ # return info.strip()
- ( is_viable_info_string,
- gestation_time_info_string,
- fitness_info_string,
- size_info_string,
- ) = [load_info(info_filename) for info_filename in (
- is_viable_info_filename,
- gestation_time_info_filename,
- fitness_info_filename,
- size_info_filename,)]
- is_viable_info = bool(int(is_viable_info_string))
- gestation_time_info = int(gestation_time_info_string)
- fitness_info = float(fitness_info_string)
- size_info = int(size_info_string)
+ # ( is_viable_info_string,
+ # gestation_time_info_string,
+ # fitness_info_string,
+ # size_info_string,
+ # ) = [load_info(info_filename) for info_filename in (
+ # is_viable_info_filename,
+ # gestation_time_info_filename,
+ # fitness_info_filename,
+ # size_info_filename,)]
+ # is_viable_info = bool(int(is_viable_info_string))
+ # gestation_time_info = int(gestation_time_info_string)
+ # fitness_info = float(fitness_info_string)
+ # size_info = int(size_info_string)
- # Load genome, tasks, and heads at each point in execution.
- def load_info_lines(info_filename):
- info_file = file(info_filename, 'rU')
- info_lines = info_file.readlines()
- info_file.close()
- return [info_line.strip() for info_line in info_lines]
+ # # Load genome, tasks, and heads at each point in execution.
+ # def load_info_lines(info_filename):
+ # info_file = file(info_filename, 'rU')
+ # info_lines = info_file.readlines()
+ # info_file.close()
+ # return [info_line.strip() for info_line in info_lines]
- ( genome_info,
- tasks_info_strings,
- ihead_info_strings,
- rhead_info_strings,
- whead_info_strings,
- fhead_info_strings,
- ) = [load_info_lines(info_filename) for info_filename in (
- genome_info_filename,
- tasks_info_filename,
- ihead_info_filename,
- rhead_info_filename,
- whead_info_filename,
- fhead_info_filename,)]
- tasks_info = [[bool(int(task)) for task in tasks] for tasks in [line.split() for line in tasks_info_strings]]
- ihead_info = [int(line) for line in ihead_info_strings]
- rhead_info = [int(line) for line in rhead_info_strings]
- whead_info = [int(line) for line in whead_info_strings]
- fhead_info = [int(line) for line in fhead_info_strings]
+ # ( genome_info,
+ # tasks_info_strings,
+ # ihead_info_strings,
+ # rhead_info_strings,
+ # whead_info_strings,
+ # fhead_info_strings,
+ # ) = [load_info_lines(info_filename) for info_filename in (
+ # genome_info_filename,
+ # tasks_info_filename,
+ # ihead_info_filename,
+ # rhead_info_filename,
+ # whead_info_filename,
+ # fhead_info_filename,)]
+ # tasks_info = [[bool(int(task)) for task in tasks] for tasks in [line.split() for line in tasks_info_strings]]
+ # ihead_info = [int(line) for line in ihead_info_strings]
+ # rhead_info = [int(line) for line in rhead_info_strings]
+ # whead_info = [int(line) for line in whead_info_strings]
+ # fhead_info = [int(line) for line in fhead_info_strings]
- class pyMdl: pass
- frames = pyMdl()
- frames.m_is_viable = is_viable_info
- frames.m_gestation_time = gestation_time_info
- frames.m_fitness = fitness_info
- frames.m_size = size_info
- frames.m_genome_info = genome_info
- frames.m_tasks_info = tasks_info
- frames.m_ihead_info = ihead_info
- frames.m_rhead_info = rhead_info
- frames.m_whead_info = whead_info
- frames.m_fhead_info = fhead_info
+ # class pyMdl: pass
+ # frames = pyMdl()
+ # frames.m_is_viable = is_viable_info
+ # frames.m_gestation_time = gestation_time_info
+ # frames.m_fitness = fitness_info
+ # frames.m_size = size_info
+ # frames.m_genome_info = genome_info
+ # frames.m_tasks_info = tasks_info
+ # frames.m_ihead_info = ihead_info
+ # frames.m_rhead_info = rhead_info
+ # frames.m_whead_info = whead_info
+ # frames.m_fhead_info = fhead_info
- # Delete analyze files and analysis results files.
- #for filename in (
- # analyze_filename,
- # trace_filename,
- # genotype_filename,
- # is_viable_info_filename,
- # gestation_time_info_filename,
- # fitness_info_filename,
- # size_info_filename,
- # genome_info_filename,
- # tasks_info_filename,
- # ihead_info_filename,
- # rhead_info_filename,
- # whead_info_filename,
- # fhead_info_filename,
- #):
- # os.remove(filename)
+ # # Delete analyze files and analysis results files.
+ # #for filename in (
+ # # analyze_filename,
+ # # trace_filename,
+ # # genotype_filename,
+ # # is_viable_info_filename,
+ # # gestation_time_info_filename,
+ # # fitness_info_filename,
+ # # size_info_filename,
+ # # genome_info_filename,
+ # # tasks_info_filename,
+ # # ihead_info_filename,
+ # # rhead_info_filename,
+ # # whead_info_filename,
+ # # fhead_info_filename,
+ # #):
+ # # os.remove(filename)
- # Translate from string genome representation to actual command names.
- inst_names = {}
- inst_set = self.m_avida.m_environment.GetInstSet()
- instruction = AvidaCore.cInstruction()
- for id in range(inst_set.GetSize()):
- instruction.SetOp(id)
- inst_names[instruction.GetSymbol()] = str(inst_set.GetName(instruction))
+ # # Translate from string genome representation to actual command names.
+ # inst_names = {}
+ # inst_set = self.m_avida.m_environment.GetInstSet()
+ # instruction = AvidaCore.cInstruction()
+ # for id in range(inst_set.GetSize()):
+ # instruction.SetOp(id)
+ # inst_names[instruction.GetSymbol()] = str(inst_set.GetName(instruction))
- self.setInstNames(inst_names)
- self.setFrames(frames)
+ # self.setInstNames(inst_names)
+ # self.setFrames(frames)
- # load task info
- # determine points at which tasks appear, both in genome and
- # frame number
-
- pass
+ # # load task info
+ # # determine points at which tasks appear, both in genome and
+ # # frame number
Modified: branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriCanvasView.py
===================================================================
--- branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriCanvasView.py 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyPetriCanvasView.py 2005-04-12 01:40:51 UTC (rev 136)
@@ -8,8 +8,9 @@
def contentsMousePressEvent(self,e): # QMouseEvent e
if e.button() != Qt.LeftButton: return
point = self.inverseWorldMatrix().map(e.pos())
- ilist = self.canvas().collisions(point) #QCanvasItemList ilist
- for item in ilist:
- if item.rtti()==271828:
- self.emit(PYSIGNAL("orgClickedOnSig"), (item.m_population_cell.GetID(),))
+ if self.canvas():
+ ilist = self.canvas().collisions(point) #QCanvasItemList ilist
+ for item in ilist:
+ if item.rtti()==271828:
+ self.emit(PYSIGNAL("orgClickedOnSig"), (item.m_population_cell.GetID(),))
Modified: branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyTemporaryReloads.py
===================================================================
--- branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyTemporaryReloads.py 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/python/AvidaGui2/pyTemporaryReloads.py 2005-04-12 01:40:51 UTC (rev 136)
@@ -54,6 +54,7 @@
"AvidaGui2.pyGradientScaleCtrl",
"AvidaGui2.pyGraphView",
"AvidaGui2.pyGraphCtrl",
+ "AvidaGui2.pyHardwareTracer",
"AvidaGui2.pyInstructionSet",
"AvidaGui2.pyLiveControlsView",
"AvidaGui2.pyLiveControlsCtrl",
Modified: branches/developers/kaben-organism-scope/source/python/setup_osx.py.in
===================================================================
--- branches/developers/kaben-organism-scope/source/python/setup_osx.py.in 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/python/setup_osx.py.in 2005-04-12 01:40:51 UTC (rev 136)
@@ -47,6 +47,7 @@
includes = ['iqt', 'qt', 'qwt', 'readline', 'unittest', 'IPython', 'AvidaGui2', 'AvidaCore'],
packages = ['IPython', 'AvidaGui2'],
dist_dir = '${EXECUTABLE_OUTPUT_PATH}',
+ strip = False,
)
),
data_files=[
@@ -70,3 +71,9 @@
+ svn_metadata_files,
)
+print """
+FIXME:
+Remember to reenable symbol stripping by commenting-out the option "strip = False"
+at line 51 of source/python/setup_osx.py.in.
+ at kgn
+"""
Modified: branches/developers/kaben-organism-scope/source/tools/const_schedule.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/tools/const_schedule.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/tools/const_schedule.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,14 +5,11 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef CONST_SCHEDULE_HH
#include "const_schedule.hh"
-#endif
-#ifndef MERIT_HH
#include "merit.hh"
-#endif
+
////////////////////
// cConstSchedule
////////////////////
Modified: branches/developers/kaben-organism-scope/source/tools/integrated_schedule.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/tools/integrated_schedule.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/tools/integrated_schedule.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,20 +5,13 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef INTEGRATED_SCHEDULE_HH
#include "integrated_schedule.hh"
-#endif
-#ifndef FUNCTIONS_HH
#include "functions.hh"
-#endif
-#ifndef INTEGRATED_SCHEDULE_NODE_HH
#include "integrated_schedule_node.hh"
-#endif
-#ifndef MERIT_HH
#include "merit.hh"
-#endif
+
/////////////////////////
// cIntegratedSchedule
/////////////////////////
Modified: branches/developers/kaben-organism-scope/source/tools/prob_schedule.cc
===================================================================
--- branches/developers/kaben-organism-scope/source/tools/prob_schedule.cc 2005-04-09 05:50:16 UTC (rev 135)
+++ branches/developers/kaben-organism-scope/source/tools/prob_schedule.cc 2005-04-12 01:40:51 UTC (rev 136)
@@ -5,17 +5,12 @@
// before continuing. SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE. //
//////////////////////////////////////////////////////////////////////////////
-#ifndef PROB_SCHEDULE_HH
#include "prob_schedule.hh"
-#endif
-#ifndef MERIT_HH
#include "merit.hh"
-#endif
-#ifndef TOOLS_HH
#include "tools.hh"
-#endif
+
///////////////////
// cProbSchedule
///////////////////
More information about the Avida-cvs
mailing list