ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: cleaned up code of Tasks and IndexerCommands

Browse Source
This commit is contained in:
mlangkabel
2018-09-10 13:17:49 +02:00
parent df0b7bc7bb
commit cdbca77495
16 changed files with 77 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/scheduling/TaskFindKeyOnBlackboard.cpp
+25
View File
@@ -0,0 +1,25 @@
#include "utility/scheduling/TaskFindKeyOnBlackboard.h"
#include "utility/scheduling/Blackboard.h"
TaskFindKeyOnBlackboard::TaskFindKeyOnBlackboard(const std::string& key)
: m_key(key)
{
}
void TaskFindKeyOnBlackboard::doEnter(std::shared_ptr<Blackboard> blackboard)
{
}
Task::TaskState TaskFindKeyOnBlackboard::doUpdate(std::shared_ptr<Blackboard> blackboard)
{
return (blackboard->exists(m_key)) ? STATE_SUCCESS : STATE_FAILURE;
}
void TaskFindKeyOnBlackboard::doExit(std::shared_ptr<Blackboard> blackboard)
{
}
void TaskFindKeyOnBlackboard::doReset(std::shared_ptr<Blackboard> blackboard)
{
}
src/lib/utility/scheduling/TaskFindValue.h → src/lib/utility/scheduling/TaskFindKeyOnBlackboard.h
+6 -6
View File
@@ -1,5 +1,5 @@
#ifndef TASK_FIND_VALUE_H
#define TASK_FIND_VALUE_H
#ifndef TASK_FIND_KEY_ON_BLACKBOARD_H
#define TASK_FIND_KEY_ON_BLACKBOARD_H
#include <string>
@@ -7,11 +7,11 @@
class Blackboard;
class TaskFindValue:
class TaskFindKeyOnBlackboard:
public Task
{
public:
TaskFindValue(const std::string& valueName);
TaskFindKeyOnBlackboard(const std::string& valueName);
private:
void doEnter(std::shared_ptr<Blackboard> blackboard) override;
@@ -19,7 +19,7 @@ private:
void doExit(std::shared_ptr<Blackboard> blackboard) override;
void doReset(std::shared_ptr<Blackboard> blackboard) override;
const std::string m_valueName;
const std::string m_key;
};
#endif // TASK_FIND_VALUE_H
#endif // TASK_FIND_KEY_ON_BLACKBOARD_H
src/lib/utility/scheduling/TaskFindValue.cpp
-25
View File
@@ -1,25 +0,0 @@
#include "utility/scheduling/TaskFindValue.h"
#include "utility/scheduling/Blackboard.h"
TaskFindValue::TaskFindValue(const std::string& valueName)
: m_valueName(valueName)
{
}
void TaskFindValue::doEnter(std::shared_ptr<Blackboard> blackboard)
{
}
Task::TaskState TaskFindValue::doUpdate(std::shared_ptr<Blackboard> blackboard)
{
return (blackboard->exists(m_valueName)) ? STATE_SUCCESS : STATE_FAILURE;
}
void TaskFindValue::doExit(std::shared_ptr<Blackboard> blackboard)
{
}
void TaskFindValue::doReset(std::shared_ptr<Blackboard> blackboard)
{
}
src/lib/utility/scheduling/TaskGroupParallel.cpp
-4
View File
@@ -11,10 +11,6 @@ TaskGroupParallel::TaskGroupParallel()
{
}
TaskGroupParallel::~TaskGroupParallel()
{
}
void TaskGroupParallel::addTask(std::shared_ptr<Task> task)
{
m_tasks.push_back(std::make_shared<TaskInfo>(std::make_shared<TaskRunner>(task)));
src/lib/utility/scheduling/TaskGroupParallel.h
-1
View File
@@ -13,7 +13,6 @@ class TaskGroupParallel
{
public:
TaskGroupParallel();
virtual ~TaskGroupParallel();
void addTask(std::shared_ptr<Task> task) override;
src/lib/utility/scheduling/TaskReturnSuccessWhile.h → src/lib/utility/scheduling/TaskReturnSuccessIf.h
+10 -10
View File
@@ -1,11 +1,11 @@
#ifndef TASK_RETURN_SUCCESS_WHILE_H
#define TASK_RETURN_SUCCESS_WHILE_H
#ifndef TASK_RETURN_SUCCESS_IF_H
#define TASK_RETURN_SUCCESS_IF_H
#include "utility/scheduling/Task.h"
#include "utility/scheduling/Blackboard.h"
template <typename T>
class TaskReturnSuccessWhile:
class TaskReturnSuccessIf:
public Task
{
public:
@@ -15,7 +15,7 @@ public:
CONDITION_EQUALS
};
TaskReturnSuccessWhile(const std::string& lhsValueName, ConditionType condition, T rhsValue);
TaskReturnSuccessIf(const std::string& lhsValueName, ConditionType condition, T rhsValue);
private:
void doEnter(std::shared_ptr<Blackboard> blackboard) override;
@@ -29,7 +29,7 @@ private:
};
template <typename T>
TaskReturnSuccessWhile<T>::TaskReturnSuccessWhile(const std::string& lhsValueName, ConditionType condition, T rhsValue)
TaskReturnSuccessIf<T>::TaskReturnSuccessIf(const std::string& lhsValueName, ConditionType condition, T rhsValue)
: m_lhsValueName(lhsValueName)
, m_condition(condition)
, m_rhsValue(rhsValue)
@@ -37,12 +37,12 @@ TaskReturnSuccessWhile<T>::TaskReturnSuccessWhile(const std::string& lhsValueNam
}
template <typename T>
void TaskReturnSuccessWhile<T>::doEnter(std::shared_ptr<Blackboard> blackboard)
void TaskReturnSuccessIf<T>::doEnter(std::shared_ptr<Blackboard> blackboard)
{
}
template <typename T>
Task::TaskState TaskReturnSuccessWhile<T>::doUpdate(std::shared_ptr<Blackboard> blackboard)
Task::TaskState TaskReturnSuccessIf<T>::doUpdate(std::shared_ptr<Blackboard> blackboard)
{
const int SLEEP_TIME_MS = 25;
std::this_thread::sleep_for(std::chrono::microseconds(SLEEP_TIME_MS));
@@ -69,13 +69,13 @@ Task::TaskState TaskReturnSuccessWhile<T>::doUpdate(std::shared_ptr<Blackboard>
}
template <typename T>
void TaskReturnSuccessWhile<T>::doExit(std::shared_ptr<Blackboard> blackboard)
void TaskReturnSuccessIf<T>::doExit(std::shared_ptr<Blackboard> blackboard)
{
}
template <typename T>
void TaskReturnSuccessWhile<T>::doReset(std::shared_ptr<Blackboard> blackboard)
void TaskReturnSuccessIf<T>::doReset(std::shared_ptr<Blackboard> blackboard)
{
}
#endif // TASK_RETURN_SUCCESS_WHILE_H
#endif // TASK_RETURN_SUCCESS_IF_H