[Avida-SVN] r1464 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Thu Apr 5 14:24:34 PDT 2007
Author: baerb
Date: 2007-04-05 17:24:34 -0400 (Thu, 05 Apr 2007)
New Revision: 1464
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Fixed one spelling error.
Added files to create when making a new workspace.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2007-04-05 21:05:56 UTC (rev 1463)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2007-04-05 21:24:34 UTC (rev 1464)
@@ -76,7 +76,7 @@
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>Crreate New Workspace</string>
+ <string>Create New Workspace</string>
</property>
<property name="toolTip" stdset="0">
<string><P>Create a new workspace to save your work</P></string>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py 2007-04-05 21:05:56 UTC (rev 1463)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py 2007-04-05 21:24:34 UTC (rev 1464)
@@ -1,3 +1,5 @@
+import os.path
+
class pyDefaultFiles:
def __init__(self, out_file_name = None, full_out_file_name = None):
@@ -280,17 +282,53 @@
lines = lines + ["inst_set.default", ""]
lines = lines + ["inst_set.default", "# Search with no template returns current position (abs line number) in"]
lines = lines + ["inst_set.default", "# genome."]
- lines = lines + ["freezer/@example.empty", "*SETTINGS"]
- lines = lines + ["freezer/@example.empty", "RANDOM_SEED 0"]
- lines = lines + ["freezer/@example.empty", "DEATH_METHOD 2"]
- lines = lines + ["freezer/@example.empty", "COPY_MUT_PROB 0.03"]
- lines = lines + ["freezer/@example.empty", "WORLD-X 30"]
- lines = lines + ["freezer/@example.empty", "WORLD-Y 30"]
- lines = lines + ["freezer/@example.empty", "BIRTH_METHOD 0"]
- lines = lines + ["freezer/@example.empty", "START_CREATURE0 default"]
- lines = lines + ["freezer/@example.empty", "AGE_LIMIT 100"]
- lines = lines + ["freezer/@example.empty", "MAX_UPDATES -1"]
- lines = lines + ["freezer/@ancestor.organism", "rucavcqgfcqapqcccccccccccccccccccccccccccutycasvab"]
+ tmp_file_name = os.path.join("freezer", "@example.empty")
+ lines = lines + [tmp_file_name, "*SETTINGS"]
+ lines = lines + [tmp_file_name, "RANDOM_SEED 0"]
+ lines = lines + [tmp_file_name, "DEATH_METHOD 2"]
+ lines = lines + [tmp_file_name, "COPY_MUT_PROB 0.03"]
+ lines = lines + [tmp_file_name, "WORLD-X 30"]
+ lines = lines + [tmp_file_name, "WORLD-Y 30"]
+ lines = lines + [tmp_file_name, "BIRTH_METHOD 0"]
+ lines = lines + [tmp_file_name, "START_CREATURE0 default"]
+ lines = lines + [tmp_file_name, "AGE_LIMIT 100"]
+ lines = lines + [tmp_file_name, "MAX_UPDATES -1"]
+ lines = lines + [tmp_file_name, "REWARD_NOT YES"]
+ lines = lines + [tmp_file_name, "REWARD_NAND YES"]
+ lines = lines + [tmp_file_name, "REWARD_AND YES"]
+ lines = lines + [tmp_file_name, "REWARD_ORN YES"]
+ lines = lines + [tmp_file_name, "REWARD_OR YES"]
+ lines = lines + [tmp_file_name, "REWARD_ANDN YES"]
+ lines = lines + [tmp_file_name, "REWARD_NOR YES"]
+ lines = lines + [tmp_file_name, "REWARD_XOR YES"]
+ lines = lines + [tmp_file_name, "REWARD_EQU YES"]
+ tmp_file_name = os.path.join("freezer", "@ancestor.organism")
+ lines = lines + [tmp_file_name, "rucavcqgfcqapqcccccccccccccccccccccccccccutycasvab"]
+ tmp_file_name = os.path.join("freezer", "@example.full", "average.dat")
+ lines = lines + [tmp_file_name, "0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "]
+ lines = lines + [tmp_file_name, "1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "]
+ tmp_file_name = os.path.join("freezer", "@example.full", "count.dat")
+ lines = lines + [tmp_file_name, "0 30 1 1 1 0 0 1 1 0 1 1 1 1 0 0 "]
+ lines = lines + [tmp_file_name, "1 30 1 1 1 0 0 1 0 0 0 1 1 1 0 0"]
+ tmp_file_name = os.path.join("freezer", "@example.full", "petri_dish")
+ lines = lines + [tmp_file_name, "*SETTINGS"]
+ lines = lines + [tmp_file_name, "BIRTH_METHOD 0"]
+ lines = lines + [tmp_file_name, "COPY_MUT_PROB 0.02"]
+ lines = lines + [tmp_file_name, "MAX_UPDATES -1"]
+ lines = lines + [tmp_file_name, "RANDOM_SEED 0"]
+ lines = lines + [tmp_file_name, "REWARD_AND YES"]
+ lines = lines + [tmp_file_name, "REWARD_ANDN YES"]
+ lines = lines + [tmp_file_name, "REWARD_EQU YES"]
+ lines = lines + [tmp_file_name, "REWARD_NAND YES"]
+ lines = lines + [tmp_file_name, "REWARD_NOR YES"]
+ lines = lines + [tmp_file_name, "REWARD_NOT YES"]
+ lines = lines + [tmp_file_name, "REWARD_OR YES"]
+ lines = lines + [tmp_file_name, "REWARD_ORN YES"]
+ lines = lines + [tmp_file_name, "REWARD_XOR YES"]
+ lines = lines + [tmp_file_name, "START_CREATURE0 @ancestor"]
+ lines = lines + [tmp_file_name, "START_GENOME0 rucavcqgfcqapqcccccccccccccccccccccccccccutycasvab"]
+ lines = lines + [tmp_file_name, "WORLD-X 30"]
+ lines = lines + [tmp_file_name, "WORLD-Y 30"]
out_lines = []
num_lines = len(lines)/2
for line_num in range(num_lines):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2007-04-05 21:05:56 UTC (rev 1463)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2007-04-05 21:24:34 UTC (rev 1464)
@@ -234,10 +234,14 @@
else:
os.mkdir(new_dir)
os.mkdir(os.path.join(new_dir,"freezer"))
+ os.mkdir(os.path.join(new_dir,"freezer","@example.full"))
filesToCopy = ["environment.default", "inst_set.default",
"events.default", "genesis.default",
os.path.join("freezer", "@example.empty"),
- os.path.join("freezer", "@ancestor.organism")]
+ os.path.join("freezer", "@ancestor.organism"),
+ os.path.join("freezer", "@example.full", "average.dat"),
+ os.path.join("freezer", "@example.full", "count.dat"),
+ os.path.join("freezer", "@example.full", "petri_dish")]
for fileName in filesToCopy:
sourceName = os.path.join(self.m_session_mdl.m_current_workspace,
fileName)
@@ -245,6 +249,7 @@
if (os.path.exists(sourceName)):
shutil.copyfile(sourceName, destName)
else:
+ descr(" BDB fileName = " + fileName + " destName = " + destName)
pyDefaultFiles(fileName, destName)
self.m_session_mdl.m_current_workspace = str(new_dir)
self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2007-04-05 21:05:56 UTC (rev 1463)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2007-04-05 21:24:34 UTC (rev 1464)
@@ -4,8 +4,12 @@
Work to do before June 2007:
-26-Sep-06 Add @example.full with just one organism.
+Add import capability.
+Add bug reporing to web forum
+
+Make videos for Rob
+
31-Aug-06 Remove full path name from organism viewer
03-Jul-06 Add some more data sets -- Default, Replication Only, All Nine, Funky Org, zoo
@@ -257,6 +261,7 @@
- Changed Crreate to Create
- When creating a new workspace REWARD_xxx lines are added to @example.empty
+ - When creating a new workspace add @example.full with just one organism.
************Kaben******************
More information about the Avida-cvs
mailing list