dotnet: Remove reference to dotnet release command
- Currently not implemented... Add abseil patch - Add patches/absl-config.cmake Makefile: Add abseil-cpp on unix - Force abseil-cpp SHA1 to 45221cc note: Just before the PR #136 which break all CMake Makefile: Add abseil-cpp on windows - Force abseil-cpp SHA1 to 45221cc note: Just before the PR #136 which break all CMake CMake: Add abseil-cpp - Force abseil-cpp SHA1 to 45221cc note: Just before the PR #136 which break all CMake port to absl: C++ Part - Fix warning with the use of ABSL_MUST_USE_RESULT > The macro must appear as the very first part of a function declaration or definition: ... Note: past advice was to place the macro after the argument list. src: dependencies/sources/abseil-cpp-master/absl/base/attributes.h:418 - Rename enum after windows clash - Remove non compact table constraints - Change index type from int64 to int in routing library - Fix file_nonport compilation on windows - Fix another naming conflict with windows (NO_ERROR is a macro) - Cleanup hash containers; work on sat internals - Add optional_boolean sub-proto Sync cpp examples with internal code - reenable issue173 after reducing number of loops port to absl: Python Part - Add back cp_model.INT32_MIN|MAX for examples Update Python examples - Add random_tsp.py - Run words_square example - Run magic_square in python tests port to absl: Java Part - Fix compilation of the new routing parameters in java - Protect some code from SWIG parsing Update Java Examples port to absl: .Net Part Update .Net examples work on sat internals; Add C++ CP-SAT CpModelBuilder API; update sample code and recipes to use the new API; sync with internal code Remove VS 2015 in Appveyor-CI - abseil-cpp does not support VS 2015... improve tables upgrade C++ sat examples to use the new API; work on sat internals update license dates rewrite jobshop_ft06_distance.py to use the CP-SAT solver rename last example revert last commit more work on SAT internals fix
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string>
|
||||
|
||||
#include "absl/strings/match.h"
|
||||
#include "google/protobuf/descriptor.h"
|
||||
#include "google/protobuf/message.h"
|
||||
#include "google/protobuf/text_format.h"
|
||||
@@ -24,14 +25,13 @@
|
||||
#include "ortools/base/file.h"
|
||||
#include "ortools/base/logging.h"
|
||||
#include "ortools/base/status.h"
|
||||
#include "ortools/base/stringpiece_utils.h"
|
||||
#include "ortools/base/strutil.h"
|
||||
#include "ortools/base/timer.h"
|
||||
#include "ortools/glop/lp_solver.h"
|
||||
#include "ortools/glop/parameters.pb.h"
|
||||
#include "ortools/lp_data/lp_print_utils.h"
|
||||
#include "ortools/lp_data/mps_reader.h"
|
||||
#include "ortools/lp_data/proto_utils.h"
|
||||
#include "ortools/util/file_util.h"
|
||||
#include "ortools/util/proto_tools.h"
|
||||
|
||||
DEFINE_bool(mps_dump_problem, false, "Dumps problem in readable form.");
|
||||
@@ -50,6 +50,7 @@ DEFINE_string(params, "",
|
||||
|
||||
using google::protobuf::TextFormat;
|
||||
using operations_research::FullProtocolMessageAsString;
|
||||
using operations_research::ReadFileToProto;
|
||||
using operations_research::glop::GetProblemStatusString;
|
||||
using operations_research::glop::GlopParameters;
|
||||
using operations_research::glop::LinearProgram;
|
||||
@@ -63,7 +64,9 @@ using operations_research::glop::ToDouble;
|
||||
void ReadGlopParameters(GlopParameters* parameters) {
|
||||
if (!FLAGS_params_file.empty()) {
|
||||
std::string params;
|
||||
CHECK(TextFormat::ParseFromString(params, parameters)) << params;
|
||||
CHECK_OK(file::GetContents(FLAGS_params_file, ¶ms, file::Defaults()));
|
||||
CHECK(TextFormat::MergeFromString(params, parameters))
|
||||
<< FLAGS_params;
|
||||
}
|
||||
if (!FLAGS_params.empty()) {
|
||||
CHECK(TextFormat::MergeFromString(FLAGS_params, parameters))
|
||||
@@ -89,15 +92,15 @@ int main(int argc, char* argv[]) {
|
||||
const std::string& file_name = file_list[i];
|
||||
MPSReader mps_reader;
|
||||
operations_research::MPModelProto model_proto;
|
||||
if (strings::EndsWith(file_name, ".mps") ||
|
||||
strings::EndsWith(file_name, ".mps.gz")) {
|
||||
if (absl::EndsWith(file_name, ".mps") ||
|
||||
absl::EndsWith(file_name, ".mps.gz")) {
|
||||
if (!mps_reader.LoadFileAndTryFreeFormOnFail(file_name,
|
||||
&linear_program)) {
|
||||
LOG(INFO) << "Parse error for " << file_name;
|
||||
continue;
|
||||
}
|
||||
} else {
|
||||
file::ReadFileToProto(file_name, &model_proto);
|
||||
ReadFileToProto(file_name, &model_proto);
|
||||
MPModelProtoToLinearProgram(model_proto, &linear_program);
|
||||
}
|
||||
if (FLAGS_mps_dump_problem) {
|
||||
|
||||
Reference in New Issue
Block a user