Changeset 716 for cpp/frams

Timestamp:

11/22/17 02:50:49 (7 years ago)

Author:

Maciej Komosinski

Message:

The f1 converter is now able to map more than one genotype character to the special, not-yet-known initial Part. This fixes the test case "(rX,rX)"

File:

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

cpp/frams/genetics/f1/conv_f1.cpp

@@ -9 +9 @@
 #include <frams/util/multimap.h>
 #include <ctype.h>
+#include <assert.h>
 
 //#define v1f1COMPATIBLE //as in ancient Framsticks 1.x
@@ -18 +19 @@
 {
 public:
-        Builder(const char*g, int mapping = 0) :invalid(0), genbegin(g), usemapping(mapping), first_part_mapping(NULL), model_energy(0), model_energy_count(0) {}
-        ~Builder() { SAFEDELETE(first_part_mapping); }
+        Builder(const char*g, int mapping = 0) :invalid(0), genbegin(g), usemapping(mapping), first_part_mapping(NULL), own_first_part_mapping(true), model_energy(0), model_energy_count(0) {}
+        ~Builder() { if (own_first_part_mapping) SAFEDELETE(first_part_mapping); }
         char tmp[222];
         bool invalid;
@@ -38 +39 @@
         MultiRange range;
         MultiRange *first_part_mapping;
+        bool own_first_part_mapping;
         double lastjoint_muscle_power;
         double model_energy;
@@ -125 +127 @@
         { //special case: mapping the part which is not yet created
                 if (first_part_mapping) first_part_mapping->add(*r);
-                else first_part_mapping = new MultiRange(*r);
+                else { first_part_mapping = new MultiRange(*r); own_first_part_mapping = true; }
         }
         else
@@ -199 +201 @@
                                         freshpart = 1;
                                         if (first_part_mapping)
+                                        {
+                                                //mapping was defined before creating this initial Part -> put it into the Part
+                                                assert(own_first_part_mapping);
                                                 model.getPart(part1)->setMapping(*first_part_mapping);
+                                                delete first_part_mapping;
+                                                //first_part_mapping can be still used later but from now on it references the internal Part mapping
+                                                first_part_mapping = model.getPart(part1)->getMapping();
+                                                own_first_part_mapping = false;
+                                        }
                                 }
                         }
@@ -243 +253 @@
                         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);
                         return;
                 }