Changeset 1076

Timestamp:

02/16/21 06:37:09 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Files:

• cpp/frams/util/extvalue.cpp (modified) (1 diff)
• cpp/frams/vm/classes/collectionobj.cpp (modified) (1 diff)
• framspy/FramsticksCLI.py (modified) (1 diff)

cpp/frams/util/extvalue.cpp

@@ -986 +986 @@
         case TUnknown:
         case TInvalid:
-                logPrintf("ExtValue", "getInt", LOG_ERROR, "Getting floating point value from %s", getString().c_str());
+                logPrintf("ExtValue", "getDouble", LOG_ERROR, "Getting floating point value from %s", getString().c_str());
                 return 0.0;
         default:;

cpp/frams/vm/classes/collectionobj.cpp

@@ -36 +36 @@
         { "add", 0, PARAM_NOSTATIC, "Append at the end", "p(x value)", PROCEDURE(p_add), },
         { "find", 0, PARAM_NOSTATIC, "Find", "p d(x value)", PROCEDURE(p_find), "returns the element index or -1 if not found" },
-        { "avg", 0, PARAM_READONLY | PARAM_NOSTATIC, "Average", "f", GETONLY(avg) },
-        { "stdev", 0, PARAM_READONLY | PARAM_NOSTATIC, "Standard deviation", "f", GETONLY(stdev), "=sqrt(sum((element[i]-avg)^2)/(size-1)) which is estimated population std.dev. from sample std.dev." },
+        { "avg", 0, PARAM_READONLY | PARAM_NOSTATIC, "Average", "x", GETONLY(avg) },
+        { "stdev", 0, PARAM_READONLY | PARAM_NOSTATIC, "Standard deviation", "x", GETONLY(stdev), "=sqrt(sum((element[i]-avg)^2)/(size-1)) which is estimated population std.dev. from sample std.dev." },
         { "toString", 0, PARAM_READONLY | PARAM_NOSTATIC, "Textual form", "s", GETONLY(toString), },
         { "new", 0, 0, "Create new Vector", "p oVector()", STATICPROCEDURE(p_new), },

framspy/FramsticksCLI.py

@@ -26 +26 @@
         OUTPUT_DIR = "scripts_output"
         GENOTYPE_INVALID = "/*invalid*/"  # this is how genotype invalidity is represented in Framsticks
-        STDOUT_ENDOPER_MARKER = "FileObject.write"  # we look for this message on Framsticks CLI stdout to detect when Framsticks created a file with the result we expect
+        STDOUT_ENDOPER_MARKER = "FileObject.write:"  # we look for this message on Framsticks CLI stdout to detect when Framsticks created a file with the result we expect
 
         FILE_PREFIX = 'framspy_'