More bind cleanup

dcwhite · dcwhite · commit 7fc44a044d7d · 2021-02-15T14:54:45.000-07:00
diff --git a/src/Core/Algorithms/Visualization/OsprayDataAlgorithm.cc b/src/Core/Algorithms/Visualization/OsprayDataAlgorithm.cc
@@ -28,7 +28,6 @@
 
 #include <Core/Algorithms/Visualization/OsprayDataAlgorithm.h>
 #include <Core/Datatypes/Geometry.h>
-#include <Core/Datatypes/String.h>
 #include <Core/Datatypes/Legacy/Field/VField.h>
 #include <Core/Datatypes/ColorMap.h>
 #include <Core/Datatypes/Legacy/Field/Field.h>
@@ -40,13 +39,10 @@
 #include <Core/Algorithms/Base/AlgorithmPreconditions.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/utility.hpp>
 #include <boost/graph/topological_sort.hpp>
 #include <boost/graph/undirected_dfs.hpp>
-#include <boost/cstdlib.hpp>
 #include <boost/graph/copy.hpp>
 #include <boost/graph/connected_components.hpp>
-#include <boost/lambda/lambda.hpp>
 
 #include <Core/Logging/Log.h>
 #include <spdlog/fmt/ostr.h>
diff --git a/src/Core/Logging/Logger.cc b/src/Core/Logging/Logger.cc
@@ -43,7 +43,7 @@ ScopedTimeRemarker::ScopedTimeRemarker(LegacyLoggerInterface* log, const std::st
 ScopedTimeRemarker::~ScopedTimeRemarker()
 {
   std::ostringstream perf;
-  perf << label_ <<  " took " << timer_.elapsed() << " seconds." << std::endl;
+  perf << label_ <<  " took " << timer_.elapsed().wall << " seconds." << std::endl;
   log_->status(perf.str());
 }
 
@@ -55,7 +55,7 @@ ScopedTimeLogger::ScopedTimeLogger(const std::string& label, bool shouldLog): la
 
 ScopedTimeLogger::~ScopedTimeLogger()
 {
-  auto time = timer_.elapsed();
+  auto time = timer_.elapsed().wall;
   if (shouldLog_)
     LOG_DEBUG("{} took {} seconds.", label_, time);
 }
diff --git a/src/Core/Logging/ScopedTimeRemarker.h b/src/Core/Logging/ScopedTimeRemarker.h
@@ -32,7 +32,7 @@
 #define CORE_LOGGING_SCOPEDTIMEREMARKER_H
 
 #include <string>
-#include <boost/timer.hpp>
+#include <boost/timer/timer.hpp>
 #include <Core/Logging/LoggerFwd.h>
 #include <Core/Logging/share.h>
 
@@ -50,7 +50,7 @@ namespace SCIRun
       private:
         LegacyLoggerInterface* log_;
         std::string label_;
-        boost::timer timer_;
+        boost::timer::cpu_timer timer_;
       };
 
       class SCISHARE ScopedTimeLogger
@@ -61,7 +61,7 @@ namespace SCIRun
       private:
         std::string label_;
         bool shouldLog_;
-        boost::timer timer_;
+        boost::timer::cpu_timer timer_;
       };
     }
   }
diff --git a/src/Dataflow/Engine/Controller/NetworkEditorController.cc b/src/Dataflow/Engine/Controller/NetworkEditorController.cc
@@ -28,7 +28,7 @@
 
 /// @todo Documentation Dataflow/Engine/Controller/NetworkEditorController.cc
 
-#include <iostream>
+#include <boost/foreach.hpp>
 #include <Dataflow/Engine/Controller/NetworkEditorController.h>
 
 #include <Dataflow/Network/Connection.h>
@@ -45,8 +45,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/foreach.hpp>
 
 #ifdef BUILD_WITH_PYTHON
 #include <Dataflow/Engine/Python/NetworkEditorPythonAPI.h>
@@ -273,7 +271,7 @@ namespace
   InputPortHandle getFirstAvailableDynamicPortWithName(ModuleHandle mod, const std::string& name)
   {
     auto ports = mod->findInputPortsWithName(name);
-    auto firstEmptyDynamicPortWithName = std::find_if(ports.begin(), ports.end(),
+    const auto firstEmptyDynamicPortWithName = std::find_if(ports.begin(), ports.end(),
       [](InputPortHandle iport) { return iport->nconnections() == 0; });
     return firstEmptyDynamicPortWithName != ports.end() ? *firstEmptyDynamicPortWithName : nullptr;
   }
@@ -282,7 +280,7 @@ namespace
 ModuleHandle NetworkEditorController::duplicateModule(const ModuleHandle& module)
 {
   ENSURE_NOT_NULL(module, "Cannot duplicate null module");
-  auto id(module->id());
+  const auto id(module->id());
   auto newModule = addModuleImpl(module->info());
   newModule->setState(module->get_state()->clone());
   static ModuleCounter dummy;
@@ -353,16 +351,16 @@ ModuleHandle NetworkEditorController::insertNewModule(const PortDescriptionInter
 {
   auto newMod = connectNewModule(portToConnect, info.newModuleName);
 
-  auto endModule = theNetwork_->lookupModule(ModuleId(info.endModuleId));
+  const auto endModule = theNetwork_->lookupModule(ModuleId(info.endModuleId));
 
   auto newModOutputPorts = newMod->outputPorts();
-  auto firstMatchingOutputPort = std::find_if(newModOutputPorts.begin(), newModOutputPorts.end(),
+  const auto firstMatchingOutputPort = std::find_if(newModOutputPorts.begin(), newModOutputPorts.end(),
     [&](OutputPortHandle oport) { return oport->get_typename() == portToConnect->get_typename(); }
     );
 
   if (firstMatchingOutputPort != newModOutputPorts.end())
   {
-    auto newOutputPortToConnectFrom = *firstMatchingOutputPort;
+    const auto newOutputPortToConnectFrom = *firstMatchingOutputPort;
 
     auto endModuleInputPortOptions = endModule->findInputPortsWithName(info.inputPortName);
     if (!endModuleInputPortOptions.empty())
@@ -371,19 +369,19 @@ ModuleHandle NetworkEditorController::insertNewModule(const PortDescriptionInter
 
       if (!firstPort->isDynamic())  // easy case
       {
-        auto connId = firstPort->connection(0)->id_;
+        const auto connId = firstPort->connection(0)->id_;
         removeConnection(connId);
         requestConnection(newOutputPortToConnectFrom.get(), firstPort.get());
       }
       else //dynamic: match portId exactly, remove, then retrieve list again to find first empty dynamic port of same name.
       {
-        auto exactMatch = std::find_if(endModuleInputPortOptions.begin(), endModuleInputPortOptions.end(),
+        const auto exactMatch = std::find_if(endModuleInputPortOptions.begin(), endModuleInputPortOptions.end(),
           [&](InputPortHandle iport) { return iport->id().toString() == info.inputPortId; });
         if (exactMatch != endModuleInputPortOptions.end())
         {
-          auto connId = (*exactMatch)->connection(0)->id_;
+          const auto connId = (*exactMatch)->connection(0)->id_;
           removeConnection(connId);
-          auto firstEmptyDynamicPortWithName = getFirstAvailableDynamicPortWithName(endModule, info.inputPortName);
+          const auto firstEmptyDynamicPortWithName = getFirstAvailableDynamicPortWithName(endModule, info.inputPortName);
           if (firstEmptyDynamicPortWithName)
           {
             requestConnection(newOutputPortToConnectFrom.get(), firstEmptyDynamicPortWithName.get());
@@ -410,10 +408,10 @@ boost::optional<ConnectionId> NetworkEditorController::requestConnection(const P
   ENSURE_NOT_NULL(from, "from port");
   ENSURE_NOT_NULL(to, "to port");
 
-  auto out = from->isInput() ? to : from;
-  auto in = from->isInput() ? from : to;
+  const auto out = from->isInput() ? to : from;
+  const auto in = from->isInput() ? from : to;
 
-  ConnectionDescription desc(
+  const ConnectionDescription desc(
     OutgoingConnectionDescription(out->getUnderlyingModuleId(), out->id()),
     IncomingConnectionDescription(in->getUnderlyingModuleId(), in->id()));
 
@@ -791,7 +789,7 @@ void NetworkEditorController::updateModulePositions(const ModulePositions& modul
 
 void NetworkEditorController::cleanUpNetwork()
 {
-  auto all = boost::lambda::constant(true);
+  auto all = [](ModuleHandle) { return true; };
   NetworkGraphAnalyzer analyze(*theNetwork_, all, true);
   auto connected = analyze.connectedComponents();
 
diff --git a/src/Dataflow/Engine/Scheduler/DynamicExecutor/WorkUnitExecutor.h b/src/Dataflow/Engine/Scheduler/DynamicExecutor/WorkUnitExecutor.h
@@ -31,7 +31,6 @@
 
 #include <Dataflow/Engine/Scheduler/DynamicExecutor/WorkUnitProducerInterface.h>
 #include <Dataflow/Network/NetworkInterface.h>
-#include <Core/Logging/Log.h>
 #include <Dataflow/Engine/Scheduler/share.h>
 
 namespace SCIRun {
@@ -42,27 +41,19 @@ namespace SCIRun {
         struct SCISHARE ModuleExecutor
         {
           ModuleExecutor(Networks::ModuleHandle mod, const Networks::ExecutableLookup* lookup, ProducerInterfacePtr producer) :
-            module_(mod), lookup_(lookup), producer_(producer),
-            shouldLog_(false)//SCIRun::Core::Logging::Log::get().verbose())
+            module_(mod), lookup_(lookup), producer_(producer)
           {
-            //Core::Logging::Log::get("executor").setVerbose(shouldLog_);
           }
           void run() const
           {
-            //log_->trace_if(shouldLog_, "Module Executor: {}", module_->get_id().id_);
-            auto exec = lookup_->lookupExecutable(module_->id());
-            boost::signals2::scoped_connection s(exec->connectExecuteEnds([this]
-            {
-              producer_->enqueueReadyModules();
-            }));
+            auto* exec = lookup_->lookupExecutable(module_->id());
+            boost::signals2::scoped_connection s(exec->connectExecuteEnds([this](double, const Networks::ModuleId&) { producer_->enqueueReadyModules(); }));
             exec->executeWithSignals();
           }
 
           Networks::ModuleHandle module_;
           const Networks::ExecutableLookup* lookup_;
           ProducerInterfacePtr producer_;
-          bool shouldLog_;
-          //static Core::Logging::Logger2 log_;
         };
 
 
diff --git a/src/Dataflow/Engine/Scheduler/GraphNetworkAnalyzer.cc b/src/Dataflow/Engine/Scheduler/GraphNetworkAnalyzer.cc
@@ -37,7 +37,6 @@
 #include <boost/graph/topological_sort.hpp>
 #include <boost/graph/copy.hpp>
 #include <boost/graph/connected_components.hpp>
-#include <boost/lambda/lambda.hpp>
 
 using namespace SCIRun::Dataflow::Engine;
 using namespace SCIRun::Dataflow::Engine::NetworkGraph;
diff --git a/src/Dataflow/Engine/Scheduler/SchedulerInterfaces.cc b/src/Dataflow/Engine/Scheduler/SchedulerInterfaces.cc
@@ -28,13 +28,12 @@
 
 #include <Dataflow/Engine/Scheduler/SchedulerInterfaces.h>
 #include <Dataflow/Network/NetworkInterface.h>
-#include <boost/lambda/core.hpp>
 #include <Core/Logging/Log.h>
 
 using namespace SCIRun::Dataflow::Engine;
 using namespace SCIRun::Dataflow::Networks;
 
-ScopedExecutionBoundsSignaller::ScopedExecutionBoundsSignaller(const ExecutionBounds* bounds, boost::function<int()> errorCodeRetriever) : bounds_(bounds), errorCodeRetriever_(errorCodeRetriever)
+ScopedExecutionBoundsSignaller::ScopedExecutionBoundsSignaller(const ExecutionBounds* bounds, std::function<int()> errorCodeRetriever) : bounds_(bounds), errorCodeRetriever_(errorCodeRetriever)
 {
   bounds_->executeStarts_();
 }
@@ -59,7 +58,7 @@ const ExecutionBounds& ExecutionContext::bounds() const
 
 void ExecutionContext::preexecute()
 {
-  network_.setExpandedModuleExecutionState(ModuleExecutionState::NotExecuted, boost::lambda::constant(true));
+  network_.setExpandedModuleExecutionState(ModuleExecutionState::NotExecuted, [](ModuleHandle) { return true; });
   network_.setModuleExecutionState(ModuleExecutionState::Waiting, additionalFilter_);
 }
 
diff --git a/src/Dataflow/Engine/Scheduler/SchedulerInterfaces.h b/src/Dataflow/Engine/Scheduler/SchedulerInterfaces.h
@@ -63,11 +63,11 @@ namespace Engine {
   class SCISHARE ScopedExecutionBoundsSignaller
   {
   public:
-    ScopedExecutionBoundsSignaller(const ExecutionBounds* bounds, boost::function<int()> errorCodeRetriever);
+    ScopedExecutionBoundsSignaller(const ExecutionBounds* bounds, std::function<int()> errorCodeRetriever);
     ~ScopedExecutionBoundsSignaller();
   private:
     const ExecutionBounds* bounds_;
-    boost::function<int()> errorCodeRetriever_;
+    std::function<int()> errorCodeRetriever_;
   };
 
   struct SCISHARE ExecutionContext : boost::noncopyable
diff --git a/src/Dataflow/Network/ExecutableObject.h b/src/Dataflow/Network/ExecutableObject.h
@@ -46,7 +46,7 @@ namespace Networks {
   class SCISHARE ExecutableObject
   {
   public:
-    virtual ~ExecutableObject() {}
+    virtual ~ExecutableObject() = default;
     virtual bool executeWithSignals() = 0;
 
     virtual boost::signals2::connection connectExecuteBegins(const ExecuteBeginsSignalType::slot_type& subscriber) = 0;
diff --git a/src/Dataflow/Network/NetworkFwd.h b/src/Dataflow/Network/NetworkFwd.h
@@ -33,8 +33,7 @@
 #define DATAFLOW_NETWORK_NETWORK_FWD_H
 
 #include <Core/Utils/SmartPointers.h>
-#include <boost/function.hpp>
-#include <boost/any.hpp>
+#include <string>
 #include <map>
 
 
@@ -103,9 +102,9 @@ typedef SharedPointer<DisabledComponents> DisabledComponentsHandle;
 typedef SharedPointer<NetworkFile> NetworkFileHandle;
 typedef SharedPointer<Subnetworks> SubnetworksHandle;
 
-typedef std::map<std::string, std::map<std::string, std::map<std::string, ModuleDescription>>> ModuleDescriptionMap;
-typedef boost::function<bool(ModuleHandle)> ModuleFilter;
-using ConnectionFilter = boost::function<bool(const ConnectionDescription&)>;
+using ModuleDescriptionMap = std::map<std::string, std::map<std::string, std::map<std::string, ModuleDescription>>>;
+using ModuleFilter = std::function<bool(ModuleHandle)>;
+using ConnectionFilter = std::function<bool(const ConnectionDescription&)>;
 
 }}}
 
diff --git a/src/Dataflow/Serialization/Network/Importer/NetworkIO.h b/src/Dataflow/Serialization/Network/Importer/NetworkIO.h
@@ -46,14 +46,15 @@ namespace SCIRun {
 namespace Dataflow {
 namespace Networks {
 
-  typedef boost::function<Core::Algorithms::AlgorithmParameter::Value(const std::string&)> ValueConverter;
+  using ValueConverter = std::function<Core::Algorithms::AlgorithmParameter::Value(const std::string&)>;
   struct SCISHARE NewNameAndValueConverter
   {
     Core::Algorithms::Name name;
     ValueConverter valueConverter;
   };
-  typedef std::map<std::string, NewNameAndValueConverter> OldStateNameConverterLookup;
-  typedef std::map<std::string, OldStateNameConverterLookup> StateConverterLookupByModule;
+
+  using OldStateNameConverterLookup = std::map<std::string, NewNameAndValueConverter>;
+  using StateConverterLookupByModule = std::map<std::string, OldStateNameConverterLookup>;
 
   class SCISHARE LegacyNetworkStateConversion
   {
@@ -173,7 +174,7 @@ namespace Networks {
 
     std::stack<id_map_t> netid_to_modid_;
     std::stack<id_map_t> netid_to_conid_;
-    //! the enviroment variable substitutions
+    //! the environment variable substitutions
     id_map_t env_subs_;
 
     std::string net_file_;
diff --git a/src/Dataflow/Serialization/Network/NetworkXMLSerializer.cc b/src/Dataflow/Serialization/Network/NetworkXMLSerializer.cc
@@ -36,7 +36,6 @@
 #include <Dataflow/Network/PortInterface.h>
 #include <Dataflow/Serialization/Network/XMLSerializer.h>
 #include <fstream>
-#include <boost/lambda/lambda.hpp>
 #include <Core/Logging/Log.h>
 
 using namespace SCIRun::Dataflow::Networks;
@@ -174,7 +173,7 @@ NetworkFileHandle NetworkXMLConverter::to_xml_data(const NetworkHandle& network)
 
 NetworkFileHandle NetworkToXML::to_xml_data(const NetworkHandle& network)
 {
-  return to_xml_data(network, boost::lambda::constant(true), boost::lambda::constant(true));
+  return to_xml_data(network, [](ModuleHandle) { return true; }, [](const ConnectionDescription&) { return true; });
 }
 
 NetworkFileHandle NetworkToXML::to_xml_data(const NetworkHandle& network, ModuleFilter modFilter, ConnectionFilter connFilter)
diff --git a/src/Interface/Application/ModuleWidget.cc b/src/Interface/Application/ModuleWidget.cc
@@ -388,7 +388,7 @@ ModuleWidget::ModuleWidget(NetworkEditor* ed, const QString& name, ModuleHandle
 
   connect(actionsMenu_->getAction("Destroy"), SIGNAL(triggered()), this, SIGNAL(deleteMeLater()));
 
-  connectExecuteEnds([this] { executeEnds(); });
+  connectExecuteEnds([this] (double, const ModuleId&) { executeEnds(); });
   connect(this, SIGNAL(executeEnds()), this, SLOT(changeExecuteButtonToPlay()));
   connect(this, SIGNAL(signalExecuteButtonIconChangeToStop()), this, SLOT(changeExecuteButtonToStop()));
 
diff --git a/src/Interface/Application/Port.cc b/src/Interface/Application/Port.cc
@@ -28,7 +28,6 @@
 
 #include <iostream>
 #include <Interface/qt_include.h>
-#include <boost/lambda/lambda.hpp>
 #include <boost/regex.hpp>
 #include <Dataflow/Network/Port.h>
 #include <Interface/Application/Port.h>
diff --git a/src/Interface/Application/Subnetworks.cc b/src/Interface/Application/Subnetworks.cc
@@ -44,7 +44,6 @@
 #include <Core/Application/Preferences/Preferences.h>
 #include <Core/Application/Application.h>
 #include <Dataflow/Serialization/Network/XMLSerializer.h>
-#include <boost/lambda/lambda.hpp>
 #include <Modules/Factory/HardCodedModuleFactory.h>
 #include <Core/Utils/StringUtil.h>
 
diff --git a/src/Modules/Fields/ReportFieldInfo.cc b/src/Modules/Fields/ReportFieldInfo.cc
@@ -57,9 +57,9 @@ ReportFieldInfo::ReportFieldInfo() : Module(staticInfo_)
 
 void ReportFieldInfo::execute()
 {
-  auto field = getRequiredInput(InputField);
+  const auto field = getRequiredInput(InputField);
 
-  auto output = algo().run(withInputData((InputField, field)));
+  const auto output = algo().run(withInputData((InputField, field)));
 
   get_state()->setTransientValue("ReportedInfo", output.getTransient());
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ ScopedTimeRemarker::ScopedTimeRemarker(LegacyLoggerInterface* log, const std::st`
`43`	`43`	`ScopedTimeRemarker::~ScopedTimeRemarker()`
`44`	`44`	`{`
`45`	`45`	`std::ostringstream perf;`
`46`		`- perf << label_ << " took " << timer_.elapsed() << " seconds." << std::endl;`
	`46`	`+ perf << label_ << " took " << timer_.elapsed().wall << " seconds." << std::endl;`
`47`	`47`	`log_->status(perf.str());`
`48`	`48`	`}`
`49`	`49`
`@@ -55,7 +55,7 @@ ScopedTimeLogger::ScopedTimeLogger(const std::string& label, bool shouldLog): la`
`55`	`55`
`56`	`56`	`ScopedTimeLogger::~ScopedTimeLogger()`
`57`	`57`	`{`
`58`		`- auto time = timer_.elapsed();`
	`58`	`+ auto time = timer_.elapsed().wall;`
`59`	`59`	`if (shouldLog_)`
`60`	`60`	`LOG_DEBUG("{} took {} seconds.", label_, time);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,12 @@`
`28`	`28`
`29`	`29`	`#include <Dataflow/Engine/Scheduler/SchedulerInterfaces.h>`
`30`	`30`	`#include <Dataflow/Network/NetworkInterface.h>`
`31`		`-#include <boost/lambda/core.hpp>`
`32`	`31`	`#include <Core/Logging/Log.h>`
`33`	`32`
`34`	`33`	`using namespace SCIRun::Dataflow::Engine;`
`35`	`34`	`using namespace SCIRun::Dataflow::Networks;`
`36`	`35`
`37`		`-ScopedExecutionBoundsSignaller::ScopedExecutionBoundsSignaller(const ExecutionBounds* bounds, boost::function<int()> errorCodeRetriever) : bounds_(bounds), errorCodeRetriever_(errorCodeRetriever)`
	`36`	`+ScopedExecutionBoundsSignaller::ScopedExecutionBoundsSignaller(const ExecutionBounds* bounds, std::function<int()> errorCodeRetriever) : bounds_(bounds), errorCodeRetriever_(errorCodeRetriever)`
`38`	`37`	`{`
`39`	`38`	`bounds_->executeStarts_();`
`40`	`39`	`}`
`@@ -59,7 +58,7 @@ const ExecutionBounds& ExecutionContext::bounds() const`
`59`	`58`
`60`	`59`	`void ExecutionContext::preexecute()`
`61`	`60`	`{`
`62`		`- network_.setExpandedModuleExecutionState(ModuleExecutionState::NotExecuted, boost::lambda::constant(true));`
	`61`	`+ network_.setExpandedModuleExecutionState(ModuleExecutionState::NotExecuted, [](ModuleHandle) { return true; });`
`63`	`62`	`network_.setModuleExecutionState(ModuleExecutionState::Waiting, additionalFilter_);`
`64`	`63`	`}`
`65`	`64`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ namespace Networks {`
`46`	`46`	`class SCISHARE ExecutableObject`
`47`	`47`	`{`
`48`	`48`	`public:`
`49`		`- virtual ~ExecutableObject() {}`
	`49`	`+ virtual ~ExecutableObject() = default;`
`50`	`50`	`virtual bool executeWithSignals() = 0;`
`51`	`51`
`52`	`52`	`virtual boost::signals2::connection connectExecuteBegins(const ExecuteBeginsSignalType::slot_type& subscriber) = 0;`