Changeset 1004 for cpp/frams

Timestamp:

07/14/20 12:00:57 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp/frams

Files:

• _demos/simil_test.cpp (modified) (1 diff)
• model/modelparts.h (modified) (1 diff)

cpp/frams/_demos/simil_test.cpp

@@ -12 +12 @@
 
 
-
-using namespace std;
 
 /** Computes a matrix of distances between all genotypes in the specified

cpp/frams/model/modelparts.h

@@ -240 +240 @@
         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_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_JOINTSHAPE_ALL = SUPPORTED_JOINT_BALL_AND_STICK + SUPPORTED_JOINT_FIXED + SUPPORTED_JOINT_HINGE_X + SUPPORTED_JOINT_HINGE_XY;
+        static constexpr int SUPPORTED_JOINTSHAPE_ALL = SUPPORTED_JOINT_STICK + SUPPORTED_JOINT_FIXED + SUPPORTED_JOINT_HINGE_X + SUPPORTED_JOINT_HINGE_XY;
         paInt supported_joint_shapes; //< bitfield of 'Joint::shape' values: NeuroClass::SUPPORTED_JOINT_xxx = 1 << JOINT::SHAPE_xxx