[Avida-SVN] r3154 - in branches/interrupt: source/cpu tests/interruptModel_quorumSensing tests/interruptModel_quorumSensing/config tests/interruptModel_quorumSensing/expected tests/interruptModel_quorumSensing/expected/data
beckma24 at myxo.css.msu.edu
beckma24 at myxo.css.msu.edu
Sun Feb 22 16:49:22 PST 2009
Author: beckma24
Date: 2009-02-22 19:49:21 -0500 (Sun, 22 Feb 2009)
New Revision: 3154
Added:
branches/interrupt/tests/interruptModel_quorumSensing/expected/
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/average.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/count.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_average.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_compete.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_interrupt.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_repl.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_totalAvgEnergy.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/dominant.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/germline.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction_histogram.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/message.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/stats.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks_exe.dat
branches/interrupt/tests/interruptModel_quorumSensing/expected/data/time.dat
Modified:
branches/interrupt/source/cpu/cHardwareCPU.cc
branches/interrupt/source/cpu/cHardwareCPU.h
branches/interrupt/tests/interruptModel_quorumSensing/config/events.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate_even.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate_even.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate_even.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate.cfg
branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate_even.cfg
Log:
updated interrupt model instructions
Modified: branches/interrupt/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/interrupt/source/cpu/cHardwareCPU.cc 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/source/cpu/cHardwareCPU.cc 2009-02-23 00:49:21 UTC (rev 3154)
@@ -71,7 +71,7 @@
Processing interrupt
Save current state
Push interrupt arguments into registers, i.e. MSG contents are placed in BX & CX. This step will consume a nop that follows interrupt header
- Jump 1 instruction passed MSG_received_handler_START
+ Jump 1 instruction passed msg-handler
Process instructions until MSG_received_handler_END
On MSG_received_handler_END, process next interrupt or restore previous state
*/
@@ -120,7 +120,7 @@
// push interrupt arguments into registers, i.e. MSG contents are placed in BX & CX, nothing for movement
bool cLocalThread::initializeInterruptState(const cString& handlerHeadInstructionString) {
- //Jump all heads 1 instruction passed MSG_received_handler_START
+ //Jump all heads 1 instruction passed msg-handler
cInstruction label_inst = hardware->GetInstSet().GetInst(handlerHeadInstructionString);
cHeadCPU search_head(hardware->IP());
@@ -163,14 +163,14 @@
switch (interruptType) {
case cLocalThread::MSG_INTERRUPT:
- if(initializeInterruptState("MSG_received_handler_START")) {
+ if(initializeInterruptState("msg-handler")) {
hardware->IP().Retreat();
hardware->Inst_RetrieveMessage(m_world->GetDefaultContext());
hardware->IP().Advance();
}
break;
case cLocalThread::MOVE_INTERRUPT:
- if(initializeInterruptState("Moved_handler_START")) {
+ if(initializeInterruptState("moved_handler")) {
; // perform movement interrupt initialization here
}
break;
@@ -182,7 +182,7 @@
}
else if(interrupted && interruptType == cLocalThread::INTERRUPT_COMPLETE) { // currently interrupted
if(hardware->GetOrganism()->NumQueuedMessages() > 0) { // more messages to process
- if(initializeInterruptState("MSG_received_handler_START")) {
+ if(initializeInterruptState("msg-handler")) {
hardware->IP().Retreat();
hardware->Inst_RetrieveMessage(m_world->GetDefaultContext());
hardware->IP().Advance();
@@ -626,11 +626,9 @@
tInstLibEntry<tMethod>("alarm-label-low", &cHardwareCPU::Inst_Alarm_Label),
// Interrupt
- tInstLibEntry<tMethod>("MSG_received_handler_START", &cHardwareCPU::Inst_MSG_received_handler_START), // soon to be removed
- tInstLibEntry<tMethod>("msg_handler", &cHardwareCPU::Inst_MSG_received_handler_START), // don't use yet
- tInstLibEntry<tMethod>("moved_handler", &cHardwareCPU::Inst_Moved_handler_START), // don't use yet
- tInstLibEntry<tMethod>("interrupt_handler_END", &cHardwareCPU::Inst_interrupt_handler_END), // soon to be removed
- tInstLibEntry<tMethod>("end_handler", &cHardwareCPU::Inst_interrupt_handler_END),
+ tInstLibEntry<tMethod>("msg-handler", &cHardwareCPU::Inst_MSG_Handler),
+ tInstLibEntry<tMethod>("moved-handler", &cHardwareCPU::Inst_Moved_Handler), // not well tested.
+ tInstLibEntry<tMethod>("end-handler", &cHardwareCPU::Inst_End_Handler),
// Placebo instructions
tInstLibEntry<tMethod>("skip", &cHardwareCPU::Inst_Skip),
@@ -6111,8 +6109,8 @@
bool cHardwareCPU::moveInstructionHeadToInterruptEnd() {
- //Jump 1 instruction passed MSG_received_handler_START
- cInstruction label_inst = GetInstSet().GetInst("interrupt_handler_END"); //cStringUtil::Stringf("MSG_received_handler_END"));
+ //Jump 1 instruction passed msg-handler
+ cInstruction label_inst = GetInstSet().GetInst("end-handler"); //cStringUtil::Stringf("MSG_received_handler_END"));
cHeadCPU search_head(IP());
int start_pos = search_head.GetPosition();
@@ -6131,17 +6129,17 @@
}
// jumps one instruction passed MSG_received_handler_END
-bool cHardwareCPU::Inst_MSG_received_handler_START(cAvidaContext& ctx) {
+bool cHardwareCPU::Inst_MSG_Handler(cAvidaContext& ctx) {
m_advance_ip = false;
return moveInstructionHeadToInterruptEnd();
}
-bool cHardwareCPU::Inst_Moved_handler_START(cAvidaContext& ctx) {
+bool cHardwareCPU::Inst_Moved_Handler(cAvidaContext& ctx) {
m_advance_ip = false;
return moveInstructionHeadToInterruptEnd();
}
-bool cHardwareCPU::Inst_interrupt_handler_END(cAvidaContext& ctx) {
+bool cHardwareCPU::Inst_End_Handler(cAvidaContext& ctx) {
/*
Process instructions in interrupt handler until MSG_received_handler_END instruction
Modified: branches/interrupt/source/cpu/cHardwareCPU.h
===================================================================
--- branches/interrupt/source/cpu/cHardwareCPU.h 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/source/cpu/cHardwareCPU.h 2009-02-23 00:49:21 UTC (rev 3154)
@@ -700,9 +700,9 @@
bool Jump_To_Alarm_Label(int jump_label);
// interrupt
- bool Inst_MSG_received_handler_START(cAvidaContext& ctx);
- bool Inst_Moved_handler_START(cAvidaContext& ctx);
- bool Inst_interrupt_handler_END(cAvidaContext& ctx);
+ bool Inst_MSG_Handler(cAvidaContext& ctx);
+ bool Inst_Moved_Handler(cAvidaContext& ctx);
+ bool Inst_End_Handler(cAvidaContext& ctx);
bool moveInstructionHeadToInterruptEnd();
//// Placebo ////
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/events.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/events.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/events.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -50,4 +50,4 @@
u 25000:25000:end SavePopulation # Save current state of population.
#u 50000:50000 SaveHistoricPopulation # Save ancestors of current population.
#u 100000 exit # exit
-u 100 exit
\ No newline at end of file
+u 500 exit
\ No newline at end of file
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 5 0 10
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
#rotate-left-one 1 2 0 4
#rotate-right-one 1 2 0 4
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate_even.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate_even.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-LabelRotate_even.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 1 0 1
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
#rotate-left-one 1 1 0 1
#rotate-right-one 1 1 0 1
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 5 0 10
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
#rotate-left-one 1 2 0 4
#rotate-right-one 1 2 0 4
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate_even.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate_even.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-NextNeighborRotate_even.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 1 0 1
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
#rotate-left-one 1 1 0 1
#rotate-right-one 1 1 0 1
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 5 0 10
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
rotate-left-one 1 2 0 4
rotate-right-one 1 2 0 4
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate_even.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate_even.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-SingleStepRotate_even.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 1 0 1
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
rotate-left-one 1 1 0 1
rotate-right-one 1 1 0 1
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 5 0 10
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
rotate-left-one 1 2 0 4
rotate-right-one 1 2 0 4
Modified: branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate_even.cfg
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate_even.cfg 2009-02-23 00:19:00 UTC (rev 3153)
+++ branches/interrupt/tests/interruptModel_quorumSensing/config/instset-allRotate_even.cfg 2009-02-23 00:49:21 UTC (rev 3154)
@@ -5,8 +5,8 @@
repro 1 1 0 1
send-msg 1 1 0 1
-MSG_received_handler_START 1 1 0 1
-interrupt_handler_END 1 1 0 1
+msg-handler 1 1 0 1
+end-handler 1 1 0 1
rotate-left-one 1 1 0 1
rotate-right-one 1 1 0 1
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/average.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/average.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/average.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,25 @@
+# Avida Average Data
+# Sun Feb 22 19:42:20 2009
+# 1: Update
+# 2: Merit
+# 3: Gestation Time
+# 4: Fitness
+# 5: Repro Rate?
+# 6: Size
+# 7: Copied Size
+# 8: Executed Size
+# 9: Abundance
+# 10: Proportion of organisms that gave birth in this update
+# 11: Proportion of Breed True Organisms
+# 12: Genotype Depth
+# 13: Generation
+# 14: Neutral Metric
+# 15: Lineage Label
+# 16: True Replication Rate (based on births/update, time-averaged)
+
+0 643387.096774 50.000000 0.709677 0.000000 50.000000 50.000000 50.000000 31.000000 1.000000 1.000000 0.000000 0.709677 0.218400 0.000000 0.000000
+100 0 47.45 1 0 50.15 50.15 47.45 38.4615 0.682 0.682 0 20 0.662448 -1 0
+200 0 37.05 1 0 50.15 50.15 37.05 45.4545 0.042 0.042 0 20 0.778223 -1 0
+300 0 34.7143 1 0 49.7143 49.7143 34.7143 43.75 0.0628571 0.0628571 0 20 1.12836 -1 0
+400 1.50081 29.1 1 0 50.1 50.1 29.1 31.25 1.344 1.344 0 19.152 0.77411 -1 0
+500 0 27.2857 1 0 50.1429 50.1429 27.2857 43.75 0.0628571 0.0628571 0 20 -0.399715 -1 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/count.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/count.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/count.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,25 @@
+# Avida count data
+# Sun Feb 22 19:42:20 2009
+# 1: update
+# 2: number of insts executed this update
+# 3: number of organisms
+# 4: number of different genotypes
+# 5: number of different threshold genotypes
+# 6: number of different species
+# 7: number of different threshold species
+# 8: number of different lineages
+# 9: number of births in this update
+# 10: number of deaths in this update
+# 11: number of breed true
+# 12: number of breed true organisms?
+# 13: number of no-birth organisms
+# 14: number of single-threaded organisms
+# 15: number of multi-threaded organisms
+# 16: number of modified organisms
+
+0 1000 31 1 1 0 0 0 31 0 31 31 20 31 0 0
+100 13868 500 13 3 0 0 0 341 821 341 500 257 500 0 0
+200 0 500 11 3 0 0 0 21 501 21 500 250 500 0 0
+300 0 350 8 4 0 0 0 22 352 22 350 180 350 0 0
+400 12500 250 8 2 0 0 0 336 566 336 250 133 250 0 0
+500 0 350 8 2 0 0 0 22 352 22 350 178 350 0 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_average.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_average.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_average.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,68 @@
+# Avida Average Deme Data
+# Sun Feb 22 19:42:20 2009
+# 1: Update
+# 2: Count
+# 3: Age
+# 4: Births
+# 5: Organisms
+# 6: Generation
+# 7: Births (at last replication)
+# 8: Organisms (at last replication)
+# 9: Merit
+# 10: Gestation Time
+# 11: Time Used (normalized by org fitness)
+# 12: Generations between current and last founders
+# 13: Events killed
+# 14: Attempts to kill event
+
+0 20 0.000000 0.550000 1.550000 0.000000 0.000000 0.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+19 20 19 274.5 25 0 0 0 1 0 0 0 0 0
+20 20 20 292 25 0 0 0 1 0 0 0 0 0
+39 20 18 276 25 1.95 41.8713 10.735 1 5915.4 inf 0 0 0
+40 20 19 291.95 25 1.95 43 11.0244 1 5915.4 inf 0 0 0
+59 19 18 268.842 25 3.84211 53.0976 14.2111 1 5196.32 inf 0 0 0
+60 19 19 291.947 25 3.84211 53.4768 14.3212 1 5196.32 inf 0 0 0
+79 20 18 291.85 25 5.4 65.1599 15.716 1 4719.9 inf 0 0 0
+80 20 19 291.85 25 5.4 65.6219 15.7711 1 4719.9 inf 0 0 0
+99 20 18 277.6 25 7.15 66.9175 16.8471 1 4926 inf 0 0 0
+100 20 19 293.55 25 7.15 66.9721 16.8924 1 4926 inf 0 0 0
+119 20 18 260.45 25 8.3 74.8455 17.8007 1 7957.55 inf 0 0 0
+120 20 19 281.7 25 8.3 75.191 17.8405 1 7957.55 inf 0 0 0
+139 20 18 278.7 25 9.6 80.4125 18.4892 1 6826.2 inf 0 0 0
+140 20 19 292.35 25 9.6 80.6481 18.5185 1 6826.2 inf 0 0 0
+159 20 18 292.1 25 10.95 95.4467 19.2911 1 11771.7 inf 0 0 0
+160 20 19 292.1 25 10.95 96.1284 19.3267 1 11771.7 inf 0 0 0
+179 20 18 293.95 25 12.65 96.7556 19.8004 1 4277.8 inf 0 0 0
+180 20 19 293.95 25 12.65 96.7849 19.8226 1 4277.8 inf 0 0 0
+199 20 18 289.15 25 15.1 94.6662 19.9729 1 3708.1 inf 0 0 0
+200 20 19 289.15 25 15.1 94.5659 19.98 1 3708.1 inf 0 0 0
+219 20 18 289.2 24.8 16.6 95.1447 20.3108 1 5346.05 inf 0 0 0
+220 20 19 289.2 24.8 16.6 95.1724 20.3267 1 5346.05 inf 0 0 0
+239 19 18 289.579 24.7895 18.1053 94.805 20.479 1 4579.84 inf 0 0 0
+240 19 19 289.579 24.7895 18.1053 94.7935 20.486 1 4579.84 inf 0 0 0
+259 18 18 286.389 24.8333 19.4444 95.9177 20.5722 1 12889.9 inf 0 0 0
+260 18 19 286.389 24.8333 19.4444 95.9656 20.5776 1 12889.9 inf 0 0 0
+279 15 18 291.667 25 20.9333 96.2912 20.592 1 4272.27 inf 0 0 0
+280 15 19 291.667 25 20.9333 96.3486 20.5953 1 4272.27 inf 0 0 0
+299 14 18 291.143 25 22.1429 97.5814 20.4737 1 8127.36 inf 0 0 0
+300 14 19 291.143 25 22.1429 97.6952 20.4719 1 8127.36 inf 0 0 0
+319 15 18 291.267 25 23.6667 100.474 20.3421 1 8818.53 inf 0 0 0
+320 15 19 291.267 25 23.6667 100.65 20.3414 1 8818.53 inf 0 0 0
+339 11 18 229.455 25 24.8182 97.9338 20.2552 1 1626.64 inf 0 0 0
+340 11 19 250.273 25 24.8182 97.8594 20.2595 1 1626.64 inf 0 0 0
+359 9 18 179 25 26.2222 95.1036 19.9192 1 4588.33 3.74884 0 0 0
+360 9 19 203.778 25 26.2222 95.0859 19.9187 1 4588.33 3.74884 0 0 0
+379 8 18 132.25 25 27 92.6502 19.5158 1 3358.5 0.7412 0 0 0
+380 8 19 166.125 25 27 92.6658 19.5184 1 3358.5 0.7412 0 0 0
+399 10 18 246.4 25 28.8 90.3682 19.1967 1 4090.3 inf 0 0 0
+400 10 19 277.7 25 28.8 90.3342 19.1978 1 4090.3 inf 0 0 0
+419 10 18 218.2 25 30 89.2405 18.8502 1 4494.1 inf 0 0 0
+420 10 19 251.2 25 30 89.2685 18.8456 1 4494.1 inf 0 0 0
+439 10 18 197.4 25 32.7 90.3276 18.6522 1 8088 6.94235 0 0 0
+440 10 19 224.3 25 32.7 90.4617 18.6569 1 8088 6.94235 0 0 0
+459 10 18 182.2 25 35.7 88.954 18.4655 1 4421.2 1.33417 0 0 0
+460 10 19 210.4 25 35.7 88.954 18.4673 1 4421.2 1.33417 0 0 0
+479 13 18 289.923 25 38.2308 88.086 18.267 1 3677 0.663287 0 0 0
+480 13 19 289.923 25 38.2308 88.0783 18.2629 1 3677 0.663287 0 0 0
+499 14 18 292.071 25 40 89.2829 18.2024 1 5712 inf 0 0 0
+500 14 19 292.071 25 40 89.369 18.202 1 5712 inf 0 0 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_compete.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_compete.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_compete.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,31 @@
+# Avida compete demes data
+# Sun Feb 22 19:42:20 2009
+# 1: Update [update]
+# 2: Avg. deme fitness [avgfit]
+
+0 0.000000
+20 1.00002
+40 1.00002
+60 1.00002
+80 1.00002
+100 1.00002
+120 1.00003
+140 1.00002
+160 1.00002
+180 1.00002
+200 1.00002
+220 1.00002
+240 1.00002
+260 1.00002
+280 1.00002
+300 1.00002
+320 1.00002
+340 1.00007
+360 1.00038
+380 1.00141
+400 1.00002
+420 1.00006
+440 1.00018
+460 1.00036
+480 1.00001
+500 1.00002
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_interrupt.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_interrupt.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_interrupt.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,11 @@
+# Interrupt model stats averaged over all demes
+# Assumes each organism only contains a single thread!
+# Sun Feb 22 19:42:32 2009
+# 1: Update
+# 2: Organisms interrupted per deme
+
+99 0.600000
+199 0.8
+299 0.35
+399 0
+499 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_repl.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_repl.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_repl.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,35 @@
+# Avida deme replication data
+# Sun Feb 22 19:42:20 2009
+# 1: Update [update]
+# 2: Number of deme replications [numrepl]
+# 3: Mean deme gestation time [gesttime]
+# 4: Mean number of births within replicated demes [numbirths]
+# 5: Mean heritable merit of replicated demes [merit]
+# 6: Mean generation of replicated demes [generation]
+
+0 0 0.000000 0.000000 0.000000 0.000000
+20 16 15.75 218.875 1 0.4375
+40 16 16.25 237.312 1 2.25
+60 15 14.6667 214.733 1 4
+80 16 15 218.812 1 5.625
+100 15 17.3333 253.867 1 7.06667
+120 15 17.3333 244.267 1 8.13333
+140 13 20 291 1 9.76923
+160 16 18.75 272.938 1 11.0625
+180 16 12.5 183.938 1 13.6875
+200 16 18.75 271.75 1 15.0625
+220 16 17.5 251.875 1 16.8125
+240 15 15.0667 210.933 1 18.2667
+260 14 13.8571 187 1 20
+280 13 14.3846 179.385 1 21
+300 13 15.3846 201.231 1 22.7692
+320 15 15 174.533 1 23.7333
+340 15 15.4 116.4 1 25.3333
+360 14 17.5 102.857 1 26.5714
+380 17 17.2353 68.8235 1 28.0588
+400 15 12.7333 92.9333 1 29.8
+420 13 17.2308 133.154 1 31.4615
+440 14 16 110.357 1 33.6429
+460 14 14 108.286 1 36.0714
+480 15 14 175.067 1 38.1333
+500 15 14.1333 174.733 1 38.8667
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_totalAvgEnergy.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_totalAvgEnergy.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/deme_totalAvgEnergy.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,31 @@
+# Average energy for demes in the population
+# Sun Feb 22 19:42:20 2009
+# 1: update
+# 2: Total Average Energy
+
+0 99509045.000000
+20 1e+08
+40 1e+08
+60 1e+08
+80 1e+08
+100 1e+08
+120 1e+08
+140 1e+08
+160 1e+08
+180 1e+08
+200 1e+08
+220 1e+08
+240 1e+08
+260 1e+08
+280 1e+08
+300 1e+08
+320 1e+08
+340 1e+08
+360 1e+08
+380 1e+08
+400 1e+08
+420 1e+08
+440 1e+08
+460 1e+08
+480 1e+08
+500 1e+08
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/dominant.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/dominant.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/dominant.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,25 @@
+# Avida Dominant Data
+# Sun Feb 22 19:42:20 2009
+# 1: Update
+# 2: Average Merit of the Dominant Genotype
+# 3: Average Gestation Time of the Dominant Genotype
+# 4: Average Fitness of the Dominant Genotype
+# 5: Repro Rate?
+# 6: Size of Dominant Genotype
+# 7: Copied Size of Dominant Genotype
+# 8: Executed Size of Dominant Genotype
+# 9: Abundance of Dominant Genotype
+# 10: Number of Births
+# 11: Number of Dominant Breed True?
+# 12: Dominant Gene Depth
+# 13: Dominant Breed In
+# 14: Max Fitness?
+# 15: Genotype ID of Dominant Genotype
+# 16: Name of the Dominant Genotype
+
+0 497500.000000 50.000000 1.000000 0.020000 50 50.000000 50.000000 31 11 11 0 0 1.000000 1 050-aaaaa
+100 10178.4 50 1 0.02 50 50 50 75 53 53 0 0 1 33 050-aaaaq
+200 10463.9 25 1 0.04 50 50 25 125 0 0 0 0 1 87 050-aaacj
+300 10343.4 23 1 0.0434783 50 50 23 100 0 0 0 0 1 132 050-aaadf
+400 11105.1 50 1 0.02 50 50 50 50 71 71 0 0 1 203 050-aaaec
+500 10680.8 23 1 0.0434783 50 50 23 150 0 0 0 0 1 244 050-aaaeq
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/germline.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/germline.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/germline.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,31 @@
+# Avida germline data
+# Sun Feb 22 19:42:20 2009
+# 1: Update [update]
+# 2: Mean germline generation of replicated germlines [replgen]
+
+0 0.000000
+20 1.5
+40 2.4375
+60 3.06667
+80 3.875
+100 4.4
+120 5.33333
+140 5.69231
+160 6.375
+180 7.625
+200 8.5
+220 9.3125
+240 9.46667
+260 10.2143
+280 10.5385
+300 11.1538
+320 11.7333
+340 12.6
+360 13.1429
+380 14.4118
+400 14.7333
+420 15.3077
+440 16.4286
+460 16.9286
+480 17.4
+500 18.1333
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,20 @@
+# Avida instruction execution data
+# Sun Feb 22 19:42:20 2009
+# 1: Update
+# 2: nop-A
+# 3: nop-B
+# 4: nop-C
+# 5: nop-X
+# 6: repro
+# 7: send-msg
+# 8: msg-handler
+# 9: end-handler
+# 10: rotate-left-one
+# 11: rotate-right-one
+
+0 0 0 0 1078 22 0 0 0 0 0
+100 275 175 25 22475 500 50 0 25 0 200
+200 400 125 225 16800 500 225 0 0 150 100
+300 575 150 175 10825 350 25 0 50 0 0
+400 400 125 150 6325 250 0 0 0 25 0
+500 525 125 150 8375 350 0 0 0 25 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction_histogram.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction_histogram.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/instruction_histogram.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,18 @@
+# 1: Update
+# 2: nop-A
+# 3: nop-B
+# 4: nop-C
+# 5: nop-X
+# 6: repro
+# 7: send-msg
+# 8: msg-handler
+# 9: end-handler
+# 10: rotate-left-one
+# 11: rotate-right-one
+
+0 0 0 0 1519 31 0 0 0 0 0
+100 15 6 3 947 21 2 0 1 2 8
+200 24 16 11 903 30 10 0 1 6 3
+300 44 15 11 879 25 8 6 0 8 0
+400 39 14 15 862 30 9 13 3 14 4
+500 50 14 8 841 44 19 7 0 10 10
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/message.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/message.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/message.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,13 @@
+# Number of organsism to organisms messages
+
+# 1: update
+# 2: Totlal messages sent
+# 3: Sent successfully
+# 4: Dropped
+# 5: Failed
+
+99 687 658 0 29
+199 3852 3681 0 171
+299 311 298 0 13
+399 1 0 0 1
+499 0 0 0 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/stats.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/stats.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/stats.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,21 @@
+# Generic Statistics Data
+# Sun Feb 22 19:42:20 2009
+# 1: update
+# 2: average inferiority (energy)
+# 3: ave probability of any mutations in genome
+# 4: probability of any mutations in dom genome
+# 5: log(average fidelity)
+# 6: log(dominant fidelity)
+# 7: change in number of genotypes
+# 8: genotypic entropy
+# 9: species entropy
+# 10: depth of most reacent coalescence
+# 11: Total number of resamplings this generation
+# 12: Total number of organisms that failed to resample this generation
+
+0 0.342945 0.000000 0.000000 -0.000000 -0.000000 1 0.000000 0.000000 0 0 0
+100 0 0 0 -0 -0 0 2.43204 0 0 0 0
+200 0 0 0 -0 -0 0 2.22064 0 0 0 0
+300 0 0 0 -0 -0 0 1.94591 0 0 0 0
+400 0 0 0 -0 -0 0 2.02533 0 0 0 0
+500 0 0 0 -0 -0 0 1.77214 0 0 0 0
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,12 @@
+# Avida tasks data
+# Sun Feb 22 19:42:20 2009
+# First column gives the current update, next columns give the number
+# of organisms that have the particular task as a component of their merit
+# 1: Update
+
+0
+100
+200
+300
+400
+500
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks_exe.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks_exe.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/tasks_exe.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,12 @@
+# Avida tasks execution data
+# Sun Feb 22 19:42:20 2009
+# First column gives the current update, all further columns give the number
+# of times the particular task has been executed this update.
+# 1: Update
+
+0
+100
+200
+300
+400
+500
Added: branches/interrupt/tests/interruptModel_quorumSensing/expected/data/time.dat
===================================================================
--- branches/interrupt/tests/interruptModel_quorumSensing/expected/data/time.dat (rev 0)
+++ branches/interrupt/tests/interruptModel_quorumSensing/expected/data/time.dat 2009-02-23 00:49:21 UTC (rev 3154)
@@ -0,0 +1,13 @@
+# Avida time data
+# Sun Feb 22 19:42:20 2009
+# 1: update
+# 2: avida time
+# 3: average generation
+# 4: num_executed?
+
+0 0.000000 0.709677 1000
+100 5.50895 20 13868
+200 13.1872 20 0
+300 450.95 20 0
+400 452.177 19.152 12500
+500 456.735 20 0
More information about the Avida-cvs
mailing list