always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linear solver: int64 -> int64_t; use new CP-SAT logging

Browse Source
This commit is contained in:
Laurent Perron
2021-03-12 16:59:39 +01:00
parent d181987c90
commit 6e15467065
22 changed files with 187 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ortools/linear_solver/scip_callback.h
View File

@@ -21,6 +21,7 @@
#ifndef OR_TOOLS_LINEAR_SOLVER_SCIP_CALLBACK_H_
#define OR_TOOLS_LINEAR_SOLVER_SCIP_CALLBACK_H_
#include <cstdint>
#include <string>
#include <vector>
@@ -86,8 +87,8 @@ class ScipConstraintHandlerContext {
bool is_pseudo_solution);
double VariableValue(const MPVariable* variable) const;
int64 CurrentNodeId() const;
int64 NumNodesProcessed() const;
int64_t CurrentNodeId() const;
int64_t NumNodesProcessed() const;
SCIP* scip() const { return scip_; }