Remove logging

sebrockm · Oct 15, 2023 · 0e1153a · 0e1153a
1 parent 3c29d86
commit 0e1153a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 78 deletions.
diff --git a/tsplp/include/MtspResult.hpp b/tsplp/include/MtspResult.hpp
@@ -30,7 +30,5 @@ class MtspResult
     void SetTimeoutHit();
     Bounds UpdateUpperBound(double newUpperBound, std::vector<std::vector<size_t>>&& newPaths);
     Bounds UpdateLowerBound(double newLowerBound);
-
-    void Print() const;
 };
 }
diff --git a/tsplp/src/BranchAndCutQueue.cpp b/tsplp/src/BranchAndCutQueue.cpp
@@ -3,7 +3,6 @@
 #include "Model.hpp"
 
 #include <algorithm>
-#include <iostream>
 
 tsplp::BranchAndCutQueue::BranchAndCutQueue(size_t threadCount)
     : m_workedOnLowerBounds(threadCount)
@@ -192,37 +191,3 @@ double tsplp::BranchAndCutQueue::CalculateLowerBound() const
 
     return std::min(lbHeap, lbWorkedOn);
 }
-
-void tsplp::BranchAndCutQueue::Print() const
-{
-    std::unique_lock lock { m_mutex };
-
-    std::cout << "BranchAndCutQueue:\nHeap:";
-    for (const auto& [lb, v0, v1, r] : m_heap)
-    {
-        std::cout << "LB:" << lb << ", v0:";
-        for (const auto& v : v0)
-            std::cout << v.GetId() << ",";
-        std::cout << " v1:";
-        for (const auto& v : v1)
-            std::cout << v.GetId() << ",";
-        std::cout << " is result: " << r;
-        std::cout << std::endl;
-    }
-
-    std::cout << "\nworked on LBs: ";
-    for (size_t i = 0; i < m_workedOnLowerBounds.size(); ++i)
-    {
-        if (m_workedOnLowerBounds[i])
-        {
-            std::cout << i << ":" << *m_workedOnLowerBounds[i];
-        }
-        else
-        {
-            std::cout << i << ":<>";
-        }
-        std::cout << " ";
-    }
-
-    std::cout << "\nis cleared: " << m_isCleared << std::endl << std::endl;
-}
diff --git a/tsplp/src/BranchAndCutQueue.hpp b/tsplp/src/BranchAndCutQueue.hpp
@@ -76,7 +76,6 @@ class BranchAndCutQueue
         double lowerBound, std::vector<Variable> fixedVariables0,
         std::vector<Variable> fixedVariables1, Variable branchingVariable,
         std::vector<Variable> recursivelyFixed0);
-    void Print() const;
 
 private:
     void NotifyNodeDone(size_t threadId);

diff --git a/tsplp/src/MtspModel.cpp b/tsplp/src/MtspModel.cpp
@@ -305,8 +305,6 @@ void tsplp::MtspModel::BranchAndCutSolve(
     queue.Push(0, {}, {});
     ConstraintDeque constraints(threadCount);
 
-    std::mutex print_mutex;
-
     const auto threadLoop = [&](const size_t threadId)
     {
         auto model = m_model;
@@ -322,18 +320,12 @@ void tsplp::MtspModel::BranchAndCutSolve(
             if (initialBounds.Lower >= initialBounds.Upper)
             {
                 queue.ClearAll();
-                std::unique_lock lock { print_mutex };
-                std::cout << m_name << ": thread " << threadId << " exited because bounds crossed"
-                          << std::endl;
                 break;
             }
 
             if (std::chrono::steady_clock::now() >= m_endTime)
             {
                 queue.ClearAll();
-                std::unique_lock lock { print_mutex };
-                std::cout << m_name << ": thread " << threadId << " exited because timeout"
-                          << std::endl;
                 break;
             }
 
@@ -344,9 +336,6 @@ void tsplp::MtspModel::BranchAndCutSolve(
             auto top = queue.Pop(threadId);
             if (!top.has_value())
             {
-                std::unique_lock lock { print_mutex };
-                std::cout << m_name << ": thread " << threadId
-                          << " exited because Pop returned nothing" << std::endl;
                 break;
             }
 
@@ -386,12 +375,7 @@ void tsplp::MtspModel::BranchAndCutSolve(
                 throw std::logic_error(m_name + ": Unexpected error happened while solving LP.");
             case Status::Timeout: // timeout will be handled at the beginning of the next iteration
             case Status::Infeasible: // fixation of some variable makes this infeasible, skip it
-            {
-                std::unique_lock lock { print_mutex };
-                std::cout << m_name << ", thread " << threadId << ": Infeasible, skipping."
-                          << std::endl;
                 continue;
-            }
             case Status::Optimal:
                 break;
             }
@@ -423,11 +407,6 @@ void tsplp::MtspModel::BranchAndCutSolve(
             // trying to improve it further
             if (currentLowerBound >= currentUpperBound)
             {
-                std::unique_lock lock { print_mutex };
-                std::cout << m_name << ", thread " << threadId
-                          << ": currentLowerBound=" << currentLowerBound
-                          << " >= currentUpperBound=" << currentUpperBound << " skipping"
-                          << std::endl;
                 queue.PushResult(currentLowerBound);
                 continue;
             }
@@ -507,14 +486,8 @@ void tsplp::MtspModel::BranchAndCutSolve(
                         currentLowerBound, CreatePathsFromVariables(model));
                 }
 
-                {
-                    std::unique_lock lock { print_mutex };
-                    std::cout << m_name << ", thread " << threadId
-                              << ": non-fractional solution found: " << currentLowerBound
-                              << std::endl;
-                    queue.PushResult(currentLowerBound);
-                    continue;
-                }
+                queue.PushResult(currentLowerBound);
+                continue;
             }
 
             // As a last resort, split the problem on a fractional variable
@@ -541,9 +514,6 @@ void tsplp::MtspModel::BranchAndCutSolve(
     {
         if (std::chrono::steady_clock::now() < m_endTime)
         {
-            std::unique_lock lock { print_mutex };
-            queue.Print();
-            m_bestResult.Print();
             throw std::logic_error(
                 m_name + ": Logic Error: Timeout not reached, but no optimal solution found.");
         }

diff --git a/tsplp/src/MtspResult.cpp b/tsplp/src/MtspResult.cpp
@@ -45,12 +45,4 @@ MtspResult::Bounds MtspResult::UpdateLowerBound(double newLowerBound)
 
     return Bounds { .Lower = m_lowerBound, .Upper = m_upperBound };
 }
-
-void MtspResult::Print() const
-{
-    std::unique_lock lock { m_mutex };
-    std::cout << "MtspResult:\nLB:" << m_lowerBound << " UB:" << m_upperBound
-              << " is timeout hit: " << m_isTimeoutHit << std::endl
-              << std::endl;
-}
 }