Commit 6f639865 authored by Valentin Platzgummer's avatar Valentin Platzgummer

merging with master

parent c3b7baf0

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# callgrind format
version: 1
creator: callgrind-3.13.0
pid: 24465
cmd: ./QGroundControl.AppImage
part: 1
desc: I1 cache:
desc: D1 cache:
desc: LL cache:
desc: Timerange: Basic block 0 - 206412
desc: Trigger: Program termination
positions: line
events: Ir
summary: 0
totals: 0
# callgrind format
version: 1
creator: callgrind-3.13.0
pid: 24468
cmd: ./QGroundControl.AppImage
part: 1
desc: I1 cache:
desc: D1 cache:
desc: LL cache:
desc: Timerange: Basic block 0 - 366088887
desc: Trigger: Program termination
positions: line
events: Ir
summary: 0
totals: 0
This diff is collapsed.
...@@ -269,6 +269,8 @@ test_cc: detect_cc ...@@ -269,6 +269,8 @@ test_cc: detect_cc
$(MAKE) run SOURCE=examples/cpp/vrp.cc $(MAKE) run SOURCE=examples/cpp/vrp.cc
$(MAKE) run SOURCE=examples/cpp/nurses_cp.cc $(MAKE) run SOURCE=examples/cpp/nurses_cp.cc
$(MAKE) run SOURCE=examples/cpp/minimal_jobshop_cp.cc $(MAKE) run SOURCE=examples/cpp/minimal_jobshop_cp.cc
$(MAKE) run SOURCE=examples/cpp/linear_programming.cc
$(MAKE) run SOURCE=examples/cpp/integer_programming.cc
################## ##################
## C++ SOURCE ## ## C++ SOURCE ##
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
// [END import] // [END import]
namespace operations_research { namespace operations_research {
void IntegerProgrammingExample() { void AssignmentMip() {
// Data // Data
// [START data_model] // [START data_model]
const std::vector<std::vector<double>> costs{ const std::vector<std::vector<double>> costs{
...@@ -34,7 +34,7 @@ void IntegerProgrammingExample() { ...@@ -34,7 +34,7 @@ void IntegerProgrammingExample() {
// Solver // Solver
// [START solver] // [START solver]
// Create the mip solver with the CBC backend. // Create the mip solver with the CBC backend.
MPSolver solver("simple_mip_program", MPSolver solver("AssignmentMip",
MPSolver::CBC_MIXED_INTEGER_PROGRAMMING); MPSolver::CBC_MIXED_INTEGER_PROGRAMMING);
// [END solver] // [END solver]
...@@ -112,7 +112,7 @@ void IntegerProgrammingExample() { ...@@ -112,7 +112,7 @@ void IntegerProgrammingExample() {
} // namespace operations_research } // namespace operations_research
int main(int argc, char** argv) { int main(int argc, char** argv) {
operations_research::IntegerProgrammingExample(); operations_research::AssignmentMip();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
// [END program] // [END program]
...@@ -41,7 +41,7 @@ void RunConstraintProgrammingExample() { ...@@ -41,7 +41,7 @@ void RunConstraintProgrammingExample() {
solver.NewSearch(db); solver.NewSearch(db);
while (solver.NextSolution()) { while (solver.NextSolution()) {
LOG(INFO) << "Solution" LOG(INFO) << "Solution"
<< ": x = " << x->Value() << "; y = " << x->Value() << ": x = " << x->Value() << "; y = " << y->Value()
<< "; z = " << z->Value(); << "; z = " << z->Value();
} }
solver.EndSearch(); solver.EndSearch();
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.