[avida-cvs] avida(kaben) CVS commits: /current/source/qt-viewer setup_wizard_config.cc setup_wizard_config.hh testwizard_validators.cc wizard.ui
kaben
avida-cvs at alife.org
Thu May 29 23:47:03 PDT 2003
kaben Thu May 29 15:47:03 2003 EDT
Modified files: (Branch: kaben)
/avida/current/source/qt-viewer setup_wizard_config.cc
setup_wizard_config.hh
testwizard_validators.cc wizard.ui
Log:
fixed incompatibility between setup assistant and class cConfig.
-------------- next part --------------
Index: avida/current/source/qt-viewer/setup_wizard_config.cc
diff -u avida/current/source/qt-viewer/setup_wizard_config.cc:1.4.2.2 avida/current/source/qt-viewer/setup_wizard_config.cc:1.4.2.3
--- avida/current/source/qt-viewer/setup_wizard_config.cc:1.4.2.2 Tue May 20 08:19:33 2003
+++ avida/current/source/qt-viewer/setup_wizard_config.cc Thu May 29 15:47:01 2003
@@ -82,7 +82,7 @@
// Task Merit Method
task_merit_method = genesis.ReadInt("TASK_MERIT_METHOD", TASK_MERIT_NORMAL);
- max_num_tasks_rewarded = genesis.ReadInt("MAX_NUM_TASKS_REWARDED", -1);
+ //max_num_tasks_rewarded = genesis.ReadInt("MAX_NUM_TASKS_REWARDED", -1);
max_label_exe_size = genesis.ReadInt("MAX_LABEL_EXE_SIZE", 1);
// Load Mutation Info
@@ -94,18 +94,18 @@
divide_ins_prob = genesis.ReadFloat("DIVIDE_INS_PROB");
divide_del_prob = genesis.ReadFloat("DIVIDE_DEL_PROB");
parent_mut_prob = genesis.ReadFloat("PARENT_MUT_PROB");
- crossover_prob = genesis.ReadFloat("CROSSOVER_PROB");
- aligned_cross_prob = genesis.ReadFloat("ALIGNED_CROSS_PROB");
- exe_err_prob = genesis.ReadFloat("EXE_ERROR_PROB");
+ //crossover_prob = genesis.ReadFloat("CROSSOVER_PROB");
+ //aligned_cross_prob = genesis.ReadFloat("ALIGNED_CROSS_PROB");
+ //exe_err_prob = genesis.ReadFloat("EXE_ERROR_PROB");
// Load Viewer Info...
view_mode = genesis.ReadInt("VIEW_MODE");
- viewer_type = genesis.ReadInt("VIEWER_TYPE",0);
+ //viewer_type = genesis.ReadInt("VIEWER_TYPE",0);
- log_breed_count = genesis.ReadInt("LOG_BREED_COUNT", 0);
+ //log_breed_count = genesis.ReadInt("LOG_BREED_COUNT", 0);
log_creatures = genesis.ReadInt("LOG_CREATURES", 0);
- log_phylogeny = genesis.ReadInt("LOG_PHYLOGENY", 0);
+ //log_phylogeny = genesis.ReadInt("LOG_PHYLOGENY", 0);
log_genotypes = genesis.ReadInt("LOG_GENOTYPES", 0);
log_threshold_only = false;
@@ -114,7 +114,8 @@
log_threshold = genesis.ReadInt("LOG_THRESHOLD", 0);
log_species = genesis.ReadInt("LOG_SPECIES", 0);
log_landscape = genesis.ReadInt("LOG_LANDSCAPE", 0);
- log_mutations = genesis.ReadInt("LOG_MUTATIONS", 0);
+/* FIXME -- removed from base class. -- k */
+ //log_mutations = genesis.ReadInt("LOG_MUTATIONS", 0);
log_lineages = genesis.ReadInt("LOG_LINEAGES", 0);
}
@@ -284,9 +285,9 @@
exit(0);
} else {
arg_num++; if (arg_num < argc) cur_arg = args[arg_num];
- viewer_type = cur_arg.AsInt();
+ //viewer_type = cur_arg.AsInt();
}
- genesis.AddInput("VIEWER_TYPE", viewer_type);
+ //genesis.AddInput("VIEWER_TYPE", viewer_type);
} else if (cur_arg == "-g" || cur_arg == "-genesis") {
@@ -513,10 +514,12 @@
cSetupAssistantConfig::setTaskMeritMethod(int _task_merit_method){
task_merit_method = _task_merit_method;
}
-void
-cSetupAssistantConfig::setMaxNumTasksRewarded(int _max_num_tasks_rewarded){
- max_num_tasks_rewarded = _max_num_tasks_rewarded;
-}
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setMaxNumTasksRewarded(int _max_num_tasks_rewarded){
+// max_num_tasks_rewarded = _max_num_tasks_rewarded;
+//}
+/**/
void
cSetupAssistantConfig::setMaxLabelExeSize(int _max_label_exe_size){
max_label_exe_size = _max_label_exe_size;
@@ -550,44 +553,57 @@
cSetupAssistantConfig::setDivideDelProb(double _divide_del_prob){
divide_del_prob = _divide_del_prob;
}
-void
-cSetupAssistantConfig::setParentMutProb(double _parent_mut_prob){
- parent_mut_prob = _parent_mut_prob;
-}
-void
-cSetupAssistantConfig::setCrossoverProb(double _crossover_prob){
- crossover_prob = _crossover_prob;
-}
-void
-cSetupAssistantConfig::setAlignedCrossoverProb(double _aligned_cross_prob){
- aligned_cross_prob = _aligned_cross_prob;
-}
-void
-cSetupAssistantConfig::setExeErrProb(double _exe_err_prob){
- exe_err_prob = _exe_err_prob;
-}
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setParentMutProb(double _parent_mut_prob){
+// parent_mut_prob = _parent_mut_prob;
+//}
+/**/
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setCrossoverProb(double _crossover_prob){
+// crossover_prob = _crossover_prob;
+//}
+/**/
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setAlignedCrossoverProb(double _aligned_cross_prob){
+// aligned_cross_prob = _aligned_cross_prob;
+//}
+/**/
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setExeErrProb(double _exe_err_prob){
+// exe_err_prob = _exe_err_prob;
+//}
+/**/
void
cSetupAssistantConfig::setViewMode(int _view_mode){
view_mode = _view_mode;
}
-void
-cSetupAssistantConfig::setViewerType(int _viewer_type){
- viewer_type = _viewer_type;
-}
-
-void
-cSetupAssistantConfig::setLogBreedCount(int _log_breed_count){
- log_breed_count = _log_breed_count;
-}
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setViewerType(int _viewer_type){
+// viewer_type = _viewer_type;
+//}
+
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setLogBreedCount(int _log_breed_count){
+// log_breed_count = _log_breed_count;
+//}
+/**/
void
cSetupAssistantConfig::setLogCreatures(int _log_creatures){
log_creatures = _log_creatures;
}
-void
-cSetupAssistantConfig::setLogPhylogeny(int _log_phylogeny){
- log_phylogeny = _log_phylogeny;
-}
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setLogPhylogeny(int _log_phylogeny){
+// log_phylogeny = _log_phylogeny;
+//}
+/**/
void
cSetupAssistantConfig::setLogGenotypes(int _log_genotypes){
@@ -611,10 +627,11 @@
cSetupAssistantConfig::setLogLandscape(int _log_landscape){
log_landscape = _log_landscape;
}
-void
-cSetupAssistantConfig::setLogMutations(int _log_mutations){
- log_mutations = _log_mutations;
-}
+/* FIXME -- removed from base class. -- k */
+//void
+//cSetupAssistantConfig::setLogMutations(int _log_mutations){
+// log_mutations = _log_mutations;
+//}
void
cSetupAssistantConfig::setLogLineages(int _log_lineages){
log_lineages = _log_lineages;
Index: avida/current/source/qt-viewer/setup_wizard_config.hh
diff -u avida/current/source/qt-viewer/setup_wizard_config.hh:1.2.2.1 avida/current/source/qt-viewer/setup_wizard_config.hh:1.2.2.2
--- avida/current/source/qt-viewer/setup_wizard_config.hh:1.2.2.1 Tue May 20 05:12:36 2003
+++ avida/current/source/qt-viewer/setup_wizard_config.hh Thu May 29 15:47:01 2003
@@ -85,7 +85,8 @@
static void setMeritTime(int);
static void setTaskMeritMethod(int);
- static void setMaxNumTasksRewarded(int);
+ /* FIXME -- removed from base class. -- k */
+ //static void setMaxNumTasksRewarded(int);
static void setMaxLabelExeSize(int);
static void setPointMutProb(double);
@@ -95,17 +96,24 @@
static void setDivideMutProb(double);
static void setDivideInsProb(double);
static void setDivideDelProb(double);
- static void setParentMutProb(double);
- static void setCrossoverProb(double);
- static void setAlignedCrossoverProb(double);
- static void setExeErrProb(double);
+/* FIXME -- removed from base class. -- k */
+ //static void setParentMutProb(double);
+/* FIXME -- removed from base class. -- k */
+ //static void setCrossoverProb(double);
+/* FIXME -- removed from base class. -- k */
+ //static void setAlignedCrossoverProb(double);
+/* FIXME -- removed from base class. -- k */
+ //static void setExeErrProb(double);
static void setViewMode(int);
- static void setViewerType(int);
+/* FIXME -- removed from base class. -- k */
+ //static void setViewerType(int);
- static void setLogBreedCount(int);
+/* FIXME -- removed from base class. -- k */
+ //static void setLogBreedCount(int);
static void setLogCreatures(int);
- static void setLogPhylogeny(int);
+/* FIXME -- removed from base class. -- k */
+ //static void setLogPhylogeny(int);
static void setLogGenotypes(int);
// watch out. only call after calling setLogGenotypes().
Index: avida/current/source/qt-viewer/testwizard_validators.cc
diff -u avida/current/source/qt-viewer/testwizard_validators.cc:1.4.2.3 avida/current/source/qt-viewer/testwizard_validators.cc:1.4.2.4
--- avida/current/source/qt-viewer/testwizard_validators.cc:1.4.2.3 Tue May 20 08:19:33 2003
+++ avida/current/source/qt-viewer/testwizard_validators.cc Thu May 29 15:47:01 2003
@@ -390,9 +390,10 @@
cSetupAssistantConfig::setTaskMeritMethod(
m_current_genwrap->intValue("TASK_MERIT_METHOD", ok)
);
- cSetupAssistantConfig::setMaxNumTasksRewarded(
- m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setMaxNumTasksRewarded(
+ // m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok)
+ //);
cSetupAssistantConfig::setMaxLabelExeSize(
m_current_genwrap->intValue("MAX_LABEL_EXE_SIZE", ok)
);
@@ -418,35 +419,42 @@
cSetupAssistantConfig::setDivideDelProb(
m_current_genwrap->dblValue("DIVIDE_DEL_PROB", ok)
);
- cSetupAssistantConfig::setParentMutProb(
- m_current_genwrap->dblValue("PARENT_MUT_PROB", ok)
- );
- cSetupAssistantConfig::setCrossoverProb(
- m_current_genwrap->dblValue("CROSSOVER_PROB", ok)
- );
- cSetupAssistantConfig::setAlignedCrossoverProb(
- m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok)
- );
- cSetupAssistantConfig::setExeErrProb(
- m_current_genwrap->dblValue("EXE_ERROR_PROB", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setParentMutProb(
+ //m_current_genwrap->dblValue("PARENT_MUT_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setCrossoverProb(
+ //m_current_genwrap->dblValue("CROSSOVER_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setAlignedCrossoverProb(
+ //m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setExeErrProb(
+ //m_current_genwrap->dblValue("EXE_ERROR_PROB", ok)
+ //);
cSetupAssistantConfig::setViewMode(
m_current_genwrap->intValue("VIEW_MODE", ok)
);
- cSetupAssistantConfig::setViewerType(
- m_current_genwrap->intValue("VIEWER_TYPE", ok)
- );
-
- cSetupAssistantConfig::setLogBreedCount(
- m_current_genwrap->intValue("LOG_BREED_COUNT", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setViewerType(
+ // m_current_genwrap->intValue("VIEWER_TYPE", ok)
+ //);
+
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogBreedCount(
+ // m_current_genwrap->intValue("LOG_BREED_COUNT", ok)
+ //);
cSetupAssistantConfig::setLogCreatures(
m_current_genwrap->intValue("LOG_CREATURES", ok)
);
- cSetupAssistantConfig::setLogPhylogeny(
- m_current_genwrap->intValue("LOG_PHYLOGENY", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogPhylogeny(
+ // m_current_genwrap->intValue("LOG_PHYLOGENY", ok)
+ //);
cSetupAssistantConfig::setLogGenotypes(
m_current_genwrap->intValue("LOG_GENOTYPES", ok)
@@ -462,9 +470,10 @@
cSetupAssistantConfig::setLogLandscape(
m_current_genwrap->intValue("LOG_LANDSCAPE", ok)
);
- cSetupAssistantConfig::setLogMutations(
- m_current_genwrap->intValue("LOG_MUTATIONS", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogMutations(
+ // m_current_genwrap->intValue("LOG_MUTATIONS", ok)
+ //);
cSetupAssistantConfig::setLogLineages(
m_current_genwrap->intValue("LOG_LINEAGES", ok)
);
@@ -1443,9 +1452,10 @@
if(ok) m_detailed_cpmut_le->setText(QString("%1").arg(dblval));
else GenDebug(" --- ");
- dblval = m_current_genwrap->dblValue("EXE_ERROR_PROB", ok);
- if(ok) m_detailed_exeerror_le->setText(QString("%1").arg(dblval));
- else GenDebug(" --- ");
+/* FIXME -- removed from base class. -- k */
+ //dblval = m_current_genwrap->dblValue("EXE_ERROR_PROB", ok);
+ //if(ok) m_detailed_exeerror_le->setText(QString("%1").arg(dblval));
+ //else GenDebug(" --- ");
dblval = m_current_genwrap->dblValue("INS_MUT_PROB", ok);
if(ok) m_detailed_insmut_le->setText(QString("%1").arg(dblval));
@@ -1470,8 +1480,9 @@
double copy_mut_prob = m_detailed_cpmut_le->text().toDouble(&ok);
if(!ok) result += "copy_mut_prob not a floating point number\n";
- double exe_error_prob = m_detailed_exeerror_le->text().toDouble(&ok);
- if(!ok) result += "exe_error_prob not a floating point number\n";
+/* FIXME -- removed from base class. -- k */
+ //double exe_error_prob = m_detailed_exeerror_le->text().toDouble(&ok);
+ //if(!ok) result += "exe_error_prob not a floating point number\n";
double ins_mut_prob = m_detailed_insmut_le->text().toDouble(&ok);
if(!ok) result += "ins_mut_prob not a floating point number\n";
@@ -1490,10 +1501,11 @@
"COPY_MUT_PROB",
copy_mut_prob
);
- m_current_genwrap->set(
- "EXE_ERROR_PROB",
- exe_error_prob
- );
+/* FIXME -- removed from base class. -- k */
+ //m_current_genwrap->set(
+ // "EXE_ERROR_PROB",
+ // exe_error_prob
+ //);
m_current_genwrap->set(
"INS_MUT_PROB",
ins_mut_prob
@@ -1514,9 +1526,10 @@
double dblval;
QString strval;
- dblval = m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok);
- if(ok) m_detailed_alignedcrossover_le->setText(QString("%1").arg(dblval));
- else GenDebug(" --- ");
+/* FIXME -- removed from base class. -- k */
+ //dblval = m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok);
+ //if(ok) m_detailed_alignedcrossover_le->setText(QString("%1").arg(dblval));
+ //else GenDebug(" --- ");
dblval = m_current_genwrap->dblValue("PARENT_MUT_PROB", ok);
if(ok) m_detailed_divparentmut_le->setText(QString("%1").arg(dblval));
@@ -1534,9 +1547,10 @@
if(ok) m_detailed_divinsmut_le->setText(QString("%1").arg(dblval));
else GenDebug(" --- ");
- dblval = m_current_genwrap->dblValue("CROSSOVER_PROB", ok);
- if(ok) m_detailed_crossover_le->setText(QString("%1").arg(dblval));
- else GenDebug(" --- ");
+/* FIXME -- removed from base class. -- k */
+ //dblval = m_current_genwrap->dblValue("CROSSOVER_PROB", ok);
+ //if(ok) m_detailed_crossover_le->setText(QString("%1").arg(dblval));
+ //else GenDebug(" --- ");
result = title(page);
return result;
@@ -1548,8 +1562,9 @@
QString result = QString::null;
bool ok;
- double aligned_cross_prob = m_detailed_alignedcrossover_le->text().toDouble(&ok);
- if(!ok) result += "aligned_cross_prob not a floating point number\n";
+/* FIXME -- removed from base class. -- k */
+ //double aligned_cross_prob = m_detailed_alignedcrossover_le->text().toDouble(&ok);
+ //if(!ok) result += "aligned_cross_prob not a floating point number\n";
double parent_mut_prob = m_detailed_divparentmut_le->text().toDouble(&ok);
if(!ok) result += "parent_mut_prob not a floating point number\n";
@@ -1563,15 +1578,17 @@
double divide_ins_prob = m_detailed_divinsmut_le->text().toDouble(&ok);
if(!ok) result += "divide_ins_prob not a floating point number\n";
- double crossover_prob = m_detailed_crossover_le->text().toDouble(&ok);
- if(!ok) result += "crossover_prob not a floating point number\n";
+/* FIXME -- removed from base class. -- k */
+ //double crossover_prob = m_detailed_crossover_le->text().toDouble(&ok);
+ //if(!ok) result += "crossover_prob not a floating point number\n";
if(QString::null != result) return result;
- m_current_genwrap->set(
- "ALIGNED_CROSS_PROB",
- aligned_cross_prob
- );
+/* FIXME -- removed from base class. -- k */
+ //m_current_genwrap->set(
+ // "ALIGNED_CROSS_PROB",
+ // aligned_cross_prob
+ //);
m_current_genwrap->set(
"PARENT_MUT_PROB",
parent_mut_prob
@@ -1588,10 +1605,11 @@
"DIVIDE_INS_PROB",
divide_ins_prob
);
- m_current_genwrap->set(
- "CROSSOVER_PROB",
- crossover_prob
- );
+/* FIXME -- removed from base class. -- k */
+ //m_current_genwrap->set(
+ // "CROSSOVER_PROB",
+ // crossover_prob
+ //);
GenDebug(" --- okay");
return result;
@@ -1855,9 +1873,10 @@
);
else GenDebug(" --- ");
- intval = m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok);
- if(ok) m_detailed_maxtasks_rewarded_le->setText(QString("%1").arg(intval));
- else GenDebug(" --- ");
+/* FIXME -- removed from base class. -- k */
+ //intval = m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok);
+ //if(ok) m_detailed_maxtasks_rewarded_le->setText(QString("%1").arg(intval));
+ //else GenDebug(" --- ");
intval = m_current_genwrap->intValue("TASK_MERIT_METHOD", ok);
if(ok) m_detailed_taskmerit_method_cb->setCurrentItem(
@@ -1875,15 +1894,17 @@
QString result = QString::null;
bool ok;
- int MAX_NUM_TASKS_REWARDED = m_detailed_maxtasks_rewarded_le->text().toInt(&ok);
- if(!ok) result += "MAX_NUM_TASKS_REWARDED not an integer\n";
+/* FIXME -- removed from base class. -- k */
+ //int MAX_NUM_TASKS_REWARDED = m_detailed_maxtasks_rewarded_le->text().toInt(&ok);
+ //if(!ok) result += "MAX_NUM_TASKS_REWARDED not an integer\n";
if(QString::null != result) return result;
- m_current_genwrap->set(
- "MAX_NUM_TASKS_REWARDED",
- MAX_NUM_TASKS_REWARDED
- );
+/* FIXME -- removed from base class. -- k */
+ //m_current_genwrap->set(
+ // "MAX_NUM_TASKS_REWARDED",
+ // MAX_NUM_TASKS_REWARDED
+ //);
m_current_genwrap->set(
"MERIT_TIME",
m_merit_time_map.filechoice(
@@ -2061,17 +2082,19 @@
);
else GenDebug(" --- ");
- intval = m_current_genwrap->intValue("LOG_BREED_COUNT", ok);
- if(ok) m_detailed_log_breedcount_cb->setCurrentItem(
- m_on_off_map.cbindex(intval)
- );
- else GenDebug(" --- ");
+/* FIXME -- removed from base class. -- k */
+ //intval = m_current_genwrap->intValue("LOG_BREED_COUNT", ok);
+ //if(ok) m_detailed_log_breedcount_cb->setCurrentItem(
+ // m_on_off_map.cbindex(intval)
+ // );
+ //else GenDebug(" --- ");
- intval = m_current_genwrap->intValue("LOG_PHYLOGENY", ok);
- if(ok) m_detailed_log_phylogeny_cb->setCurrentItem(
- m_on_off_map.cbindex(intval)
- );
- else GenDebug(" --- ");
+/* FIXME -- removed from base class. -- k */
+ //intval = m_current_genwrap->intValue("LOG_PHYLOGENY", ok);
+ //if(ok) m_detailed_log_phylogeny_cb->setCurrentItem(
+ // m_on_off_map.cbindex(intval)
+ // );
+ //else GenDebug(" --- ");
intval = m_current_genwrap->intValue("LOG_CREATURES", ok);
if(ok) m_detailed_log_creatures_cb->setCurrentItem(
@@ -2130,18 +2153,20 @@
m_detailed_log_mutations_cb->currentItem()
)
);
- m_current_genwrap->set(
- "LOG_BREED_COUNT",
- m_on_off_map.filechoice(
- m_detailed_log_breedcount_cb->currentItem()
- )
- );
- m_current_genwrap->set(
- "LOG_PHYLOGENY",
- m_on_off_map.filechoice(
- m_detailed_log_phylogeny_cb->currentItem()
- )
- );
+/* FIXME -- removed from base class. -- k */
+ //m_current_genwrap->set(
+ // "LOG_BREED_COUNT",
+ // m_on_off_map.filechoice(
+ // m_detailed_log_breedcount_cb->currentItem()
+ // )
+ //);
+/* FIXME -- removed from base class. -- k */
+ //m_current_genwrap->set(
+ // "LOG_PHYLOGENY",
+ // m_on_off_map.filechoice(
+ // m_detailed_log_phylogeny_cb->currentItem()
+ // )
+ //);
m_current_genwrap->set(
"LOG_CREATURES",
m_on_off_map.filechoice(
@@ -2528,9 +2553,10 @@
cSetupAssistantConfig::setTaskMeritMethod(
m_current_genwrap->intValue("TASK_MERIT_METHOD", ok)
);
- cSetupAssistantConfig::setMaxNumTasksRewarded(
- m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setMaxNumTasksRewarded(
+ // m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok)
+ //);
cSetupAssistantConfig::setMaxLabelExeSize(
m_current_genwrap->intValue("MAX_LABEL_EXE_SIZE", ok)
);
@@ -2556,35 +2582,42 @@
cSetupAssistantConfig::setDivideDelProb(
m_current_genwrap->dblValue("DIVIDE_DEL_PROB", ok)
);
- cSetupAssistantConfig::setParentMutProb(
- m_current_genwrap->dblValue("PARENT_MUT_PROB", ok)
- );
- cSetupAssistantConfig::setCrossoverProb(
- m_current_genwrap->dblValue("CROSSOVER_PROB", ok)
- );
- cSetupAssistantConfig::setAlignedCrossoverProb(
- m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok)
- );
- cSetupAssistantConfig::setExeErrProb(
- m_current_genwrap->dblValue("EXE_ERROR_PROB", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setParentMutProb(
+ //m_current_genwrap->dblValue("PARENT_MUT_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setCrossoverProb(
+ //m_current_genwrap->dblValue("CROSSOVER_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setAlignedCrossoverProb(
+ //m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setExeErrProb(
+ //m_current_genwrap->dblValue("EXE_ERROR_PROB", ok)
+ //);
cSetupAssistantConfig::setViewMode(
m_current_genwrap->intValue("VIEW_MODE", ok)
);
- cSetupAssistantConfig::setViewerType(
- m_current_genwrap->intValue("VIEWER_TYPE", ok)
- );
-
- cSetupAssistantConfig::setLogBreedCount(
- m_current_genwrap->intValue("LOG_BREED_COUNT", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setViewerType(
+ // m_current_genwrap->intValue("VIEWER_TYPE", ok)
+ //);
+
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogBreedCount(
+ // m_current_genwrap->intValue("LOG_BREED_COUNT", ok)
+ //);
cSetupAssistantConfig::setLogCreatures(
m_current_genwrap->intValue("LOG_CREATURES", ok)
);
- cSetupAssistantConfig::setLogPhylogeny(
- m_current_genwrap->intValue("LOG_PHYLOGENY", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogPhylogeny(
+ // m_current_genwrap->intValue("LOG_PHYLOGENY", ok)
+ //);
cSetupAssistantConfig::setLogGenotypes(
m_current_genwrap->intValue("LOG_GENOTYPES", ok)
@@ -2600,9 +2633,10 @@
cSetupAssistantConfig::setLogLandscape(
m_current_genwrap->intValue("LOG_LANDSCAPE", ok)
);
- cSetupAssistantConfig::setLogMutations(
- m_current_genwrap->intValue("LOG_MUTATIONS", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogMutations(
+ // m_current_genwrap->intValue("LOG_MUTATIONS", ok)
+ //);
cSetupAssistantConfig::setLogLineages(
m_current_genwrap->intValue("LOG_LINEAGES", ok)
);
@@ -2954,9 +2988,10 @@
cSetupAssistantConfig::setTaskMeritMethod(
m_current_genwrap->intValue("TASK_MERIT_METHOD", ok)
);
- cSetupAssistantConfig::setMaxNumTasksRewarded(
- m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setMaxNumTasksRewarded(
+ // m_current_genwrap->intValue("MAX_NUM_TASKS_REWARDED", ok)
+ //);
cSetupAssistantConfig::setMaxLabelExeSize(
m_current_genwrap->intValue("MAX_LABEL_EXE_SIZE", ok)
);
@@ -2982,35 +3017,42 @@
cSetupAssistantConfig::setDivideDelProb(
m_current_genwrap->dblValue("DIVIDE_DEL_PROB", ok)
);
- cSetupAssistantConfig::setParentMutProb(
- m_current_genwrap->dblValue("PARENT_MUT_PROB", ok)
- );
- cSetupAssistantConfig::setCrossoverProb(
- m_current_genwrap->dblValue("CROSSOVER_PROB", ok)
- );
- cSetupAssistantConfig::setAlignedCrossoverProb(
- m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok)
- );
- cSetupAssistantConfig::setExeErrProb(
- m_current_genwrap->dblValue("EXE_ERROR_PROB", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setParentMutProb(
+ //m_current_genwrap->dblValue("PARENT_MUT_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setCrossoverProb(
+ //m_current_genwrap->dblValue("CROSSOVER_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setAlignedCrossoverProb(
+ //m_current_genwrap->dblValue("ALIGNED_CROSS_PROB", ok)
+ //);
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setExeErrProb(
+ //m_current_genwrap->dblValue("EXE_ERROR_PROB", ok)
+ //);
cSetupAssistantConfig::setViewMode(
m_current_genwrap->intValue("VIEW_MODE", ok)
);
- cSetupAssistantConfig::setViewerType(
- m_current_genwrap->intValue("VIEWER_TYPE", ok)
- );
-
- cSetupAssistantConfig::setLogBreedCount(
- m_current_genwrap->intValue("LOG_BREED_COUNT", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setViewerType(
+ // m_current_genwrap->intValue("VIEWER_TYPE", ok)
+ //);
+
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogBreedCount(
+ // m_current_genwrap->intValue("LOG_BREED_COUNT", ok)
+ //);
cSetupAssistantConfig::setLogCreatures(
m_current_genwrap->intValue("LOG_CREATURES", ok)
);
- cSetupAssistantConfig::setLogPhylogeny(
- m_current_genwrap->intValue("LOG_PHYLOGENY", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogPhylogeny(
+ // m_current_genwrap->intValue("LOG_PHYLOGENY", ok)
+ //);
cSetupAssistantConfig::setLogGenotypes(
m_current_genwrap->intValue("LOG_GENOTYPES", ok)
@@ -3026,9 +3068,10 @@
cSetupAssistantConfig::setLogLandscape(
m_current_genwrap->intValue("LOG_LANDSCAPE", ok)
);
- cSetupAssistantConfig::setLogMutations(
- m_current_genwrap->intValue("LOG_MUTATIONS", ok)
- );
+/* FIXME -- removed from base class. -- k */
+ //cSetupAssistantConfig::setLogMutations(
+ // m_current_genwrap->intValue("LOG_MUTATIONS", ok)
+ //);
cSetupAssistantConfig::setLogLineages(
m_current_genwrap->intValue("LOG_LINEAGES", ok)
);
Index: avida/current/source/qt-viewer/wizard.ui
diff -u avida/current/source/qt-viewer/wizard.ui:1.6.2.1 avida/current/source/qt-viewer/wizard.ui:1.6.2.2
--- avida/current/source/qt-viewer/wizard.ui:1.6.2.1 Tue May 20 08:19:33 2003
+++ avida/current/source/qt-viewer/wizard.ui Thu May 29 15:47:01 2003
@@ -3506,12 +3506,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <property name="margin">
- <number>11</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
<widget class="QTextEdit">
<property name="name">
<cstring>TextEdit20</cstring>
@@ -3519,9 +3513,6 @@
<property name="text">
<string><b>Variable Glossary:</b>
<p>
-<b>execution error:</b>
-per execution step probability that an instruction chosen at random from the library of available instructions is executed, rather than the current instruction.
-<p>
<b>point mutation:</b>
per location per update probability that instructions are randomly changed.
<p>
@@ -3557,23 +3548,6 @@
<cstring>m_detailed_delmut_le</cstring>
</property>
</widget>
- <spacer row="0" column="0">
- <property name="name">
- <cstring>Spacer126_2</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
<widget class="QLineEdit" row="3" column="1">
<property name="name">
<cstring>m_detailed_ptmut_le</cstring>
@@ -3600,7 +3574,7 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>20</height>
+ <height>38</height>
</size>
</property>
</spacer>
@@ -3617,7 +3591,7 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>20</height>
+ <height>39</height>
</size>
</property>
</spacer>
@@ -3634,7 +3608,7 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>20</height>
+ <height>38</height>
</size>
</property>
</spacer>
@@ -3672,7 +3646,7 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>20</height>
+ <height>39</height>
</size>
</property>
</spacer>
@@ -3689,23 +3663,10 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>20</height>
+ <height>38</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="1" column="0">
- <property name="name">
- <cstring>TextLabel8_4</cstring>
- </property>
- <property name="text">
- <string>Execution error:</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="1" column="1">
- <property name="name">
- <cstring>m_detailed_exeerror_le</cstring>
- </property>
- </widget>
<widget class="QLineEdit" row="7" column="1">
<property name="name">
<cstring>m_detailed_insmut_le</cstring>
@@ -3757,13 +3718,7 @@
per location per divide probability that random instructions are deleted from the daughter's genome.
<p>
<b>parent mutation:</b>
-per site probability, applied on divide, that the parent's instructions are randomly changed.
-<p>
-<b>crossover:</b>
-per divide probability that a substring of instructions, with random start and end points, from the parent is swapped with a substring of instructions, with random start and end points, from the daughter.
-<p>
-<b>aligned crossover:</b>
-per divide probability that a substring with random start and end points from the parent is swapped with a substring having the same start and end points from the daughter.</string>
+per site probability, applied on divide, that the parent's instructions are randomly changed.</string>
</property>
<property name="readOnly">
<bool>true</bool>
@@ -3816,28 +3771,6 @@
<string>Ins. mut. on divide:</string>
</property>
</widget>
- <widget class="QLineEdit" row="11" column="1">
- <property name="name">
- <cstring>m_detailed_alignedcrossover_le</cstring>
- </property>
- </widget>
- <spacer row="12" column="0">
- <property name="name">
- <cstring>Spacer138</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
<spacer row="2" column="0">
<property name="name">
<cstring>Spacer133</cstring>
@@ -3871,14 +3804,6 @@
<string>Pt. mut. on divide:</string>
</property>
</widget>
- <widget class="QLabel" row="9" column="0">
- <property name="name">
- <cstring>TextLabel8_3_3_2_2</cstring>
- </property>
- <property name="text">
- <string>Crossover:</string>
- </property>
- </widget>
<widget class="QLineEdit" row="7" column="1">
<property name="name">
<cstring>m_detailed_divparentmut_le</cstring>
@@ -3923,14 +3848,6 @@
<cstring>m_detailed_divptmut_le</cstring>
</property>
</widget>
- <widget class="QLabel" row="11" column="0">
- <property name="name">
- <cstring>TextLabel8_3_3_2_2_2</cstring>
- </property>
- <property name="text">
- <string>Aligned crossover:</string>
- </property>
- </widget>
<widget class="QLineEdit" row="5" column="1">
<property name="name">
<cstring>m_detailed_divdelmut_le</cstring>
@@ -3958,28 +3875,6 @@
<cstring>m_detailed_divinsmut_le</cstring>
</property>
</widget>
- <spacer row="10" column="0">
- <property name="name">
- <cstring>Spacer137</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QLineEdit" row="9" column="1">
- <property name="name">
- <cstring>m_detailed_crossover_le</cstring>
- </property>
- </widget>
</grid>
</widget>
</hbox>
@@ -4555,9 +4450,7 @@
<p>
<b>task merit method:</b> determines whether or not to reward organisms for completing computation tasks by increasing their merit.
<p>
-<b>calculate merit after:</b> whether to recalculate an organism's merit after it performs a computation task, or to wait until after the organism's next division to recalculate.
-<p>
-<b>maximum tasks rewarded:</b> an artificial upper limit on the number of tasks for which each organism can be rewarded.</string>
+<b>calculate merit after:</b> whether to recalculate an organism's merit after it performs a computation task, or to wait until after the organism's next division to recalculate.</string>
</property>
<property name="readOnly">
<bool>true</bool>
@@ -4592,14 +4485,6 @@
<cstring>m_detailed_meritcalc_time_cb</cstring>
</property>
</widget>
- <widget class="QLabel" row="5" column="0">
- <property name="name">
- <cstring>TextLabel27</cstring>
- </property>
- <property name="text">
- <string>Max. tasks rewarded:</string>
- </property>
- </widget>
<widget class="QLabel" row="1" column="0">
<property name="name">
<cstring>TextLabel24</cstring>
@@ -4633,11 +4518,6 @@
<string>Calculate merit after:</string>
</property>
</widget>
- <widget class="QLineEdit" row="5" column="1">
- <property name="name">
- <cstring>m_detailed_maxtasks_rewarded_le</cstring>
- </property>
- </widget>
<spacer row="4" column="0">
<property name="name">
<cstring>Spacer151</cstring>
@@ -4655,23 +4535,6 @@
</size>
</property>
</spacer>
- <spacer row="6" column="0">
- <property name="name">
- <cstring>Spacer151_2</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
<spacer row="0" column="0">
<property name="name">
<cstring>Spacer152</cstring>
@@ -5100,12 +4963,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <property name="margin">
- <number>11</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
<widget class="QTextEdit">
<property name="name">
<cstring>TextEdit28</cstring>
@@ -5119,284 +4976,259 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>Layout166</cstring>
+ <cstring>layout57</cstring>
</property>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <property name="margin">
- <number>0</number>
- </property>
- <property name="spacing">
- <number>6</number>
- </property>
- <widget class="QLabel" row="8" column="0">
- <property name="name">
- <cstring>TextLabel44</cstring>
- </property>
- <property name="text">
- <string>Log mutations:</string>
- </property>
- </widget>
- <widget class="QLabel" row="6" column="0">
- <property name="name">
- <cstring>TextLabel42</cstring>
- </property>
- <property name="text">
- <string>Log genealogy:</string>
- </property>
- </widget>
- <widget class="QComboBox" row="6" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>All</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Parents only</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_genealogy_cb</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="9" column="0">
- <property name="name">
- <cstring>TextLabel45</cstring>
- </property>
- <property name="text">
- <string>Lineage creation method:</string>
- </property>
- </widget>
- <widget class="QLabel" row="7" column="0">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>TextLabel43</cstring>
+ <cstring>layout56</cstring>
</property>
- <property name="text">
- <string>Log landscape:</string>
- </property>
- </widget>
- <widget class="QLabel" row="3" column="0">
- <property name="name">
- <cstring>TextLabel39</cstring>
+ <grid>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel" row="2" column="0">
+ <property name="name">
+ <cstring>TextLabel39</cstring>
+ </property>
+ <property name="text">
+ <string>Log genotypes:</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="3" column="0">
+ <property name="name">
+ <cstring>TextLabel40</cstring>
+ </property>
+ <property name="text">
+ <string>Log threshold:</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="1" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>On</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_creatures_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="7" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>On</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_mutations_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="4" column="0">
+ <property name="name">
+ <cstring>TextLabel41</cstring>
+ </property>
+ <property name="text">
+ <string>Log species:</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="3" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>On</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_threshold_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="8" column="1">
+ <item>
+ <property name="text">
+ <string>Manual (on inject)</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>If child fit. > parent's</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>If child fit. > population's max</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>If child (in dom. lin.) fit. > dom. lin. max</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>If child fit. > dom. lin. max</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>FIXME: same as above?</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>If child fit. > man in own lin.</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_lineagecreation_method_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="5" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>All</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Parents only</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_genealogy_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="8" column="0">
+ <property name="name">
+ <cstring>TextLabel45</cstring>
+ </property>
+ <property name="text">
+ <string>Lineage creation method:</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="4" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>On</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_species_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="6" column="0">
+ <property name="name">
+ <cstring>TextLabel43</cstring>
+ </property>
+ <property name="text">
+ <string>Log landscape:</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="7" column="0">
+ <property name="name">
+ <cstring>TextLabel44</cstring>
+ </property>
+ <property name="text">
+ <string>Log mutations:</string>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="2" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Log all</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Log threshold only</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_genotypes_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QComboBox" row="6" column="1">
+ <item>
+ <property name="text">
+ <string>Off</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>On</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_detailed_log_landscape_cb</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="1" column="0">
+ <property name="name">
+ <cstring>TextLabel37</cstring>
+ </property>
+ <property name="text">
+ <string>Log creatures:</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="5" column="0">
+ <property name="name">
+ <cstring>TextLabel42</cstring>
+ </property>
+ <property name="text">
+ <string>Log genealogy:</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer125</cstring>
</property>
- <property name="text">
- <string>Log genotypes:</string>
- </property>
- </widget>
- <widget class="QComboBox" row="8" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_mutations_cb</cstring>
- </property>
- </widget>
- <widget class="QComboBox" row="0" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_breedcount_cb</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="5" column="0">
- <property name="name">
- <cstring>TextLabel41</cstring>
- </property>
- <property name="text">
- <string>Log species:</string>
- </property>
- </widget>
- <widget class="QLabel" row="4" column="0">
- <property name="name">
- <cstring>TextLabel40</cstring>
- </property>
- <property name="text">
- <string>Log threshold:</string>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>TextLabel36</cstring>
- </property>
- <property name="text">
- <string>Log breed count:</string>
- </property>
- </widget>
- <widget class="QLabel" row="2" column="0">
- <property name="name">
- <cstring>TextLabel38</cstring>
- </property>
- <property name="text">
- <string>Log phylogeny:</string>
- </property>
- </widget>
- <widget class="QComboBox" row="2" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_phylogeny_cb</cstring>
- </property>
- </widget>
- <widget class="QComboBox" row="1" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_creatures_cb</cstring>
- </property>
- </widget>
- <widget class="QComboBox" row="4" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_threshold_cb</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="1" column="0">
- <property name="name">
- <cstring>TextLabel37</cstring>
- </property>
- <property name="text">
- <string>Log creatures:</string>
- </property>
- </widget>
- <widget class="QComboBox" row="5" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_species_cb</cstring>
- </property>
- </widget>
- <widget class="QComboBox" row="3" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Log all</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Log threshold only</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_genotypes_cb</cstring>
+ <property name="orientation">
+ <enum>Vertical</enum>
</property>
- </widget>
- <widget class="QComboBox" row="9" column="1">
- <item>
- <property name="text">
- <string>Manual (on inject)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>If child fit. > parent's</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>If child fit. > population's max</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>If child (in dom. lin.) fit. > dom. lin. max</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>If child fit. > dom. lin. max</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>FIXME: same as above?</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>If child fit. > man in own lin.</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_lineagecreation_method_cb</cstring>
+ <property name="sizeType">
+ <enum>Expanding</enum>
</property>
- </widget>
- <widget class="QComboBox" row="7" column="1">
- <item>
- <property name="text">
- <string>Off</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>On</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_detailed_log_landscape_cb</cstring>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>71</height>
+ </size>
</property>
- </widget>
- </grid>
+ </spacer>
+ </vbox>
</widget>
</hbox>
</widget>
More information about the Avida-cvs
mailing list