Changeset 610 for cpp/frams/model/model.h

Timestamp:

09/05/16 03:39:14 (8 years ago)

Author:

Maciej Komosinski

Message:

• Introduced levels of checking the validity of a Model
• If a Joint is too long, print how much it exceeds the maximum allowed length

File:

• cpp/frams/model/model.h (modified) (3 diffs)

cpp/frams/model/model.h

@@ -120 +120 @@
 public:
         enum ShapeType { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_BALL_AND_STICK, SHAPE_SOLIDS };
+        /// used in internalCheck()
+        enum CheckType {
+         EDITING_CHECK, ///< Used in Model::validate(). Default validation - does not modify elements of the Model.
+         FINAL_CHECK,   ///< Used in Model::close() when a Model is built from a genotype. Like EDITING_CHECK, but also calculates Joint::d and Joint::rot.
+         LIVE_CHECK     ///< used in Model::close() when a Model is built from a Creature. Like FINAL_CHECK but does not limit joint length which could make some liveModels invalid.
+        };
 protected:
         ShapeType shape;
@@ -125 +131 @@
         void updateNeuroRefno(); // set Neuro::refno for all neurons
         SString nameForErrors() const;
-        int internalcheck(int final);
+        int internalcheck(CheckType check);
 
         void moveNeuro(int oldpos, int newpos);
@@ -304 +310 @@
         /// It also calls "validate" with all side effects.
         /// @return > 0 means "valid"
-        int close();
+        int close(bool building_live_model=false);
 
         /// Enable model building.