Fix Khalil2016 tests

Author: AntoinePrv

libecole/src/observation/khalil-2016.cpp

@@ -554,34 +554,31 @@ void set_dynamic_features(
 template <typename Tensor>
 void set_precomputed_static_features(
 	Tensor&& out,
-	SCIP_VAR* const var,
+	std::size_t var_idx,
 	xt::xtensor<value_type, 2> const& static_features) {
 
-	auto const col_idx = static_cast<std::ptrdiff_t>(SCIPcolGetIndex(SCIPvarGetCol(var)));
 	using namespace xt::placeholders;
-	xt::view(out, xt::range(_, Khalil2016Obs::n_static_features)) = xt::row(static_features, col_idx);
+	xt::view(out, xt::range(_, Khalil2016Obs::n_static_features)) =
+		xt::row(static_features, static_cast<std::ptrdiff_t>(var_idx));
 }
 
 /******************************
  *  Main extraction function  *
  ******************************/
 
 auto extract_all_features(scip::Model& model, bool pseudo, xt::xtensor<value_type, 2> const& static_features) {
-	xt::xtensor<value_type, 2> observation{
-		{model.pseudo_branch_cands().size(), Khalil2016Obs::n_features},
-		std::nan(""),
-	};
+	auto const branch_cands = pseudo ? model.pseudo_branch_cands() : model.lp_branch_cands();
+	auto const n_branch_cands = branch_cands.size();
+
+	auto observation = xt::xtensor<value_type, 2>{{n_branch_cands, Khalil2016Obs::n_features}, std::nan("")};
 
 	auto* const scip = model.get_scip_ptr();
 	auto const active_rows_weights = stats_for_active_constraint_coefficients_weights(model);
 
-	auto const branch_cands = pseudo ? model.pseudo_branch_cands() : model.lp_branch_cands();
-
-	auto const n_branch_cands = branch_cands.size();
 	for (std::size_t var_idx = 0; var_idx < n_branch_cands; ++var_idx) {
 		auto* const var = branch_cands[var_idx];
 		auto features = xt::row(observation, static_cast<std::ptrdiff_t>(var_idx));
-		set_precomputed_static_features(features, var, static_features);
+		set_precomputed_static_features(features, var_idx, static_features);
 		set_dynamic_features(features, scip, var, active_rows_weights);
 	}
 

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

@@ -10,7 +10,8 @@
 using namespace ecole;
 
 TEST_CASE("Khalil2016 unit tests", "[unit][obs]") {
-	observation::unit_tests(observation::Khalil2016{});
+	auto const pseudo = GENERATE(true, false);
+	observation::unit_tests(observation::Khalil2016{pseudo});
 }
 
 template <typename Tensor, typename T = typename Tensor::value_type>
@@ -22,7 +23,8 @@ auto in_interval(Tensor const& tensor, T const& lower, T const& upper) {
 TEST_CASE("Khalil2016 return correct observation", "[obs]") {
 	using Features = observation::Khalil2016Obs::Features;
 
-	auto obs_func = observation::Khalil2016{};
+	auto const pseudo = GENERATE(true, false);
+	auto obs_func = observation::Khalil2016{pseudo};
 	auto model = get_model();
 	obs_func.before_reset(model);
 	advance_to_stage(model, SCIP_STAGE_SOLVING);
@@ -32,7 +34,8 @@ TEST_CASE("Khalil2016 return correct observation", "[obs]") {
 
 	SECTION("Observation features has correct shape") {
 		auto const& obs = optional_obs.value();
-		REQUIRE(obs.features.shape(0) == model.pseudo_branch_cands().size());
+		auto const branch_cands = pseudo ? model.pseudo_branch_cands() : model.lp_branch_cands();
+		REQUIRE(obs.features.shape(0) == branch_cands.size());
 		REQUIRE(obs.features.shape(1) == observation::Khalil2016Obs::n_features);
 	}