Changeset 732 for cpp/frams/genetics/f1

Timestamp:

02/15/18 00:42:07 (6 years ago)

Author:

Maciej Komosinski

Message:

Added support for "checkpoints" (intermediate phases of development of the Model when converting between genetic encodings). See Model.checkpoint() and conv_f1.cpp for an example.

Location:

cpp/frams/genetics/f1

Files:

• conv_f1.cpp (modified) (4 diffs)
• conv_f1.h (modified) (2 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -14 +14 @@
 
 F1Props stdprops = { 1, 0, 1, 0.4, 0.25, 0.25, 0.25, 0.25, 0.0, 1.0, 1.0, 1,
-        0.2, 0.5, 0.5, 0.5 };
+0.2, 0.5, 0.5, 0.5 };
 
 class Builder
@@ -106 +106 @@
 
 /** main conversion function - with conversion map support */
-SString GenoConv_f1::convert(SString &i, MultiMap *map)
+SString GenoConv_f1::convert(SString &i, MultiMap *map, bool using_checkpoints)
 {
         const char* g = i.c_str();
         Builder builder(g, map ? 1 : 0);
-        builder.model.open();
+        builder.model.open(using_checkpoints);
         builder.grow(-1, g, Pt3D_0, stdprops, -1); // uses Model::addFromString() to create model elements
         if (builder.invalid) return SString();
@@ -242 +242 @@
 
                         if (c.muscle_reset_range) c.muscle_bend_range = 1.0; else c.muscle_reset_range = true;
+                        model.checkpoint();
                         grow(part2, g + 1, Pt3D_0, c, branching_part);
                         return;

cpp/frams/genetics/f1/conv_f1.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -69 +69 @@
                 mapsupport = 1;
         }
-        SString convert(SString &i, MultiMap *map);
+        SString convert(SString &i, MultiMap *map, bool using_checkpoints);
         ~GenoConv_f1() {}
 };