[Avida-cvs] [Avida2-svn] r324 - trunk/source/support

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-09-22 09:02:13 -0400 (Thu, 22 Sep 2005)
New Revision: 324

Modified:
   trunk/source/support/genesis.smt
   trunk/source/support/inst_set.smt
   trunk/source/support/organism.smt
Log:
Modify SMT default files to work(?).

Modified: trunk/source/support/genesis.smt
===================================================================
--- trunk/source/support/genesis.smt	2005-09-22 04:27:49 UTC (rev 323)
+++ trunk/source/support/genesis.smt	2005-09-22 13:02:13 UTC (rev 324)
@@ -42,13 +42,13 @@
 ALLOC_METHOD 0    # 0 = Allocated space is set to default instruction.
                   # 1 = Set to section of dead genome (Necrophilia)
                   # 2 = Allocated space is set to random instruction.
-DIVIDE_METHOD 2   # 0 = Divide leaves state of mother untouched.
+DIVIDE_METHOD 1   # 0 = Divide leaves state of mother untouched.
                   # 1 = Divide resets state of mother
                   #     (after the divide, we have 2 children)
 		  # 2 = Divide resets only the current thread of the mother
 		  #     (useful in 4-stack CPU w/ parasites)
 
-GENERATION_INC_METHOD 0 # 0 = Only the generation of the child is
+GENERATION_INC_METHOD 1 # 0 = Only the generation of the child is
                         #     increased on divide.
 			# 1 = Both the generation of the mother and child are
 			#     increased on divide (good with DIVIDE_METHOD 1).
@@ -64,7 +64,7 @@
 
 # mutations that occur during execution..
 POINT_MUT_PROB  0.0     # Mutation rate (per-location per update)
-COPY_MUT_PROB   0.0075  # Mutation rate (per copy).
+COPY_MUT_PROB   0.01  # Mutation rate (per copy).
 
 # mutations that occur on divide...
 INS_MUT_PROB    0.0     # Insertion rate (per site, applied on divide).

Modified: trunk/source/support/inst_set.smt
===================================================================
--- trunk/source/support/inst_set.smt	2005-09-22 04:27:49 UTC (rev 323)
+++ trunk/source/support/inst_set.smt	2005-09-22 13:02:13 UTC (rev 324)
@@ -1,38 +1,36 @@
-Nop-A      	1	#1 	(a)	
-Nop-B      	1  	#2	(b)
-Nop-C      	1   	#3	(c)
-Nop-D		1	#4	(d)
-#Nop-X		1	#	
-Val-Shift-R    	1	#5	(e)
-Val-Shift-L    	1   	#6	(f)
-Val-Nand      	1   	#7	(g)
-Val-Add        	1   	#8	(h)
-Val-Sub        	1   	#9	(i)
-Val-Mult	1	#10	(j)
-Val-Div		1	#11	(k)
-SetMemory    	1   	#12	(l)
-Divide   	1   	#13 	(m)
-Inst-Read	1	#14	(n)
-Inst-Write	1	#15	(o)
-#Inst-Copy     	1   	     	()
-If-Equal	1	#16	(p)
-If-Not-Equal  	1	#17	(q)
-If-Less    	1   	#18	(r)
-If-Greater	1	#19	(s)
-Head-Push	1	#20	(t)
-Head-Pop	1	#21	(u)
-Head-Move   	1   	#22   	(v)
-Search   	1   	#23  	(w)
-Push-Next	1	#24	(x)
-Push-Prev	1	#25	(y)
-Push-Comp	1	#26	(z)
-Val-Delete	1	#27	(A)
-Val-Copy	1	#28	(B)
-#ThreadFork	1	#29	()
-#if-label   	1   		()
-Val-Inc		1	#30	(C)
-Val-Dec		1	#31 	(D)
-Val-Mod		1	#32	(E)
-#ThreadKill	1	#33	()
-IO		1	#34	(F)
-Inject		1	#35	(G)
\ No newline at end of file
+Nop-A         1  #1  (a)	
+Nop-B         1  #2  (b)
+Nop-C         1  #3  (c)
+Nop-D         1  #4  (d)
+#Nop-X        1  #5  ()
+Val-Shift-R   1  #6  (e)
+Val-Shift-L   1  #7  (f)
+Val-Nand      1  #8  (g)
+Val-Add       1  #9  (h)
+Val-Sub       1  #10 (i)
+Val-Mult      1  #11 (j)
+Val-Div       1  #12 (k)
+SetMemory    	1  #13 (l)
+Divide        1  #14 (m)
+Inst-Read     1  #15 (n)
+Inst-Write    1  #16 (o)
+If-Equal      1  #17 (p)
+If-Not-Equal  1  #18 (q)
+If-Less       1  #19 (r)
+If-Greater    1  #20 (s)
+Head-Push     1  #21 (t)
+Head-Pop      1  #22 (u)
+Head-Move     1  #23 (v)
+Search        1  #24 (w)
+Push-Next     1  #25 (x)
+Push-Prev     1  #26 (y)
+Push-Comp     1  #27 (z)
+Val-Delete    1  #28 (A)
+Val-Copy      1  #29 (B)
+#ThreadFork   1  #30 ()
+Val-Inc       1  #31 (C)
+Val-Dec       1  #32 (D)
+Val-Mod       1  #33 (E)
+#ThreadKill   1  #34 ()
+IO            1  #35 (F)
+#Inject        1  #36 (G)

Modified: trunk/source/support/organism.smt
===================================================================
--- trunk/source/support/organism.smt	2005-09-22 04:27:49 UTC (rev 323)
+++ trunk/source/support/organism.smt	2005-09-22 13:02:13 UTC (rev 324)
@@ -3,10 +3,11 @@
 Search       #  1:  Find organism end.
 Nop-C        #  2:  - Match CD:AB
 Nop-D
-#ThreadFork   #  3:
-#Nop-D	     #  4:
 Push-Prev    #  5:  Move end position to Stack-A
 SetMemory    #  6:  Place FLOW-head in memory space for offspring
+Nop-A        #      - Memory space labeled Nop-A Nop-A Nop-A
+Nop-A
+Nop-A
 Head-Move    #  7:  Move Write head to flow head position
 Nop-C        #  8:
 Nop-C        #  8: