Changeset 719

Timestamp:

12/21/17 21:48:17 (6 years ago)

Author:

Maciej Komosinski

Message:

f1->f0 mapping maps ',' and ')' symbols to the branching Part (earlier they were not mapped at all)

File:

• cpp/frams/genetics/f1/conv_f1.cpp (modified) (6 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -43 +43 @@
         double model_energy;
         int model_energy_count;
-        void grow(int part1, const char*g, Pt3D k, F1Props c);
+        void grow(int part1, const char*g, Pt3D k, F1Props c, int branching_part);
         void setPartMapping(int p, const char* g);
         int growJoint(int part1, int part2, Pt3D &angle, F1Props &c, const char *g);
@@ -111 +111 @@
         Builder builder(g, map ? 1 : 0);
         builder.model.open();
-        builder.grow(-1, g, Pt3D_0, stdprops); // uses Model::singleStepBuild to create model elements
+        builder.grow(-1, g, Pt3D_0, stdprops, -1); // uses Model::singleStepBuild to create model elements
         if (builder.invalid) return SString();
         builder.addPendingInputs();
@@ -133 +133 @@
 }
 
-void Builder::grow(int part1, const char*g, Pt3D k, F1Props c)
+void Builder::grow(int part1, const char*g, Pt3D k, F1Props c, int branching_part)
 {
         int hasmuscles = 0;
@@ -141 +141 @@
                 switch (*g)
                 {
-                case 0: case ',': case ')': return;
+                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;
@@ -241 +242 @@
 
                         if (c.muscle_reset_range) c.muscle_bend_range = 1.0; else c.muscle_reset_range = true;
-                        grow(part2, g + 1, Pt3D_0, c);
+                        grow(part2, g + 1, Pt3D_0, c, branching_part);
                         return;
                 }
@@ -253 +254 @@
                         c.muscle_bend_range = 1.0 / count;
                         for (i = 0; i < count; i++)
-                                grow(part1, (char*)ga(i), k + Pt3D(0, 0, -M_PI + (i + 1)*(2 * M_PI / (count + 1))), c);
+                                grow(part1, (char*)ga(i), k + Pt3D(0, 0, -M_PI + (i + 1)*(2 * M_PI / (count + 1))), c, part1);
                         return;
                 }