merging with master

deploy/profile/callgrind.out.24465

-# 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

deploy/profile/callgrind.out.24468

-# 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

libs/or-tools-src-ubuntu/Makefile

@@ -269,6 +269,8 @@ test_cc: detect_cc
 	$(MAKE) run SOURCE=examples/cpp/vrp.cc
 	$(MAKE) run SOURCE=examples/cpp/nurses_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  ##

libs/or-tools-src-ubuntu/examples/cpp/assignment_mip.cc

@@ -20,7 +20,7 @@
 // [END import]
 
 namespace operations_research {
-void IntegerProgrammingExample() {
+void AssignmentMip() {
   // Data
   // [START data_model]
   const std::vector<std::vector<double>> costs{
@@ -34,7 +34,7 @@ void IntegerProgrammingExample() {
   // Solver
   // [START solver]
   // Create the mip solver with the CBC backend.
-  MPSolver solver("simple_mip_program",
+  MPSolver solver("AssignmentMip",
                   MPSolver::CBC_MIXED_INTEGER_PROGRAMMING);
   // [END solver]
 
@@ -112,7 +112,7 @@ void IntegerProgrammingExample() {
 }  // namespace operations_research
 
 int main(int argc, char** argv) {
-  operations_research::IntegerProgrammingExample();
+  operations_research::AssignmentMip();
   return EXIT_SUCCESS;
 }
 // [END program]

libs/or-tools-src-ubuntu/examples/cpp/constraint_programming_cp.cc

@@ -41,7 +41,7 @@ void RunConstraintProgrammingExample() {
   solver.NewSearch(db);
   while (solver.NextSolution()) {
     LOG(INFO) << "Solution"
-              << ": x = " << x->Value() << "; y = " << x->Value()
+              << ": x = " << x->Value() << "; y = " << y->Value()
               << "; z = " << z->Value();
   }
   solver.EndSearch();