Changeset 975 for cpp/frams/model

Timestamp:

07/06/20 23:32:03 (4 years ago)

Author:

Maciej Komosinski

Message:

Added NeuroClass::getSupportedJointTypes() and NeuroClass::isJointTypeSupported() for use in genetic operators

Location:

cpp/frams/model

Files:

• model.cpp (modified) (1 diff)
• modelparts.cpp (modified) (1 diff)
• modelparts.h (modified) (3 diffs)

cpp/frams/model/model.cpp

@@ -415 +415 @@
         {
                 *f0map = *map;
-                if (geno.getFormat() != '0')
+                if (!Geno::formatIsOneOf(geno.getFormat(), Geno::F0_FORMAT_LIST))
                 {
                         MultiMap tmp;

cpp/frams/model/modelparts.cpp

@@ -99 +99 @@
 NeuroClass::NeuroClass(ParamEntry *_props, SString _description,
         int _prefinputs, int _prefoutput, int _preflocation,
-        int *_vectordata, bool own_vd, int vhints, int sup_shapes)
+        int *_vectordata, bool own_vd, int vhints, int sup_shapes, int sup_joints)
         :ownedvectordata(own_vd),
         name(_props->name), longname(_props->id), description(_description),

cpp/frams/model/modelparts.h

@@ -227 +227 @@
         static constexpr int SUPPORTED_SHAPE_ALL = SUPPORTED_SHAPE_BALL_AND_STICK | SUPPORTED_SHAPE_SOLIDS;
         paInt supported_shape_types; //< bitfield of 'Model::shape' values: NeuroClass::SUPPORTED_SHAPE_xxx = 1 << Model::SHAPE_xxx
+
+        static constexpr int SUPPORTED_JOINT_BALL_AND_STICK = 1;
+        static constexpr int SUPPORTED_JOINT_FIXED = 2;
+        static constexpr int SUPPORTED_JOINT_HINGE_X = 4;
+        static constexpr int SUPPORTED_JOINT_HINGE_XY = 8;
+        static constexpr int SUPPORTED_JOINT_ALL = SUPPORTED_JOINT_BALL_AND_STICK + SUPPORTED_JOINT_FIXED + SUPPORTED_JOINT_HINGE_X + SUPPORTED_JOINT_HINGE_XY;
+        paInt supported_joint_types; //< bitfield of 'Joint::shape' values: NeuroClass::SUPPORTED_JOINT_xxx = 1 << JOINT::SHAPE_xxx
+
         int *vectordata;
         paInt visualhints;
@@ -240 +248 @@
         NeuroClass();
         NeuroClass(ParamEntry *_props, SString _description,
-                int _prefinputs, int _prefoutput, int _preflocation, int *_vectordata, bool own_vd = 1, int vhints = 0, int sup_shapes = NeuroClass::SUPPORTED_SHAPE_ALL);
+                   int _prefinputs, int _prefoutput, int _preflocation, int *_vectordata, bool own_vd = 1, int vhints = 0, int sup_shapes = NeuroClass::SUPPORTED_SHAPE_ALL, int sup_joints = NeuroClass::SUPPORTED_JOINT_ALL);
         /** class name for use in Neuro::setClassName(), Neuro::setDetails() (former 'moredata' field),
                 eg. "N","-",G" */
@@ -278 +286 @@
         int getSupportedShapeTypes() { return (int)supported_shape_types; }
         bool isShapeTypeSupported(ModelEnum::ShapeType t) { return (1 << (int)t) & supported_shape_types; }
+        int getSupportedJointTypes() { return (int)supported_joint_types; }
+        bool isJointTypeSupported(Joint::Shape t) { return (1 << (int)t) & supported_joint_types; }
         int *getSymbolGlyph()
         {