[Avida-cvs] [Avida2-svn] r165 - in trunk/source: bindings/Boost.Python python/AvidaGui2

[gerrishj at myxo.css.msu.edu]

Author: gerrishj
Date: 2005-05-19 16:02:44 -0400 (Thu, 19 May 2005)
New Revision: 165

Modified:
   trunk/source/bindings/Boost.Python/hardware_4stack_thread.pyste
   trunk/source/bindings/Boost.Python/hardware_cpu_thread.pyste
   trunk/source/python/AvidaGui2/pyHardwareCPUTrace.py
Log:
Boost.Python doesn't handle C++ arrays yet.  Excluded several array members.
Fixed Python for i in range issue.


Modified: trunk/source/bindings/Boost.Python/hardware_4stack_thread.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/hardware_4stack_thread.pyste	2005-05-19 19:43:30 UTC (rev 164)
+++ trunk/source/bindings/Boost.Python/hardware_4stack_thread.pyste	2005-05-19 20:02:44 UTC (rev 165)
@@ -4,4 +4,7 @@
 
 cHardware4Stack_Thread = Class("cHardware4Stack_Thread", "hardware_4stack_thread.hh")
 
+exclude(cHardware4Stack_Thread.heads)
+exclude(cHardware4Stack_Thread.local_stacks)
+
 # vim: set ft=python:

Modified: trunk/source/bindings/Boost.Python/hardware_cpu_thread.pyste
===================================================================
--- trunk/source/bindings/Boost.Python/hardware_cpu_thread.pyste	2005-05-19 19:43:30 UTC (rev 164)
+++ trunk/source/bindings/Boost.Python/hardware_cpu_thread.pyste	2005-05-19 20:02:44 UTC (rev 165)
@@ -3,4 +3,7 @@
 
 cHardwareCPU_Thread = Class("cHardwareCPU_Thread", "hardware_cpu_thread.hh")
 
+exclude(cHardwareCPU_Thread.reg)
+exclude(cHardwareCPU_Thread.heads)
+
 # vim: set ft=python:

Modified: trunk/source/python/AvidaGui2/pyHardwareCPUTrace.py
===================================================================
--- trunk/source/python/AvidaGui2/pyHardwareCPUTrace.py	2005-05-19 19:43:30 UTC (rev 164)
+++ trunk/source/python/AvidaGui2/pyHardwareCPUTrace.py	2005-05-19 20:02:44 UTC (rev 165)
@@ -40,8 +40,8 @@
     self.m_read_label_info.append(hardware.GetReadLabel().AsString().GetData())
 
     self.m_last_copied_instruction = max(
-      hardware.GetMemory().GetFlagCopied(i) and i or self.m_last_copied_instruction \
-      for i in range(self.m_last_copied_instruction, hardware.GetMemory().GetSize())
+      [hardware.GetMemory().GetFlagCopied(i) and i or self.m_last_copied_instruction \
+      for i in range(self.m_last_copied_instruction, hardware.GetMemory().GetSize())]
     )
     self.m_last_copy_info.append(self.m_last_copied_instruction)