Changeset 1274

Timestamp:

09/09/23 15:12:57 (14 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Files:

• cpp/common/2d.h (modified) (3 diffs)
• cpp/common/Convert.cpp (modified) (1 diff)
• cpp/frams/genetics/f4/f4_conv.cpp (modified) (4 diffs)
• cpp/frams/genetics/f4/f4_oper.cpp (modified) (1 diff)
• cpp/frams/genetics/f9/f9_oper.cpp (modified) (2 diffs)
• framspy/eval-allcriteria.sim (modified) (2 diffs)

cpp/common/2d.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2023  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -9 +9 @@
 #include <algorithm>
 
-//unification of old GUIXY and Pt2D
 template <typename T> class XY
 {
@@ -174 +173 @@
         }
 
+        XYRect fillAspect(float aspect)
+        {
+                XYRect r;
+                r.size = size;
+                if (size.x < size.y * aspect)
+                        r.size.x = r.size.y * aspect;
+                else
+                        r.size.y = r.size.x / aspect;
+                r.p = p + (size - r.size) * 0.5;
+                return r;
+        }
+        
         XYRect intersection(const XYRect &r) const
         {

cpp/common/Convert.cpp

@@ -155 +155 @@
         wstring wstr;
         int nOffset = 0;
-        int nDataLen = strlen(str); //ending \0 is not converted, but resize() below sets the proper length of wstr
+        int nDataLen = (int)strlen(str); //ending \0 is not converted, but resize() below sets the proper length of wstr
         int nLenWide = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)(str + nOffset),
                 (int)(nDataLen - nOffset), NULL, 0);

cpp/frams/genetics/f4/f4_conv.cpp

@@ -247 +247 @@
         {
                 const char* nclass = C->neuclass->name.c_str();
-                if (C->neuclass->getPreferredLocation() == 0)
+                switch (C->neuclass->getPreferredLocation())
+                {
+                case NeuroClass::PrefLocation::PREFER_UNATTACHED:
                 {
                         if (strcmp(nclass, "N") == 0) //special case just to specify the only neuron properties supported by f4, i.e., the properties for neuron class 'N'
@@ -253 +255 @@
                         else
                                 sprintf(tmpLine, "d=\"%s\"", nclass);
-                }
-                else if (C->neuclass->getPreferredLocation() == 1) // attached to Part or have no required attachment - also part
+                        break;
+                }
+                case NeuroClass::PrefLocation::PREFER_PART: // attach to Part
                 {
                         int partno = C->dadlink->p2_refno;
@@ -260 +263 @@
 
                         sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
-                }
-                else // attached to Joint, assume there are only three possibilities of getPreferredLocation()
+                        break;
+                }
+                case NeuroClass::PrefLocation::PREFER_JOINT: // attach to Joint
                 {
                         int jointno = C->dadlink->joint_refno;
@@ -273 +277 @@
                         else
                                 sprintf(tmpLine, "j=%d,d=\"%s\"", jointno, nclass);
+                        break;
+                }
                 }
 

cpp/frams/genetics/f4/f4_oper.cpp

@@ -8 +8 @@
 
 
-// This representation has a tendency to bloat - adding a small penalty to fitness such as "this.velocity - 0.000000001*String.len(this.genotype);"
-// may help, but it would be better to improve the source code to make genetic operators neutral in terms of genotype length. Adding such a penalty
-// removes "work in progress" changes in genotypes thus promoting immediate, straightforward improvements while hindering slower, multifaceted progress.
+// This representation has a tendency to bloat - adding a small penalty to fitness such as "this.velocity - 0.000000001*String.len(this.genotype);" may help, but it would be better to improve the source code to make genetic operators neutral in terms of genotype length. Adding such a penalty removes "work in progress" changes in genotypes thus promoting immediate, straightforward improvements while hindering slower, multifaceted progress.
 // TODO getting rid of redundancy (valid genotypes with a lot of "junk code") in this representation looks like a good idea; many improvements to this end have already been done in April & May 2023, so maybe it is not a big problem now?
-// 
+//
 //
 // TODO the behavior of neuron input indexes during mutation seems badly implemented (see also TREAT_BAD_CONNECTIONS_AS_INVALID_GENO). Are they kept properly maintained when nodes are added and removed? This could be done well because during mutation we operate on the tree structure with cross-references between nodes (so they should not be affected by local changes in the tree), and then convert the tree back to string. Yet, the f4_Node.conn_from is an integer and these fields in nodes do not seem to be maintained on tree node adding/removal... change these integer offsets to references to node objects? But actually, do the offsets that constitute relative connection references concern the f4_Node tree structure (and all these sophisticated calculations of offsets during mutation are useful) or rather they concern the f4_Cells development? verify all situations in f4_Cell::oneStep(), case '['.

cpp/frams/genetics/f9/f9_oper.cpp

@@ -124 +124 @@
 {
         int len1 = (int)strlen(g1), len2 = (int)strlen(g2);
-        int p1 = rndUint(len1);  //random cut point for first genotype
-        int p2 = rndUint(len2);  //random cut point for second genotype
+        int p1 = rndUint(len1);  //random cut point for the first genotype
+        int p2 = rndUint(len2);  //random cut point for the second genotype
         char *child1 = (char*)malloc(p1 + len2 - p2 + 1);
         char *child2 = (char*)malloc(p2 + len1 - p1 + 1);
@@ -147 +147 @@
                 int pos = ptr - turtle_commands_f9;
                 int axis = pos / 2;
-                style = GENSTYLE_RGBS(axis == 0 ? 200 : 0, axis == 1 ? 200 : 0, axis == 2 ? 200 : 0, GENSTYLE_NONE);
+                style = GENSTYLE_RGBS(axis == 0 ? 200 : 0, axis == 2 ? 200 : 0, axis == 1 ? 200 : 0, GENSTYLE_NONE);
         }
         return style;

framspy/eval-allcriteria.sim

@@ -75 +75 @@
 genoper_f0s:0
 genoper_f1:0
-genoper_f2:0
-genoper_f3:0
 genoper_f4:0
 genoper_f8:0
@@ -183 +181 @@
 f1_nmWei:1.0
 f1_nmVal:0.05
-f2_mutAddOper:0.4
-f2_mutJointElem:0.33
-f2_mutNeuroElem:0.33
-f2_mutConnElem:0.33
-f2_mutDelOper:0.1
-f2_mutHandleOper:0.3
-f2_mutPropOper:0.2
-f3_mutSubstitution:0.6
-f3_mutSubstPerChar:0.1
-f3_mutDelIns:0.1
-f3_mutDelInsPerChar:0.05
-f3_mutDelInsLength:5
-f3_mutDuplication:0.05
-f3_mutTranslocation:0.15
-f3_xovGeneTransfer:0.8
-f3_xovCrossingOver:0.2
 f4_mut_add:50.0
 f4_mut_add_div:20.0