Code cleanup

Author: AntoinePrv

libecole/tests/src/observation/test-khalil-2016.cpp

@@ -61,11 +61,8 @@ TEST_CASE("Khalil2016 return correct observation", "[obs]") {
 		auto col = [&obs_pseudo](auto feat) { return xt::col(obs_pseudo, static_cast<std::ptrdiff_t>(feat)); };
 
 		SECTION("No pseudo_candidate features are NaN or infinite") {
-			for (auto* var : model.pseudo_branch_cands()) {
-				auto const var_idx = SCIPvarGetProbindex(var);
-				REQUIRE_FALSE(xt::any(xt::isnan(xt::row(obs.features, var_idx))));
-				REQUIRE_FALSE(xt::any(xt::isinf(xt::row(obs.features, var_idx))));
-			}
+			REQUIRE_FALSE(xt::any(xt::isnan(obs_pseudo)));
+			REQUIRE_FALSE(xt::any(xt::isinf(obs_pseudo)));
 		}
 
 		SECTION("Objective function coefficients") {

libecole/tests/src/observation/test-nodebipartite.cpp

@@ -44,16 +44,12 @@ TEST_CASE("NodeBipartite return correct observation", "[obs]") {
 	}
 
 	SECTION("Variable features are not all nan") {
-		auto const& var_feat = optional_obs.value().variable_features;
-		for (std::size_t i = 0; i < var_feat.shape()[1]; ++i) {
-			REQUIRE_FALSE(xt::all(xt::isnan(xt::col(var_feat, static_cast<std::ptrdiff_t>(i)))));
-		}
+		auto const& obs = optional_obs.value();
+		REQUIRE_FALSE(xt::all(xt::isnan(obs.variable_features)));
 	}
 
 	SECTION("Row features are not all nan") {
-		auto const& row_feat = optional_obs.value().row_features;
-		for (std::size_t i = 0; i < row_feat.shape()[1]; ++i) {
-			REQUIRE_FALSE(xt::all(xt::isnan(xt::col(row_feat, static_cast<std::ptrdiff_t>(i)))));
-		}
+		auto const& obs = optional_obs.value();
+		REQUIRE_FALSE(xt::all(xt::isnan(obs.row_features)));
 	}
 }

python/src/ecole/core/observation.cpp

@@ -85,7 +85,7 @@ void bind_submodule(py::module_ const& m) {
 
 		The optimization problem is represented as an heterogenous bipartite graph.
 		On one side, a node is associated with one variable, on the other side a node is
-		associated with one constraint.
+		associated with one LP row.
 		There exist an edge between a variable and a constraint if the variable exists in the
 		constraint with a non-zero coefficient.
 
@@ -236,13 +236,13 @@ void bind_submodule(py::module_ const& m) {
 		Strong branching score observation function on branch-and bound node.
 
 		This observation obtains scores for all LP or pseudo candidate variables at a
-		branch-and-bound node.  The strong branching score measures the quality of branching
-		for each variable.  This observation can be used as an expert for imitation
-		learning algorithms.
+		branch-and-bound node.
+		The strong branching score measures the quality of branching for each variable.
+		This observation can be used as an expert for imitation learning algorithms.
 
 		This observation function extracts an array containing the strong branching score for
-		each variable in the problem which can be indexed by the action set.  Variables for which
-		a strong branching score is not applicable are filled with NaN.
+		each variable in the problem which can be indexed by the action set.
+		Variables for which a strong branching score is not applicable are filled with ``NaN``.
 	)");
 	strong_branching_scores.def(py::init<bool>(), py::arg("pseudo_candidates") = true, R"(
 		Constructor for StrongBranchingScores.
@@ -269,8 +269,8 @@ void bind_submodule(py::module_ const& m) {
 		pseudocost branching (also known as hybrid branching).
 
 		This observation function extracts an array containing the pseudocost for
-		each variable in the problem which can be indexed by the action set.  Variables for which
-		a pseudocost is not applicable are filled with NaN.
+		each variable in the problem which can be indexed by the action set.
+		Variables for which a pseudocost is not applicable are filled with ``NaN``.
 	)");
 	pseudocosts.def(py::init<>());
 	def_before_reset(pseudocosts, R"(Do nothing.)");
@@ -283,8 +283,8 @@ void bind_submodule(py::module_ const& m) {
 
 		The observation is a matrix where rows represent all variables and columns represent features related
 		to these variables.
-		Only rows representing pseudo branching candidate contain meaningful observation, other rows are filled with
-		``NaN``.
+		Only rows representing pseudo branching candidate contain meaningful observation, other rows are filled
+		with ``NaN``.
 		See [Khalil2016]_ for a complete reference on this observation function.
 
 		The first :py:attr:`Khalil2016Obs.n_static_features` are static (they do not change through the solving