Changeset 1236

Timestamp:

05/07/23 02:39:05 (12 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp/frams/genetics

Files:

• f1/f1_conv.cpp (modified) (1 diff)
• f4/f4_conv.cpp (modified) (1 diff)
• f4/f4_conv.h (modified) (1 diff)
• f4/f4_oper.cpp (modified) (2 diffs)

cpp/frams/genetics/f1/f1_conv.cpp

@@ -138 +138 @@
                         case 0: return;
                         case ',': case ')': setPartMapping(branching_part, g); return;
-                        case 'R': k.x += 0.7853; setPartMapping(part1, g); break;
-                        case 'r': k.x -= 0.7853;        setPartMapping(part1, g); break;
+                        case 'R': k.x += 0.7853; setPartMapping(part1, g); break; // 45 degrees = pi/4 like in f4
+                        case 'r': k.x -= 0.7853; setPartMapping(part1, g); break;
                         case '[': //neuron
                                 //              setdebug(g-(char*)geny,DEBUGNEURO | !l_neu);

cpp/frams/genetics/f4/f4_conv.cpp

@@ -5 +5 @@
 // Copyright (C) 1999,2000  Adam Rotaru-Varga (adam_rotaru@yahoo.com), GNU LGPL
 // Copyright (C) since 2001 Maciej Komosinski
-// 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
+// 2018, Grzegorz Latosinski, added development checkpoints and support for new API for neuron types
 
 #include "f4_conv.h"

cpp/frams/genetics/f4/f4_conv.h

@@ -5 +5 @@
 // Copyright (C) 1999,2000  Adam Rotaru-Varga (adam_rotaru@yahoo.com), GNU LGPL
 // Copyright (C) since 2001 Maciej Komosinski
-// 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
+// 2018, Grzegorz Latosinski, added support for new API for neuron types and development checkpoints
 
 #ifndef _F4_CONV_H_

cpp/frams/genetics/f4/f4_oper.cpp

@@ -5 +5 @@
 // Copyright (C) 1999,2000  Adam Rotaru-Varga (adam_rotaru@yahoo.com), GNU LGPL
 // Copyright (C) since 2001 Maciej Komosinski
-// 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
+// 2018, Grzegorz Latosinski, added development checkpoints and support for new API for neuron types
 
 
@@ -18 +18 @@
 // TODO add support for properties of (any class of) neurons - not just sigmoid/force/intertia (':' syntax) for N
 // TODO add mapping genotype character ranges for neural [connections]
-// TODO change the default branching plane (to match f1) so they do not grow perfectly vertical (cheating vertpos) so easily? (so they require Rr or other modifiers)
+// TODO change the default branching plane (to match f1) so they do not grow perfectly vertical (cheating vertpos) so easily? (so they require Rr or other modifiers) - verify if and how f4 is different from f1
 // TODO for some genotypes, #defining/undefining F4_SIMPLIFY_MODIFIERS produces significantly different phenotypes (e.g. length of some Joint changes from 1.25 to 1.499, coordinates of Parts change, friction of some part changes from 1.28 to 0.32). Comparing f4_Node trees, the simplification works as intended, there are no huge changes apart from removing contradicting modifiers like 'R' and 'r' or 'L' and 'l', and dispersing the modifiers (changed order). There is no reason for such a significant influence of this. A hypothesis is that something may be wrong with calculating the influence of individual modifiers, e.g. some strong nonlinearity is introduced where it should not be, or some compensation between modifiers that should not influence each other (like L and R), or some modifier f4_Nodes are skipped/ignored when applying? Investigate. Example genotype: /*4*/,i<qlM,C<X>N:*#1>>,r<MRF<Xcm>N:Gpart>#5#1#2MLL#1>#1>>>>#5ML#2L#1>>>Lf,r<#1>rM<CqmLlCfqiFLqXFfl><F,<<XI>iN:|[-1:4.346]><XF><<XrRQ>N:G#3>>QiXFMR>fXM#2MfcR>R#3>>X