Changeset 275

Timestamp:

12/22/14 00:17:01 (9 years ago)

Author:

Maciej Komosinski

Message:

Inheritance information during crossing over properly stored as a single genetic operation with a single child (affects phylogenetic analysis window)

Location:

cpp/frams/genetics

Files:

• genman.cpp (modified) (3 diffs)
• genman.h (modified) (2 diffs)

cpp/frams/genetics/genman.cpp

@@ -288 +288 @@
         }
         mutchg += chg;
-        if (history) saveLink((const char*)g.getGene(), (const char*)gv.getGene(), chg);
+        if (history) saveLink((const char*)g.getGene(), "", (const char*)gv.getGene(), chg);
         SString mutinfo;
         if (extmutinfo == 0) mutinfo = SString::sprintf("%.2f%% mutation of '%s'", 100 * chg, (const char*)g.getName()); else
@@ -356 +356 @@
         // result in g1v
         xochg += chg;
-        if (history) saveLink((const char*)g1.getGene(), (const char*)g1v.getGene(), chg);
+        if (history) saveLink((const char*)g1.getGene(), (const char*)g2.getGene(), (const char*)g1v.getGene(), chg);
         SString xoinfo = SString::sprintf("Crossing over of '%s' (%.2f%%) and '%s' (%.2f%%)",
                 (const char*)g1.getName(), 100 * chg, (const char*)g2.getName(), 100 * (1 - chg));
@@ -490 +490 @@
 }
 
-void GenMan::saveLink(string prz, string pot, float& chg)
+void GenMan::saveLink(const string parent1, const string parent2, const string child, const float chg)
 {
         GenoLink l;
         l.count = count;
-        l.g1 = prz;
-        l.g2 = pot;
+        l.parent1 = parent1;
+        l.parent2 = parent2;
+        l.child = child;
         l.chg = chg;
         l.fit = 0; //temporarily. Will be set when the genotype dies
+        //FMprintf("GenMan","saveLink",0,"#%d: [%d] '%s' + '%s' -> '%s'",GenoLinkList.size(),count,parent1.c_str(),parent2.c_str(),child.c_str());
         GenoLinkList.push_back(l);
 }

cpp/frams/genetics/genman.h

@@ -19 +19 @@
 {
         int count;
-        string g1, g2;
+        string parent1, parent2, child;
         float chg;
         float fit;
@@ -55 +55 @@
 private:
         vector<GenoOperators*> oper_fx_list;
-        void saveLink(string prz, string pot, float& chg);
+        void saveLink(const string parent1, const string parent2, const string child, const float chg);
         GenoOperators* getOper_f(char format);
         SString HTMLize(const char *g, bool shorten);