Changeset 1158 for cpp/frams

Timestamp:

10/01/21 23:40:49 (3 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic/minor improvements

Location:

cpp/frams

Files:

• Makefile-SDK (modified) (1 diff)
• config/sdk-build-config.h (moved) (moved from cpp/frams/config/sdk_build_config.h)
• frams-objects.h (modified) (1 diff)
• genetics/fS/fS_general.h (modified) (2 diffs)
• model/geometry/modelgeoclass.cpp (modified) (1 diff)
• model/modelobj.cpp (modified) (2 diffs)
• model/similarity/measure-greedy.cpp (modified) (1 diff)
• neuro/impl/neuroimpl-fuzzy.cpp (modified) (1 diff)
• util/extvalue.h (modified) (3 diffs)
• vm/classes/3dobject.cpp (modified) (2 diffs)
• vm/classes/collectionobj.cpp (modified) (9 diffs)
• vm/classes/collectionobj.h (modified) (3 diffs)
• vm/classes/genoobj.cpp (modified) (1 diff)

cpp/frams/Makefile-SDK

@@ -11 +11 @@
 CXXWARNINGS=-Wall -Wno-parentheses -Wno-overloaded-virtual -Wno-format -Werror=return-type
 
-SDK_BUILD_CONFIG= -include frams/config/sdk_build_config.h
+SDK_BUILD_CONFIG= -include frams/config/sdk-build-config.h
 CXXFLAGS= -I$(CURDIR) -std=gnu++17 $(SDK_BUILD_CONFIG) $(CXXWARNINGS) -g
 

cpp/frams/frams-objects.h

@@ -25 +25 @@
 EXPORTED char* extPropId(void *v, int i);
 EXPORTED char* extPropType(void *v, int i);
+EXPORTED char* extPropName(void *v, int i);
+EXPORTED int extPropFlags(void *v, int i);
+EXPORTED int extPropGroup(void *v, int i);
+EXPORTED char* extPropHelp(void *v, int i);
 EXPORTED int extPropFind(void *v, char* id);
 EXPORTED void* extPropGet(void *v, int i);
 EXPORTED int extPropSet(void *v, int i, void* e);
 EXPORTED void* extPropCall(void *v, int i, int argc, void* argv);
+EXPORTED int extGroupCount(void *v);
+EXPORTED char* extGroupName(void *v, int i);
+EXPORTED int extGroupMember(void *v, int g, int i);
+EXPORTED int extMemberCount(void *v, int g);
 EXPORTED void* rootObject();
 

cpp/frams/genetics/fS/fS_general.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 2019-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 2019-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -11 +11 @@
 #include <unordered_map>
 #include <exception>
+#include <algorithm>
 #include "frams/model/model.h"
 #include "frams/util/multirange.h"

cpp/frams/model/geometry/modelgeoclass.cpp

@@ -18 +18 @@
         "To set geom_density for individual ModelGeometry objects:\n"
         "var mg=ModelGeometry.forModel(GenePools[0][0].getModel()); mg.geom_density=2; GenePools[0][0].data->area=mg.area();\n" },
-        { "geom_density", 0, 0, "Density", "f 0.01 100.0 1.0", FIELD(density), "The number of samples (per unit length in one dimension) that affects the precision of estimation of geometrical properties." }, //note: we used 'geom_density' instead of 'density' to make the name more unique - because sim_params merges all configuration fields in a single namespace.
+        { "geom_density", 0, 0, "Density", "f 0.01 100.0 3.0", FIELD(density), "The number of samples (per unit length in one dimension) that affects the precision of estimation of geometrical properties." }, //Note #1: we used 'geom_density' instead of 'density' to make the name more unique - because sim_params merges all configuration fields in a single namespace. Note #2: "density" needs better, more interpretable and more reliable parametrization for surface sampling...
         { "forModel", 0, PARAM_USERHIDDEN, "", "p oModelGeometry(oModel)", PROCEDURE(p_formodel), "The returned ModelGeometry object can be used to calculate geometric properties (volume, area, sizes) of the associated model. The density is copied from the current global ModelGeometry.geom_density on object creation." },
         { "volume", 0, PARAM_NOSTATIC | PARAM_USERHIDDEN, "volume", "p f()", PROCEDURE(p_volume), },

cpp/frams/model/modelobj.cpp

@@ -21 +21 @@
         { "numconnections", 0, PARAM_DONTSAVE | PARAM_NOSTATIC | PARAM_READONLY, "Number of neuron connections", "d", GETONLY(numconnections), },
 
-        { "getPart", 0, PARAM_USERHIDDEN | PARAM_NOSTATIC, "getPart (static model information)", "p oPart(d index)", PROCEDURE(p_getpart), },
-        { "getJoint", 0, PARAM_USERHIDDEN | PARAM_NOSTATIC, "getJoint (static model information)", "p oJoint(d index)", PROCEDURE(p_getjoint), },
-        { "getNeuroDef", 0, PARAM_USERHIDDEN | PARAM_NOSTATIC, "getNeuroDef", "p oNeuroDef(d index)", PROCEDURE(p_getneuro), },
+        { "getPart", 0, PARAM_READONLY | PARAM_USERHIDDEN | PARAM_NOSTATIC, "getPart (static model information)", "p oPart(d index)", PROCEDURE(p_getpart), },
+        { "getJoint", 0, PARAM_READONLY | PARAM_USERHIDDEN | PARAM_NOSTATIC, "getJoint (static model information)", "p oJoint(d index)", PROCEDURE(p_getjoint), },
+        { "getNeuroDef", 0, PARAM_READONLY | PARAM_USERHIDDEN | PARAM_NOSTATIC, "getNeuroDef", "p oNeuroDef(d index)", PROCEDURE(p_getneuro), },
 
         { "size_x", 0, PARAM_READONLY | PARAM_NOSTATIC | PARAM_DEPRECATED, "Bounding box x size", "f", FIELD(size.x), "(size_x,size_y,size_z) are dimensions of the axis-aligned bounding box of the creature, including imaginary Part sizes (Part.s, usually 1.0). A creature consisting of a single default part has the size of (2.0,2.0,2.0) - twice the Part.s value (like a sphere diameter is twice its radius).\nSee also: Creature.moveAbs" },
@@ -30 +30 @@
         { "bboxSize", 0, PARAM_READONLY | PARAM_NOSTATIC, "Bounding box size", "oXYZ", GETONLY(bboxsize) },
         { "numcheckpoints", 0, PARAM_DONTSAVE | PARAM_READONLY | PARAM_NOSTATIC, "Number of checkpoints", "d", GETONLY(numcheckpoints) },
-        { "getCheckpoint", 0, PARAM_USERHIDDEN | PARAM_NOSTATIC, "getCheckpoint", "p oModel(d index)", PROCEDURE(p_getcheckpoint),
+        { "getCheckpoint", 0, PARAM_READONLY | PARAM_USERHIDDEN | PARAM_NOSTATIC, "getCheckpoint", "p oModel(d index)", PROCEDURE(p_getcheckpoint),
         "Checkpoint Model objects are only valid as long as the parent Model object exists.\n"
         "See also: Model.newWithCheckpoints()\n\n"

cpp/frams/model/similarity/measure-greedy.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "measure-greedy.h"
+#include <cstdlib> //std::qsort()
 #include <assert.h>
 

cpp/frams/neuro/impl/neuroimpl-fuzzy.cpp

@@ -5 +5 @@
 #include "neuroimpl-fuzzy.h"
 #include "neuroimpl-fuzzy-f0.h"
+#include <algorithm>
 
 int NI_FuzzyNeuro::countOuts(const Model *m, const Neuro *fuzzy)

cpp/frams/util/extvalue.h

@@ -43 +43 @@
 class ExtObject
 {
-        int subtype;                    //< 0/1=Generic/DPC Object,  0/2=Standalone/Shared Param
+        int subtype;                    //< 0/1=Generic/DPC Object,  0/2=Standalone/Shared Param,  0/4=RW/Readonly
         void incref() const;
         void decref() const;
@@ -73 +73 @@
         void setEmpty() { decref(); subtype = 0; param = NULL; object = NULL; }
         int isEmpty() const { return !param; }
+        bool isReadonly() const {return (subtype&4)!=0;}
+        void setReadonly(bool ro) {subtype=(subtype&~4)|(ro?4:0);}
         static const ExtObject& empty() { static const ExtObject e((ParamInterface*)NULL); return e; }
         ExtObject(const ExtObject& src) { DEBUG_EXTOBJECT("(const&)"); src.incref(); copyFrom(src); }
@@ -188 +190 @@
         void setInvalid() { setEmpty(); type = TInvalid; }
         void setError(const SString& msg);
+        bool isReadonly() const {return (type==TObj) && odata().isReadonly();}
+        void setReadonly(bool ro) {if (type==TObj) odata().setReadonly(ro);}
         bool makeUnique() { return (type == TObj) && odata().makeUnique(); } //< @return false if nothing has changed
         ExtPType getType() const { return type; }

cpp/frams/vm/classes/3dobject.cpp

@@ -20 +20 @@
                 { "new", 0, 0, "create new XYZ object", "p oXYZ(f x,f y,f z)", PROCEDURE(p_new), "3D vectors objects can be also created using the (x,y,z) notation, i.e. var v=(1,2,3) is the same as var v=XYZ.new(1,2,3);", },
                 { "newFromVector", 0, 0, "create new XYZ object", "p oXYZ(oVector)", PROCEDURE(p_newFromVector), "used for deserialization" },
-                { "clone", 0, PARAM_NOSTATIC, "create new XYZ object copying the coordinates", "p oXYZ()", PROCEDURE(p_clone), "Note: copying object references does not create new objects. Use clone() if a new object is needed.\n\nExample:\nvar o1=(1,2,3), o2=o1, o3=o1.clone();\no1.y=9999;\n//o2 is now (1,9999,3) but o3 is still (1,2,3)", },
+                { "clone", 0, PARAM_READONLY | PARAM_NOSTATIC, "create new XYZ object copying the coordinates", "p oXYZ()", PROCEDURE(p_clone), "Note: copying object references does not create new objects. Use clone() if a new object is needed.\n\nExample:\nvar o1=(1,2,3), o2=o1, o3=o1.clone();\no1.y=9999;\n//o2 is now (1,9999,3) but o3 is still (1,2,3)", },
                 { "set", 0, PARAM_NOSTATIC, "set (copy) coordinates from another XYZ object", "p(oXYZ)", PROCEDURE(p_set), },
                 { "set3", 0, PARAM_NOSTATIC, "set individual 3 coordinates", "p(f x,f y,f z)", PROCEDURE(p_set3), },
@@ -32 +32 @@
                 { "rotate", 0, PARAM_NOSTATIC, "rotate using Orient object", "p(oOrient)", PROCEDURE(p_rotate), },
                 { "revRotate", 0, PARAM_NOSTATIC, "reverse rotate using Orient object", "p(oOrient)", PROCEDURE(p_revrotate), },
-                { "get", 0, PARAM_NOSTATIC, "get one of coordinates", "p f(d index)", PROCEDURE(p_get), "this function makes the XYZ objects \"indexable\" (so you can use [] for accessing subsequent fields, like in Vector)", },
+                { "get", 0, PARAM_READONLY | PARAM_NOSTATIC, "get one of coordinates", "p f(d index)", PROCEDURE(p_get), "this function makes the XYZ objects \"indexable\" (so you can use [] for accessing subsequent fields, like in Vector)", },
                 { 0, 0, 0, },
         };

cpp/frams/vm/classes/collectionobj.cpp

@@ -31 +31 @@
         { "size", 0, PARAM_READONLY | PARAM_NOSTATIC, "Element count", "d", GETONLY(size), },
         { "remove", 0, PARAM_NOSTATIC, "Remove at position", "p(d position)", PROCEDURE(p_remove), },
-        { "get", 0, PARAM_NOSTATIC, "Get value at position", "p x(d position)", PROCEDURE(p_get), "object[position] can be always used instead of object.get(position)" },
+        { "get", 0, PARAM_READONLY | PARAM_NOSTATIC, "Get value at position", "p x(d position)", PROCEDURE(p_get), "object[position] can be always used instead of object.get(position)" },
         { "set", 0, PARAM_NOSTATIC, "Set value at position", "p(d position,x value)", PROCEDURE(p_set), "object[position]=value can be always used instead of object.set(position,value)" },
         { "insert", 0, PARAM_NOSTATIC, "Insert value at position", "p(d position,x value)", PROCEDURE(p_insert), },
         { "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" },
+        { "find", 0, PARAM_READONLY | 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", "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." },
@@ -42 +42 @@
         { "sort", 0, PARAM_NOSTATIC, "Sort elements (in place)", "p(oFunctionReference comparator)", PROCEDURE(p_sort), "comparator can be null, giving the \"natural\" sorting order (depending on element type), otherwise it must be a function reference obtained from the 'function' operator.\n\nExample:\nfunction compareLastDigit(a,b) {return (a%10)<(b%10);}\nvar v=[16,23,35,42,54,61];\nv.sort(function compareLastDigit);" },
         { "iterator", 0, PARAM_NOSTATIC | PARAM_READONLY, "Iterator", "o", GETONLY(iterator), },
-        { "clone", 0, PARAM_NOSTATIC, "Create a clone", "p oVector()", PROCEDURE(p_clone), "The resulting clone is a shallow copy (contains the same object references as the original). A deep copy can be obtained through serialization: String.deserialize(String.serialize(object));" },
+        { "clone", 0, PARAM_READONLY | PARAM_NOSTATIC, "Create a clone", "p oVector()", PROCEDURE(p_clone), "The resulting clone is a shallow copy (contains the same object references as the original). A deep copy can be obtained through serialization: String.deserialize(String.serialize(object));" },
         { 0, 0, 0, },
 };
@@ -72 +72 @@
         { "size", 0, PARAM_NOSTATIC | PARAM_READONLY, "Element count", "d", GETONLY(size), },
         { "remove", 0, PARAM_NOSTATIC, "Remove", "p(x key)", PROCEDURE(p_remove), "Removes the named or indexed element (depending on the argument type: string or int)." },
-        { "get", 0, PARAM_NOSTATIC, "Get element", "p x(x key)", PROCEDURE(p_get), "Retrieves the named or indexed element (depending on the argument type: string or int). Accessing nonexistent keys is an error (use hasKey() if necessary).\nobject.get(key) can be shortened to object[key]." },
-        { "getKey", 0, PARAM_NOSTATIC, "Get a key", "p s(d index)", PROCEDURE(p_getKey), "Returns the key of the indexed element (0 <= index < size)." },
-        { "hasKey", 0, PARAM_NOSTATIC, "Check if key exists", "p d(s key)", PROCEDURE(p_hasKey), "Returns 1 (interpreted as true) if dictionary contains the supplied key, or 0 (false) otherwise.\nExample:\n   if (obj.hasKey(\"a\"))\n      x = obj->a;" },
+        { "get", 0, PARAM_READONLY | PARAM_NOSTATIC, "Get element", "p x(x key)", PROCEDURE(p_get), "Retrieves the named or indexed element (depending on the argument type: string or int). Accessing nonexistent keys is an error (use hasKey() if necessary).\nobject.get(key) can be shortened to object[key]." },
+        { "getKey", 0, PARAM_READONLY | PARAM_NOSTATIC, "Get a key", "p s(d index)", PROCEDURE(p_getKey), "Returns the key of the indexed element (0 <= index < size)." },
+        { "hasKey", 0, PARAM_READONLY | PARAM_NOSTATIC, "Check if key exists", "p d(s key)", PROCEDURE(p_hasKey), "Returns 1 (interpreted as true) if dictionary contains the supplied key, or 0 (false) otherwise.\nExample:\n   if (obj.hasKey(\"a\"))\n      x = obj->a;" },
         { "set", 0, PARAM_NOSTATIC, "Set element", "p x(x key,x value)", PROCEDURE(p_set), "Set element value for the specified key or index (depending on the argument type: string or int).\n"
         "Returns the value previously associated with the given key (or index).\n"
@@ -81 +81 @@
         "  var old_value=object.set(\"key\",new_value); //'old_value' gets the value previously associated with \"key\"\n"
         "  var x=object[\"key\"]=new_value; //'x' becomes 'new_value', consistently with the semantics of the assignment operator. The value previously associated with \"key\" is lost." },
-        { "find", 0, PARAM_NOSTATIC, "Find", "p x(x value)", PROCEDURE(p_find), "Returns the element key or null if not found." },
+        { "find", 0, PARAM_READONLY | PARAM_NOSTATIC, "Find", "p x(x value)", PROCEDURE(p_find), "Returns the element key or null if not found." },
         { "new", 0, 0, "Create a Dictionary", "p oDictionary()", STATICPROCEDURE(p_new), "Empty directory can be also created using the {} expression." },
         { "toString", 0, PARAM_READONLY | PARAM_NOSTATIC, "Textual form", "s", GETONLY(toString), },
-        { "clone", 0, PARAM_NOSTATIC, "Create a clone", "p oDictionary()", PROCEDURE(p_clone), "The resulting clone is a shallow copy (contains the same object references as the original). A deep copy can be obtained through serialization: String.deserialize(String.serialize(object));" },
+        { "clone", 0, PARAM_READONLY | PARAM_NOSTATIC, "Create a clone", "p oDictionary()", PROCEDURE(p_clone), "The resulting clone is a shallow copy (contains the same object references as the original). A deep copy can be obtained through serialization: String.deserialize(String.serialize(object));" },
         { "assign", 0, PARAM_NOSTATIC, "Assign from another object", "p(x)", PROCEDURE(p_assign), "Replaces current dictionary with dictionary contents from another object." },
         { "iterator", 0, PARAM_NOSTATIC | PARAM_READONLY, "Iterator", "o", GETONLY(iterator), },
@@ -99 +99 @@
 
 VectorObject::VectorObject(Pt3D &pt)
-        :readonly(0), owndata(1)
+        :owndata(1)
 {
         set_or_insert(0, ExtValue(pt.x), false);
@@ -119 +119 @@
 void VectorObject::p_remove(PARAMPROCARGS)
 {
-        if (readonly) return;
         int i = args->getInt();
         if (!listIndexCheck(&data, i, "VectorObject", "remove")) return;
@@ -270 +269 @@
         VMachine *vm;
         VMVEComparator(VMachine::JumpTargetObject *_jto) :jto(_jto), vm(jto->vm) {}
-#ifdef QSORT_R_USING_QSORT_S
+#ifdef QSORT_R_THIS_FIRST
         static int compare(void* _this, const void *a, const void *b);
         bool operator()(const ExtValue *a, const ExtValue *b) { return compare(this,&a,&b) == ExtValue::ResultLower; }
@@ -279 +278 @@
 };
 
-#ifdef QSORT_R_USING_QSORT_S
+#ifdef QSORT_R_THIS_FIRST
 int VMVEComparator::compare(void* _this, const void *a, const void *b)
 #else
@@ -324 +323 @@
                 std::sort(first, first + data.size(), cmp); //no qsort_r() or equivalent on Android (yet)
 #else
-                qsort_r(first, data.size(), sizeof(ExtValue*), cmp.compare, &cmp);
+                CALL_QSORT_R(first, data.size(), sizeof(ExtValue*), cmp.compare, &cmp);
 #endif
         }

cpp/frams/vm/classes/collectionobj.h

@@ -16 +16 @@
 public:
         SList data;
-        unsigned int readonly : 1, owndata : 1;
+        unsigned int owndata : 1;
         void clear();
         ExtValue *get(int i) { return (ExtValue*)data.get(i); }
@@ -24 +24 @@
         static Param par;
         VectorObject(Pt3D& pt);
-        VectorObject() :readonly(0), owndata(1) {}
+        VectorObject() :owndata(1) {}
         ~VectorObject() { clear(); }
         static Param& getStaticParam() { return par; }
 #define STATRICKCLASS VectorObject
-        PARAMPROCDEF(p_clear) { if (readonly) return; clear(); }
+        PARAMPROCDEF(p_clear) { clear(); }
         PARAMGETDEF(size) { arg1->setInt(data.size()); }
         PARAMGETDEF(avg);
@@ -36 +36 @@
         PARAMPROCDEF(p_get);
         PARAMPROCDEF(p_find);
-        PARAMPROCDEF(p_set) { if (!readonly) set_or_insert(arg1[1].getInt(), arg1[0], false); }
-        PARAMPROCDEF(p_add) { if (readonly) return; /*ExtValue tmp; get_toString(&tmp); printf("%s += %s",(const char*)tmp.getString(),(const char*)arg1[0].getString());*/ data += new ExtValue(arg1[0]); /*get_toString(&tmp); printf(" -> %s\n",(const char*)tmp.getString());*/ arg2->setInt(data.size() - 1); }
-        PARAMPROCDEF(p_insert) { if (!readonly) set_or_insert(arg1[1].getInt(), arg1[0], true); }
+        PARAMPROCDEF(p_set) { set_or_insert(arg1[1].getInt(), arg1[0], false); }
+        PARAMPROCDEF(p_add) { data += new ExtValue(arg1[0]); arg2->setInt(data.size() - 1); }
+        PARAMPROCDEF(p_insert) { set_or_insert(arg1[1].getInt(), arg1[0], true); }
         PARAMGETDEF(toString);
         PARAMPROCDEF(p_sort);

cpp/frams/vm/classes/genoobj.cpp

@@ -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), },
-        { "getConvertedWithCheckpoints", 0, PARAM_NOSTATIC, "Get converted genotype", "p oGeno(s format)", PROCEDURE(p_getconvert_ch), "See also Model.newWithCheckpoints()" },
+        { "getConverted", 0, PARAM_READONLY | PARAM_NOSTATIC, "Get converted genotype", "p oGeno(s format)", PROCEDURE(p_getconvert), },
+        { "getConvertedWithCheckpoints", 0, PARAM_READONLY | 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), },