[Avida-cvs] [avida-svn] r723 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Wed May 31 11:02:34 PDT 2006
Author: baerb
Date: 2006-05-31 14:02:34 -0400 (Wed, 31 May 2006)
New Revision: 723
Modified:
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/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Fixed code so that default files start with @ instead of * (the * cause problems
on Windows computers)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py 2006-05-31 17:56:33 UTC (rev 722)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyDefaultFiles.py 2006-05-31 18:02:34 UTC (rev 723)
@@ -59,8 +59,8 @@
lines = lines + ["events.default", "# u 100:100:end print_tasks_exe_data # Num. times tasks have been executed."]
lines = lines + ["events.default", ""]
lines = lines + ["events.default", "# Setup the exit time and full population data collection."]
- lines = lines + ["events.default", "u 50000:50000 detail_pop # Save current state of population."]
- lines = lines + ["events.default", "u 50000:50000 dump_historic_pop # Save ancestors of current population."]
+ lines = lines + ["events.default", "# u 50000:50000 detail_pop # Save current state of population."]
+ lines = lines + ["events.default", "# u 50000:50000 dump_historic_pop # Save ancestors of current population."]
lines = lines + ["events.default", ""]
lines = lines + ["genesis.default", "#############################################################################"]
lines = lines + ["genesis.default", "# This file includes all the basic run-time defines for avida."]
@@ -90,7 +90,7 @@
lines = lines + ["genesis.default", "EVENT_FILE events.cfg # File containing list of events during run"]
lines = lines + ["genesis.default", "ANALYZE_FILE analyze.cfg # File used for analysis mode"]
lines = lines + ["genesis.default", "ENVIRONMENT_FILE environment.cfg # File that describes the environment"]
- lines = lines + ["genesis.default", "# START_CREATURE *ancestor.organism # Organism to seed the soup"]
+ lines = lines + ["genesis.default", "# START_CREATURE @ancestor.organism # Organism to seed the soup"]
lines = lines + ["genesis.default", ""]
lines = lines + ["genesis.default", "### Reproduction ###"]
lines = lines + ["genesis.default", "BIRTH_METHOD 4 # 0 = Replace random organism in neighborhood"]
@@ -280,17 +280,17 @@
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/*default.empty", "*SETTINGS"]
- lines = lines + ["freezer/*default.empty", "RANDOM_SEED 0"]
- lines = lines + ["freezer/*default.empty", "DEATH_METHOD 2"]
- lines = lines + ["freezer/*default.empty", "COPY_MUT_PROB 0.03"]
- lines = lines + ["freezer/*default.empty", "WORLD-X 30"]
- lines = lines + ["freezer/*default.empty", "WORLD-Y 30"]
- lines = lines + ["freezer/*default.empty", "BIRTH_METHOD 0"]
- lines = lines + ["freezer/*default.empty", "START_CREATURE0 default"]
- lines = lines + ["freezer/*default.empty", "AGE_LIMIT 100"]
- lines = lines + ["freezer/*default.empty", "MAX_UPDATES -1"]
- lines = lines + ["freezer/*ancestor.organism", "rucavcqgfcqapqcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccutycasvab"]
+ lines = lines + ["freezer/@default.empty", "*SETTINGS"]
+ lines = lines + ["freezer/@default.empty", "RANDOM_SEED 0"]
+ lines = lines + ["freezer/@default.empty", "DEATH_METHOD 2"]
+ lines = lines + ["freezer/@default.empty", "COPY_MUT_PROB 0.03"]
+ lines = lines + ["freezer/@default.empty", "WORLD-X 30"]
+ lines = lines + ["freezer/@default.empty", "WORLD-Y 30"]
+ lines = lines + ["freezer/@default.empty", "BIRTH_METHOD 0"]
+ lines = lines + ["freezer/@default.empty", "START_CREATURE0 default"]
+ lines = lines + ["freezer/@default.empty", "AGE_LIMIT 100"]
+ lines = lines + ["freezer/@default.empty", "MAX_UPDATES -1"]
+ lines = lines + ["freezer/@ancestor.organism", "rucavcqgfcqapqcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccutycasvab"]
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 2006-05-31 17:56:33 UTC (rev 722)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-05-31 18:02:34 UTC (rev 723)
@@ -28,7 +28,7 @@
self.m_cli_to_ctrl_dict = {}
self.m_ctrl_to_cli_dict = {}
if (session_mdl.directory_chosen == False):
- self.setCaption('%s - %s' % (avida_ed_version_string, "No Active Workspace") )
+ self.setCaption('%s - %s' % (avida_ed_version_string, "Unnamed Workspace") )
else:
self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
@@ -184,8 +184,8 @@
os.mkdir(os.path.join(new_dir,"freezer"))
filesToCopy = ["environment.default", "inst_set.default",
"events.default", "genesis.default",
- os.path.join("freezer", "default.empty"),
- os.path.join("freezer", "default.organism")]
+ os.path.join("freezer", "@default.empty"),
+ os.path.join("freezer", "@ancestor.organism")]
for fileName in filesToCopy:
sourceName = os.path.join(self.m_session_mdl.m_current_workspace,
fileName)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-05-31 17:56:33 UTC (rev 722)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-05-31 18:02:34 UTC (rev 723)
@@ -313,7 +313,7 @@
<widget class="QComboBox">
<item>
<property name="text">
- <string>*ancestor</string>
+ <string>@ancestor</string>
</property>
</item>
<property name="name">
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-05-31 17:56:33 UTC (rev 722)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-05-31 18:02:34 UTC (rev 723)
@@ -15,8 +15,6 @@
29-Apr-06 Change configuration on fly -- work with Kaben on the underlieing problem
-15-May-06 Make "default" organism named "*Ancestor"
-
Priority Low
-Under the sliders with ranges put a few values in grey that tell you the range min and max
@@ -27,7 +25,7 @@
-add the ability to tell genesis where you want the default organism to be
-16-Jan-06 Non-Fix length Genomes?
+16-Jan-06 Non-Fix length Genomes -- Much Later
29-Apr-06 Add "Environment Setting"/"Petri Dish" at top left of frame
@@ -136,8 +134,8 @@
16-Jan-06 Fix problem where start in menu bar not linked to start button -- Finished 26-May-06
+15-May-06 Make "default" organism named "*Ancestor" -- Finished 30-May-06
-
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
More information about the Avida-cvs
mailing list