diff --git a/pose_classification_kit/models/Body/20Class_CNN_Augmented_BODY25/CNN-Augmented_body25.h5 b/pose_classification_kit/models/Body/20Class_CNN_Augmented_BODY25/CNN-Augmented_body25.h5 new file mode 100644 index 0000000..6fdefdf Binary files /dev/null and b/pose_classification_kit/models/Body/20Class_CNN_Augmented_BODY25/CNN-Augmented_body25.h5 differ diff --git a/pose_classification_kit/models/Body/20Class_CNN_Augmented_BODY25/class.txt b/pose_classification_kit/models/Body/20Class_CNN_Augmented_BODY25/class.txt new file mode 100644 index 0000000..1b1f40c --- /dev/null +++ b/pose_classification_kit/models/Body/20Class_CNN_Augmented_BODY25/class.txt @@ -0,0 +1 @@ +Seated,Stand,Stand_RightArmRaised,Stand_LeftArmRaised,T,MilitarySalute,PushUp_Low,Squat,Plank,Yoga_Tree_left,Yoga_Tree_right,Yoga_UpwardSalute,Yoga_Warrior2_left,Yoga_Warrior2_right,Traffic_AllStop,Traffic_BackStop,Traffic_FrontStop,Traffic_BackFrontStop,Traffic_LeftTurn,Traffic_RightTurn \ No newline at end of file diff --git a/pose_classification_kit/models/Body/20Class_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 b/pose_classification_kit/models/Body/20Class_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 new file mode 100644 index 0000000..3b2722d Binary files /dev/null and b/pose_classification_kit/models/Body/20Class_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 differ diff --git a/pose_classification_kit/models/Body/20Class_CNN_BODY25/class.txt b/pose_classification_kit/models/Body/20Class_CNN_BODY25/class.txt new file mode 100644 index 0000000..1b1f40c --- /dev/null +++ b/pose_classification_kit/models/Body/20Class_CNN_BODY25/class.txt @@ -0,0 +1 @@ +Seated,Stand,Stand_RightArmRaised,Stand_LeftArmRaised,T,MilitarySalute,PushUp_Low,Squat,Plank,Yoga_Tree_left,Yoga_Tree_right,Yoga_UpwardSalute,Yoga_Warrior2_left,Yoga_Warrior2_right,Traffic_AllStop,Traffic_BackStop,Traffic_FrontStop,Traffic_BackFrontStop,Traffic_LeftTurn,Traffic_RightTurn \ No newline at end of file diff --git a/pose_classification_kit/models/Body/9Classes_3x64_BODY18/9Classes_3x64_body18.h5 b/pose_classification_kit/models/Body/9Class_3x64_BODY18/9Classes_3x64_body18.h5 similarity index 100% rename from pose_classification_kit/models/Body/9Classes_3x64_BODY18/9Classes_3x64_body18.h5 rename to pose_classification_kit/models/Body/9Class_3x64_BODY18/9Classes_3x64_body18.h5 diff --git a/pose_classification_kit/models/Body/9Classes_3x64_BODY18/class.txt b/pose_classification_kit/models/Body/9Class_3x64_BODY18/class.txt similarity index 100% rename from pose_classification_kit/models/Body/9Classes_3x64_BODY18/class.txt rename to pose_classification_kit/models/Body/9Class_3x64_BODY18/class.txt diff --git a/pose_classification_kit/models/Body/9Classes_3x64_BODY25/9Classes_3x64_body25.h5 b/pose_classification_kit/models/Body/9Class_3x64_BODY25/9Classes_3x64_body25.h5 similarity index 100% rename from pose_classification_kit/models/Body/9Classes_3x64_BODY25/9Classes_3x64_body25.h5 rename to pose_classification_kit/models/Body/9Class_3x64_BODY25/9Classes_3x64_body25.h5 diff --git a/pose_classification_kit/models/Body/9Classes_3x64_BODY25/class.txt b/pose_classification_kit/models/Body/9Class_3x64_BODY25/class.txt similarity index 100% rename from pose_classification_kit/models/Body/9Classes_3x64_BODY25/class.txt rename to pose_classification_kit/models/Body/9Class_3x64_BODY25/class.txt diff --git a/pose_classification_kit/models/Body/9Classes_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 b/pose_classification_kit/models/Body/9Class_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 similarity index 100% rename from pose_classification_kit/models/Body/9Classes_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 rename to pose_classification_kit/models/Body/9Class_CNN_BODY25/CNN-2Conv1D-64x3filter-2dense-2x128_body25.h5 diff --git a/pose_classification_kit/models/Body/9Classes_CNN_BODY25/class.txt b/pose_classification_kit/models/Body/9Class_CNN_BODY25/class.txt similarity index 100% rename from pose_classification_kit/models/Body/9Classes_CNN_BODY25/class.txt rename to pose_classification_kit/models/Body/9Class_CNN_BODY25/class.txt diff --git a/pose_classification_kit/src/keypoints_analysis/body_analysis.py b/pose_classification_kit/src/keypoints_analysis/body_analysis.py index 91b80e1..1b369f0 100644 --- a/pose_classification_kit/src/keypoints_analysis/body_analysis.py +++ b/pose_classification_kit/src/keypoints_analysis/body_analysis.py @@ -151,8 +151,8 @@ def updatePredictedClass(self, keypoints: np.ndarray): if self.modelClassifier is not None: try: - prediction = self.modelClassifier.predict(np.array([inputData]))[0] - # prediction = self.modelClassifier.predict(np.array([keypoints.T[:,:2]]))[0] + #prediction = self.modelClassifier.predict(np.array([inputData]))[0] + prediction = self.modelClassifier.predict(np.array([keypoints.T[:,:2]]))[0] except ValueError: print("Model input shape not supported") self.currentPrediction = self.classOutputs[np.argmax(prediction)]