Changed pseudocosts to return a vector of variables, not columns

Author: dchetelat

libecole/src/observation/pseudocosts.cpp

@@ -39,13 +39,13 @@ std::optional<xt::xtensor<double, 1>> Pseudocosts::extract(scip::Model& model, b
 	auto const [cands, lp_values] = scip_get_lp_branch_cands(scip);
 
 	/* Store pseudocosts in tensor */
-	auto const nb_lp_columns = static_cast<std::size_t>(SCIPgetNLPCols(scip));
-	xt::xtensor<double, 1> pseudocosts({nb_lp_columns}, std::nan(""));
+	auto const nb_vars = static_cast<std::size_t>(SCIPgetNVars(scip));
+	xt::xtensor<double, 1> pseudocosts({nb_vars}, std::nan(""));
 
 	for (auto const [var, lp_val] : views::zip(cands, lp_values)) {
-		auto const lp_index = static_cast<std::size_t>(SCIPcolGetLPPos(SCIPvarGetCol(var)));
+		auto const var_index = static_cast<std::size_t>(SCIPvarGetProbindex(var));
 		auto const score = SCIPgetVarPseudocostScore(scip, var, lp_val);
-		pseudocosts[lp_index] = static_cast<double>(score);
+		pseudocosts[var_index] = static_cast<double>(score);
 	}
 
 	return pseudocosts;

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

@@ -23,12 +23,12 @@ TEST_CASE("Pseudocosts return pseudo costs array", "[obs]") {
 
 	REQUIRE(obs.has_value());
 	auto const& costs = obs.value();
-	REQUIRE(costs.size() == model.lp_columns().size());
+	REQUIRE(costs.size() == model.variables().size());
 
 	// All branching candidates have a positive pseudocost
 	for (auto* const var : model.lp_branch_cands()) {
-		auto const lp_index = static_cast<std::size_t>(SCIPcolGetLPPos(SCIPvarGetCol(var)));
-		auto const pseudocost = costs[lp_index];
+		auto const var_index = static_cast<std::size_t>(SCIPvarGetProbindex(var));
+		auto const pseudocost = costs[var_index];
 		REQUIRE(!std::isnan(pseudocost));
 		REQUIRE(pseudocost > 0);
 	}