Changeset 732 for cpp/frams/vm/classes

Timestamp:

02/15/18 00:42:07 (7 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/vm/classes

Files:

• genoobj.cpp (modified) (6 diffs)
• genoobj.h (modified) (2 diffs)

cpp/frams/vm/classes/genoobj.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -11 +11 @@
 ParamEntry geno_paramtab[] =
 {
-        { "Geno", 1, 15, "Geno", "All information about a single genotype.\nThis is a genetics-only object which does not contain any performance data. See also: Genotype class" },
+        { "Geno", 1, 16, "Geno", "All information about a single genotype.\nThis is a genetics-only object which does not contain any performance data. See also: Genotype class" },
         { "name", 0, PARAM_NOSTATIC, "Name", "s 0 40", GETSET(name), },
         { "rawgenotype", 0, PARAM_NOSTATIC | PARAM_READONLY, "Raw genotype", "s 1", GETONLY(genotype), "Genotype, excluding the format specifier" },
@@ -23 +23 @@
         "-1 = validity is not known. This is a transient state. The value of \"is_valid\" will never be -1 when read. It is safe to treat is_valid as boolean in statements like \"if (g.is_valid) ...\". Setting \"is_valid=-1\" will make it 0 or 1 again. This third state (-1) is only needed for loading Genotype objects from files where the \"is_valid\" field might not be present."
         },
-        { "getConverted", 0, PARAM_NOSTATIC, "get converted genotype", "p oGeno(s format)", PROCEDURE(p_getconvert), },
+        { "getConverted", 0, PARAM_NOSTATIC, "Get converted genotype", "p oGeno(s format)", PROCEDURE(p_getconvert), },
+        { "getConvertedWithCheckpoints", 0, PARAM_NOSTATIC, "Get converted genotype", "p oGeno(s format)", PROCEDURE(p_getconvert_ch), "See also Model.newWithCheckpoints()" },
         { "f0genotype", 0, PARAM_NOSTATIC | PARAM_READONLY, "f0 genotype", "s 1", GETONLY(f0genotype), "converted to f0 genotype", },
         { "new", 0, 0, "create new empty object", "p oGeno()", PROCEDURE(p_new), },
@@ -85 +86 @@
 void GenoObj::get_format(ExtValue *ret)
 {
-        char format_as_string[2]={getFormat(),0};
+        char format_as_string[2] = { getFormat(), 0 };
         ret->setString(format_as_string);
 }
@@ -102 +103 @@
 char GenoObj::formatFromExtValue(ExtValue& v)
 {
-if (v.getType()==TInt)
-        return v.getInt();
-if (v.getType()==TString)
+        if (v.getType() == TInt)
+                return v.getInt();
+        if (v.getType() == TString)
         {
-        SString s=v.getString();
-        if (s.len()==1)
-                return s.charAt(0);
+                SString s = v.getString();
+                if (s.len() == 1)
+                        return s.charAt(0);
         }
-return Geno::INVALID_FORMAT;
+        return Geno::INVALID_FORMAT;
 }
 
@@ -116 +117 @@
 {
         *ret = makeDynamicObjectAndDecRef(new Geno(getConverted(formatFromExtValue(args[0]))));
+}
+
+void GenoObj::p_getconvert_ch(ExtValue *args, ExtValue *ret)
+{
+        *ret = makeDynamicObjectAndDecRef(new Geno(getConverted(formatFromExtValue(args[0]), NULL, true)));
 }
 

cpp/frams/vm/classes/genoobj.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -25 +25 @@
         PARAMGETDEF(string);
         PARAMPROCDEF(p_getconvert);
+        PARAMPROCDEF(p_getconvert_ch);
         PARAMGETDEF(f0genotype);
         PARAMPROCDEF(p_new);