Changeset 774 for cpp/frams/genetics/f4/oper_f4.cpp

Timestamp:

04/11/18 01:16:08 (6 years ago)

Author:

Maciej Komosinski

Message:

Removed unused "state" field (issue number 19), improved docs (issues number 20,21,23), code formatting (issue number 24) [closes #62]

File:

• cpp/frams/genetics/f4/oper_f4.cpp (modified) (12 diffs)

cpp/frams/genetics/f4/oper_f4.cpp

@@ -67 +67 @@
 }
 
-int Geno_f4::ValidateRec(f4_node * geno, int retrycount) const
+int Geno_f4::ValidateRec(f4_node *geno, int retrycount) const
 {
         // ! the genotype is geno->child (not geno) !
@@ -113 +113 @@
 
 
-int Geno_f4::checkValidity(const char * geno, const char *genoname)
+int Geno_f4::checkValidity(const char* geno, const char *genoname)
 {
         f4_node root;
@@ -164 +164 @@
                         {
                                 // make neuron
-                                NeuroClass * rndclass = GenoOperators::getRandomNeuroClass();
+                                NeuroClass *rndclass = GenoOperators::getRandomNeuroClass();
                                 if (rndclass == NULL)
                                 {
@@ -177 +177 @@
                                                 for (int i = 0; i < g->count(); i++)
                                                 {
-                                                        f4_node * gcur = g->ordNode(i);
-                                                        char * temp = (char*)gcur->name.c_str();
-                                                        NeuroClass * neuclass = GenoOperators::parseNeuroClass(temp);
+                                                        f4_node *gcur = g->ordNode(i);
+                                                        char* temp = (char*)gcur->name.c_str();
+                                                        NeuroClass *neuclass = GenoOperators::parseNeuroClass(temp);
                                                         if (neuclass != NULL)
                                                         {
@@ -215 +215 @@
                 {
                         // add link
-                        f4_node * par = n1->parent;
-                        char * temp = (char*)par->name.c_str();
-                        NeuroClass * neuclass = GenoOperators::parseNeuroClass(temp);
+                        f4_node *par = n1->parent;
+                        char* temp = (char*)par->name.c_str();
+                        NeuroClass *neuclass = GenoOperators::parseNeuroClass(temp);
                         if (neuclass != NULL)
                         {
@@ -456 +456 @@
 
 // change a [ node
-void Geno_f4::linkNodeChangeRandom(f4_node * nn, int neuid, std::vector<NeuroClass*> neulist) const      //rewritten by M.K. - should work as before (not tested)
+void Geno_f4::linkNodeChangeRandom(f4_node *nn, int neuid, std::vector<NeuroClass*> neulist) const      //rewritten by M.K. - should work as before (not tested)
 {
         double probs[3] = { 0.1, 0.3, 0.6 };
@@ -495 +495 @@
 
 // make a random : node
-void Geno_f4::nparNodeMakeRandom(f4_node * nn) const
+void Geno_f4::nparNodeMakeRandom(f4_node *nn) const
 {
         int sign = (int)(2.0f * rnd01);
@@ -505 +505 @@
 
 // change a repeat # node
-void Geno_f4::repeatNodeChangeRandom(f4_node * nn) const
+void Geno_f4::repeatNodeChangeRandom(f4_node *nn) const
 {
         int count;
@@ -526 +526 @@
         // ! the genotype is g->child (not g) !
         int i, res;
-        f4_node * gcopy = NULL;
+        f4_node *gcopy = NULL;
         // try this max 20 times:
         //   copy, mutate, then validate
@@ -600 +600 @@
 
 // convert to tree
-f4_node * root;
+f4_node *root;
 root = new f4_node();
 res = f4_processrec(g, 0, root);
@@ -654 +654 @@
 
 
-int Geno_f4::CrossOverOne(f4_node * g1, f4_node * g2, float chg) const
+int Geno_f4::CrossOverOne(f4_node *g1, f4_node *g2, float chg) const
 {
         // ! the genotypes are g1->child and g2->child (not g1 g2) !
@@ -660 +660 @@
         int smin, smax;
         float size;
-        f4_node * n1, *n2, *n1p, *n2p;
+        f4_node *n1, *n2, *n1p, *n2p;
 
         // determine desired size