Changeset 934 for cpp/frams/model/modelparts.h

Timestamp:

05/29/20 15:18:48 (3 years ago)

Author:

Maciej Komosinski

Message:

Introduced 'volume' field available by getMinPart(), getMaxPart(), getDefPart() for genetic operators to limit the range of volumes (~mass) in simulation of solids

File:

• cpp/frams/model/modelparts.h (modified) (4 diffs)

cpp/frams/model/modelparts.h

@@ -26 +26 @@
 typedef UserTags<Model, void *, 5> ModelUserTags;
 
+
+/// Introduced only because we can't have a forward declaration of enum in the Model class, 
+/// and we would need a forward declaration because of mutual (cyclic) dependence of declarations of Model and NeuroClass.
+/// https://stackoverflow.com/questions/27019292/is-in-class-enum-forward-declaration-possible
+/// Use Model::... instead of ModelEnum::...
+class ModelEnum
+{
+public:
+        enum ShapeType { SHAPE_BALL_AND_STICK, SHAPE_SOLIDS, SHAPE_UNKNOWN, SHAPE_ILLEGAL };
+};
+
+
 /** Common base for model elements. */
 class PartBase
@@ -102 +114 @@
 
         static Param &getStaticParam();
+};
+
+class Part_MinMaxDef : public Part //contains additional information for Model::getMinPart()/getMaxPart()/getDefPart()
+{
+public:
+        double volume; ///< Introduced to limit the range of volumes (~mass) in simulation of solids. Genetic operators should observe this min,max volume by calculating and limiting the volume of Parts based on their type and sx,sy,sz.
+
+        void defassign();
+        Part_MinMaxDef() { defassign(); }
 };
 
@@ -256 +277 @@
                 */
         int getSupportedShapeTypes() { return (int)supported_shape_types; }
+        bool isShapeTypeSupported(ModelEnum::ShapeType t) { return (1 << (int)t) & supported_shape_types; }
         int *getSymbolGlyph()
         {
@@ -511 +533 @@
 };
 
-extern ParamEntry f0_part_paramtab[], f0_joint_paramtab[], f0_nodeltajoint_paramtab[], f0_neuro_paramtab[], f0_neuroconn_paramtab[], f0_neuroitem_paramtab[];
+extern ParamEntry f0_part_paramtab[], f0_part_minmaxdef_paramtab[], f0_joint_paramtab[], f0_nodeltajoint_paramtab[], f0_neuro_paramtab[], f0_neuroconn_paramtab[], f0_neuroitem_paramtab[];
 
 #endif