Refactoring

Author: dyashuni

python_bindings/bindings.cpp

@@ -91,17 +91,19 @@ inline void get_input_array_shapes(const py::buffer_info& buffer, size_t* rows,
 }
 
 
-inline std::vector<size_t> get_input_ids_and_check_shapes(const py::object& ids_, size_t rows) {
+inline std::vector<size_t> get_input_ids_and_check_shapes(const py::object& ids_, size_t feature_rows) {
     std::vector<size_t> ids;
     if (!ids_.is_none()) {
         py::array_t < size_t, py::array::c_style | py::array::forcecast > items(ids_);
         auto ids_numpy = items.request();
         // check shapes
-        bool valid = false;
-        if ((ids_numpy.ndim == 1 && ids_numpy.shape[0] == rows) || (ids_numpy.ndim == 0 && rows == 1)) {
-            valid = true;
+        if (!((ids_numpy.ndim == 1 && ids_numpy.shape[0] == feature_rows) ||
+              (ids_numpy.ndim == 0 && feature_rows == 1))) {
+            char msg[1024];
+            sprintf(msg, "the input label shape %d does not match the input data vector shape %d",
+                    ids_numpy.ndim, feature_rows);
+            throw std::runtime_error(msg);
         }
-        if (!valid) throw std::runtime_error("wrong dimensionality of the labels");
         // extract data
         if (ids_numpy.ndim == 1) {
             std::vector<size_t> ids1(ids_numpy.shape[0]);