Changeset 797 for cpp/frams/genetics/fH/fH_general.cpp

Timestamp:

06/06/18 01:45:18 (7 years ago)

Author:

Maciej Komosinski

Message:

A more complete implementation of fB, fH, fL

File:

• cpp/frams/genetics/fH/fH_general.cpp (modified) (11 diffs)

cpp/frams/genetics/fH/fH_general.cpp

@@ +1 @@
+// This file is a part of Framsticks SDK.  http://www.framsticks.com/
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// See LICENSE.txt for details.
+
 #include <string>
 #include <limits>
@@ -13 +17 @@
 // Methods for loading handles
 
-const char *fH_part_names[PART_PROPS_COUNT] = { "dn", "fr", "ing", "as" };
-
-const char *fH_joint_names[JOINT_PROPS_COUNT] = { "stif", "rotstif", "stam" };
+const char *fH_part_names[FH_PART_PROPS_COUNT] = { "dn", "fr", "ing", "as" };
+
+const char *fH_joint_names[FH_JOINT_PROPS_COUNT] = { "stif", "rotstif", "stam" };
 
 void fH_Handle::loadProperties(Param par)
@@ -106 +110 @@
 
         Part p;
-        for (int i = 0; i < PART_PROPS_COUNT; i++)
+        for (int i = 0; i < FH_PART_PROPS_COUNT; i++)
         {
                 stickmut.addProperty(&p.properties().getParamTab()[p.properties().findId(fH_part_names[i]) + p.properties().getGroupCount()], -1);
@@ -112 +116 @@
 
         Joint j;
-        for (int i = 0; i < JOINT_PROPS_COUNT; i++)
+        for (int i = 0; i < FH_JOINT_PROPS_COUNT; i++)
         {
                 stickmut.addProperty(&j.properties().getParamTab()[j.properties().findId(fH_joint_names[i]) + j.properties().getGroupCount()], -1);
@@ -119 +123 @@
 
         Neuro n;
-        neuronmut.addProperty(&n.properties().getParamTab()[n.properties().findId(PE_NEURO_DET) + n.properties().getGroupCount()], -1);
+        neuronmut.addProperty(&n.properties().getParamTab()[n.properties().findId(FH_PE_NEURO_DET) + n.properties().getGroupCount()], -1);
 
         Param tmp(f0_neuroconn_paramtab, NULL);
-        connectionmut.addProperty(&tmp.getParamTab()[tmp.findId(PE_CONN_WEIGHT) + tmp.getGroupCount()], -1);
+        connectionmut.addProperty(&tmp.getParamTab()[tmp.findId(FH_PE_CONN_WEIGHT) + tmp.getGroupCount()], -1);
 
         stickparamtab = ParamObject::makeParamTab((ParamInterface *)&stickmut, 0, 0, stickmut.firstMutableIndex());
@@ -343 +347 @@
 {
         Param par(tab, obj);
-        double partprops[PART_PROPS_COUNT];
-        for (int i = 0; i < PART_PROPS_COUNT; i++)
+        double partprops[FH_PART_PROPS_COUNT];
+        for (int i = 0; i < FH_PART_PROPS_COUNT; i++)
         {
                 partprops[i] = par.getDouble(2 * getDimensions() + i);
@@ -357 +361 @@
         {
                 par.select(child->obj);
-                for (int i = 0; i < PART_PROPS_COUNT; i++)
+                for (int i = 0; i < FH_PART_PROPS_COUNT; i++)
                 {
                         partprops[i] += par.getDouble(2 * getDimensions() + i);
@@ -364 +368 @@
         }
 
-        for (int i = 0; i < PART_PROPS_COUNT; i++)
+        for (int i = 0; i < FH_PART_PROPS_COUNT; i++)
         {
                 partprops[i] /= stickscount;
@@ -522 +526 @@
                         msg += det + "\" does not exist";
                         logMessage("fH_Builder", "developBrain", LOG_ERROR, msg.c_str());
+                        delete currneu->neuron;
                         return -1;
                 }
@@ -601 +606 @@
                 if (!beginneu)
                 {
-                        logMessage("fH_Builder", "developBrain", LOG_WARN, "There are no available neurons with outputs, connection could not be established");
+                        // due to often appearance of connection genes in fB encoding, this
+                        // log message is commented
+                        // logMessage("fH_Builder", "developBrain", LOG_DEBUG, "There are no available neurons with outputs, connection could not be established");
                         continue;
                 }
@@ -628 +635 @@
                 if (!endneu)
                 {
-                        logMessage("fH_Builder", "developBrain", LOG_WARN, "There are no available neurons with free inputs, connection could not be established");
+                        // due to often appearance of connection genes in fB encoding, this
+                        // log message is commented
+                        // logMessage("fH_Builder", "developBrain", LOG_DEBUG, "There are no available neurons with free inputs, connection could not be established");
                         continue;
                 }