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

Timestamp:

05/29/20 15:18:48 (4 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/model.cpp (modified) (2 diffs)

cpp/frams/model/model.cpp

@@ -1328 +1328 @@
 //////////////////////
 
-class MinPart : public Part { public: MinPart() { Param par(f0_part_paramtab, this); par.setMin(); } };
-class MaxPart : public Part { public: MaxPart() { Param par(f0_part_paramtab, this); par.setMax(); } };
+class MinPart : public Part_MinMaxDef { public: MinPart() { Param par(f0_part_paramtab, this); par.setMin(); Param par2(f0_part_minmaxdef_paramtab, this); par2.setMin(); } };
+class MaxPart : public Part_MinMaxDef { public: MaxPart() { Param par(f0_part_paramtab, this); par.setMax(); Param par2(f0_part_minmaxdef_paramtab, this); par2.setMax(); } };
 class MinJoint : public Joint { public: MinJoint() { Param par(f0_joint_paramtab, this); par.setMin(); } };
 class MaxJoint : public Joint { public: MaxJoint() { Param par(f0_joint_paramtab, this); par.setMax(); } };
@@ -1335 +1335 @@
 class MaxNeuro : public Neuro { public: MaxNeuro() { Param par(f0_neuro_paramtab, this); par.setMax(); } };
 
-Part &Model::getMinPart() { static MinPart part; return part; }
-Part &Model::getMaxPart() { static MaxPart part; return part; }
-Part &Model::getDefPart() { static Part part; return part; }
+Part_MinMaxDef &Model::getMinPart() { static MinPart part; return part; }
+Part_MinMaxDef &Model::getMaxPart() { static MaxPart part; return part; }
+Part_MinMaxDef &Model::getDefPart() { static Part_MinMaxDef part; return part; }
 Joint &Model::getMinJoint() { static MinJoint joint; return joint; }
 Joint &Model::getMaxJoint() { static MaxJoint joint; return joint; }