Adapt test-pseudocost to Model refactor

Author: AntoinePrv

libecole/src/observation/pseudocosts.cpp

@@ -13,34 +13,32 @@ namespace ecole {
 namespace observation {
 
 nonstd::optional<xt::xtensor<double, 1>> Pseudocosts::obtain_observation(scip::Model& model) {
+	if (model.get_stage() != SCIP_STAGE_SOLVING) {
+		return {};
+	}
 
-	if (model.get_stage() == SCIP_STAGE_SOLVING) {
-
-		SCIP* scip = model.get_scip_ptr();
-
-		SCIP_VAR** cands;
-		SCIP_Real* cands_lp_values;
-		int nb_cands;
+	auto* const scip = model.get_scip_ptr();
 
-		/* get branching candidates */
-		SCIPgetLPBranchCands(scip, &cands, &cands_lp_values, NULL, NULL, &nb_cands, NULL);
-		assert(nb_cands > 0);
+	/* get branching candidates */
+	SCIP_VAR** cands;
+	SCIP_Real* cands_lp_values;
+	int nb_cands;
 
-		/* 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(""));
+	SCIPgetLPBranchCands(scip, &cands, &cands_lp_values, NULL, NULL, &nb_cands, NULL);
+	assert(nb_cands > 0);
 
-		for (int i = 0; i < nb_cands; i++) {
-			auto* const col = SCIPvarGetCol(cands[i]);
-			auto const lp_index = SCIPcolGetLPPos(col);
-			auto const score = SCIPgetVarPseudocostScore(scip, cands[i], cands_lp_values[i]);
-			pseudocosts(lp_index) = static_cast<double>(score);
-		}
-		return pseudocosts;
+	/* 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(""));
 
-	} else {
-		return {};
+	for (std::size_t i = 0; i < static_cast<std::size_t>(nb_cands); i++) {
+		auto* const col = SCIPvarGetCol(cands[i]);
+		auto const lp_index = static_cast<std::size_t>(SCIPcolGetLPPos(col));
+		auto const score = SCIPgetVarPseudocostScore(scip, cands[i], cands_lp_values[i]);
+		pseudocosts[lp_index] = static_cast<double>(score);
 	}
+
+	return pseudocosts;
 }
 
 }  // namespace observation

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

@@ -22,11 +22,11 @@ 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.lp_columns().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.value)));
+		auto const lp_index = static_cast<std::size_t>(SCIPcolGetLPPos(SCIPvarGetCol(var)));
 		auto const pseudocost = costs[lp_index];
 		REQUIRE(!std::isnan(pseudocost));
 		REQUIRE(pseudocost > 0);