[avida-cvs] avida(Sherri) CVS commits: /current bootstrap /current/doc code_environment.html environment.html events.html /current/source/cpu hardware_4stack.cc hardware_util.cc /current/source/main environment.cc tasks.cc /current/source/qt-viewer Makefile.am
goingssh
avida-cvs at alife.org
Wed Jun 4 17:36:38 PDT 2003
goingssh Wed Jun 4 09:36:38 2003 EDT
Modified files: (Branch: Sherri)
/avida/current bootstrap
/avida/current/doc code_environment.html environment.html
events.html
/avida/current/source/cpu hardware_4stack.cc hardware_util.cc
/avida/current/source/main environment.cc tasks.cc
/avida/current/source/qt-viewer Makefile.am
Log:
commiting merge of my branch (Sherri) with HEAD branch back to my branch, this version works on Windows except for a few minor bugs
-------------- next part --------------
Index: avida/current/bootstrap
diff -u avida/current/bootstrap:1.8 avida/current/bootstrap:1.8.2.1
--- avida/current/bootstrap:1.8 Tue May 20 07:22:29 2003
+++ avida/current/bootstrap Wed Jun 4 09:36:26 2003
@@ -12,7 +12,7 @@
# helps bootstrapping, when checked out from CVS
# requires GNU autoconf and GNU automake
#
-# $Id: bootstrap,v 1.8 2003/05/20 14:22:29 kaben Exp $
+# $Id: bootstrap,v 1.8.2.1 2003/06/04 16:36:26 goingssh Exp $
# this is not meant to be exported outside the source tree
Index: avida/current/doc/code_environment.html
diff -u avida/current/doc/code_environment.html:1.2.2.1 avida/current/doc/code_environment.html:1.2.2.2
--- avida/current/doc/code_environment.html:1.2.2.1 Thu May 29 11:20:57 2003
+++ avida/current/doc/code_environment.html Wed Jun 4 09:36:28 2003
@@ -301,4 +301,3 @@
<br><hr>
Project hosted by:<br>
<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=46761&type=2" width="125" height="37" border="0" alt="SourceForge.net"/></a>
-
\ No newline at end of file
Index: avida/current/doc/environment.html
diff -u avida/current/doc/environment.html:1.2.2.1 avida/current/doc/environment.html:1.2.2.2
--- avida/current/doc/environment.html:1.2.2.1 Thu May 29 11:20:58 2003
+++ avida/current/doc/environment.html Wed Jun 4 09:36:29 2003
@@ -438,4 +438,3 @@
<br><hr>
Project hosted by:<br>
<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=46761&type=2" width="125" height="37" border="0" alt="SourceForge.net"/></a>
-
\ No newline at end of file
Index: avida/current/doc/events.html
diff -u avida/current/doc/events.html:1.3.2.1 avida/current/doc/events.html:1.3.2.2
--- avida/current/doc/events.html:1.3.2.1 Thu May 29 11:20:58 2003
+++ avida/current/doc/events.html Wed Jun 4 09:36:29 2003
@@ -134,8 +134,8 @@
Print the current counts of each resource available to the population
to the file "resource.dat". This uses the environment configuration to
determine what resources are in use. Also creates seperate files
- "resource.dat.<i>resource_name</i>" for each spatial resource.
-
+ "resource_<i>resource_name</i>.m" (in a format that is designed to
+ be read into Matlab) for each spatial resource.
<p>
<li><b>print_dom</b> [<font color="#008800">filename</font>]<br>
Print the dominant organism's genome (and lots of information about it)
@@ -181,6 +181,11 @@
This event is used to output all of the ancestors of the currently
living population to the file specified, of "historic_dump.update#".
It uses the same format as the "detail_pop" event.
+<p>
+<li><b>print_genotype_map</b> [<fontcolor="#008800">filename</font>]<br>
+ This event is used to ouput a map of the gentype IDs for the
+ population grid to a file that is suitable to be read into Matlab.
+ Default file name: genotype_map.m
</menu>
<p>
@@ -261,4 +266,4 @@
<br><hr>
Project hosted by:<br>
<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=46761&type=2" width="125" height="37" border="0" alt="SourceForge.net"/></a>
-
\ No newline at end of file
+
Index: avida/current/source/cpu/hardware_4stack.cc
diff -u avida/current/source/cpu/hardware_4stack.cc:1.2.4.3 avida/current/source/cpu/hardware_4stack.cc:1.2.4.4
--- avida/current/source/cpu/hardware_4stack.cc:1.2.4.3 Thu May 29 11:20:59 2003
+++ avida/current/source/cpu/hardware_4stack.cc Wed Jun 4 09:36:29 2003
@@ -256,7 +256,6 @@
tHardware4StackMethod function;
};
static const cInstEntry4Stack s_f_array[] = {
- //<<<<<<< hardware_4stack.cc
//1
cInstEntry4Stack("Nop-A", &cHardware4Stack::Inst_Nop),
//2
@@ -330,14 +329,7 @@
//35
cInstEntry4Stack("ThreadKill", &cHardware4Stack::Inst_KillThread),
- /*=======
-
- Note: all entries of cNOPEntryCPU s_n_array must have corresponding
- in the same order in cInstEntryCPU s_f_array, and these entries must
- be the first elements of s_f_array.
-
- >>>>>>> 1.4
-
+ /*
cInstEntry4Stack("nop-A", &cHardware4Stack::Inst_Nop),
cInstEntry4Stack("nop-B", &cHardware4Stack::Inst_Nop),
cInstEntry4Stack("nop-C", &cHardware4Stack::Inst_Nop),
Index: avida/current/source/cpu/hardware_util.cc
diff -u avida/current/source/cpu/hardware_util.cc:1.23.2.3 avida/current/source/cpu/hardware_util.cc:1.23.2.4
--- avida/current/source/cpu/hardware_util.cc:1.23.2.3 Thu May 29 11:21:00 2003
+++ avida/current/source/cpu/hardware_util.cc Wed Jun 4 09:36:30 2003
@@ -383,17 +383,11 @@
// first instructions added to the set.
#ifndef USE_INST_SET_CODE
tDictionary< int > nop_dict;
- //<<<<<<< hardware_util.cc
nop_dict.Add("Nop-A", REG_AX);
nop_dict.Add("Nop-B", REG_BX);
nop_dict.Add("Nop-C", REG_CX);
nop_dict.Add("Nop-D", REG_DX);
- //=======
- //nop_dict.Add("nop-A", REG_AX);
- //nop_dict.Add("nop-B", REG_BX);
- //nop_dict.Add("nop-C", REG_CX);
#endif /* !USE_INST_SET_CODE */
- //>>>>>>> 1.25
// Build a dictionary of instructions and their corresponding methods...
#ifndef USE_INST_SET_CODE
@@ -672,16 +666,13 @@
// Placebo instructions
// nop-x (included with nops)
inst_dict.Add("skip", (tHardwareMethod) &cHardware4Stack::Inst_Skip);
-<<<<<<< hardware_util.cc
*/
cout << "BLEE! Instruction Library in util has " << inst_dict.GetSize()
<< " instructions + " << nop_dict.GetSize() << " nops." << endl;
- //=======
#endif /* !USE_INST_SET_CODE */
#ifdef USE_INST_SET_CODE
- //>>>>>>> 1.25
/* XXX start -- kgn */
tDictionary<int> nop_dict;
for(int i=0; i<inst_set.GetInstLib()->GetNumNops(); i++)
Index: avida/current/source/main/environment.cc
diff -u avida/current/source/main/environment.cc:1.11.2.2 avida/current/source/main/environment.cc:1.11.2.3
--- avida/current/source/main/environment.cc:1.11.2.2 Wed May 21 10:17:29 2003
+++ avida/current/source/main/environment.cc Wed Jun 4 09:36:33 2003
@@ -11,7 +11,7 @@
#include "../tools/string_util.hh"
-using namespace std;
+using namespace std;
cEnvironment::cEnvironment()
Index: avida/current/source/main/tasks.cc
diff -u avida/current/source/main/tasks.cc:1.25 avida/current/source/main/tasks.cc:1.25.2.1
--- avida/current/source/main/tasks.cc:1.25 Tue May 20 05:07:59 2003
+++ avida/current/source/main/tasks.cc Wed Jun 4 09:36:34 2003
@@ -294,20 +294,19 @@
NewTask(name, "Math 3AB (sqrt(X)+sqrt(Y)+sqrt(Z))", &cTaskLib::Task_Math3in_AB);
else if (name == "math_3AC")
NewTask(name, "Math 3AC (X+2Y+3Z)", &cTaskLib::Task_Math3in_AC);
- else if (name == "math_3AD")
- NewTask(name, "Math 3AD (XY^2+Z^3)", &cTaskLib::Task_Math3in_AD);
- else if (name == "math_3AE")
- NewTask(name, "Math 3AE ((X%Y)*Z)", &cTaskLib::Task_Math3in_AE);
/*
- Visual Studio.net gives compiler error:
+ Visual Studio.net 2003 gives compiler error:
fatal error C1061: compiler limit : blocks nested too deeply
- Somebody in the lab, can't remember who, fixed this by removing
- the 'else' in the next line.
+ Sherri fixed this by removing the 'else' in the next line.
-- K
*/
- //else if (name == "math_3AF")
- // NewTask(name, "Math 3AF ((X+Y)^2+sqrt(Y+Z))", &cTaskLib::Task_Math3in_AF);
- if (name == "math_3AF")
+ //else if (name == "math_3AD")
+ // NewTask(name, "Math 3AD (XY^2+Z^3)", &cTaskLib::Task_Math3in_AD);
+ if (name == "math_3AD")
+ NewTask(name, "Math 3AD (XY^2+Z^3)", &cTaskLib::Task_Math3in_AD);
+ else if (name == "math_3AE")
+ NewTask(name, "Math 3AE ((X%Y)*Z)", &cTaskLib::Task_Math3in_AE);
+ else if (name == "math_3AF")
NewTask(name, "Math 3AF ((X+Y)^2+sqrt(Y+Z))", &cTaskLib::Task_Math3in_AF);
else if (name == "math_3AG")
NewTask(name, "Math 3AG ((XY)%(YZ))", &cTaskLib::Task_Math3in_AG);
@@ -325,6 +324,7 @@
NewTask(name, "Math 3AM ((X+Y)^2+(Y+Z)^2)", &cTaskLib::Task_Math3in_AM);
// Make sure we have actuall found a task.
+
if (task_array.GetSize() == start_size) {
cerr << "Unknown task entry '" << name << "'." << endl;
return NULL;
Index: avida/current/source/qt-viewer/Makefile.am
diff -u avida/current/source/qt-viewer/Makefile.am:1.46.2.1 avida/current/source/qt-viewer/Makefile.am:1.46.2.2
--- avida/current/source/qt-viewer/Makefile.am:1.46.2.1 Fri May 23 12:05:38 2003
+++ avida/current/source/qt-viewer/Makefile.am Wed Jun 4 09:36:34 2003
@@ -28,7 +28,7 @@
perl $(srcdir)/../event/make_events.pl $(<:%.events=%)
qt-viewer: qt-viewer.qmakefile cPopulation_enums_auto.ci FORCE
echo "srcdir: $(srcdir)"
- make -f qt-viewer.qmakefile
+ ${MAKE} -f qt-viewer.qmakefile
.PHONY: FORCE
mostlyclean-local:
More information about the Avida-cvs
mailing list