Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrap getAndVerifyCommand in try catch block #53

Merged
merged 3 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion include/arbitration_graphs/internal/arbitrator_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ SubCommandT Arbitrator<CommandT, SubCommandT, VerifierT, VerificationResultT>::g
// otherwise we have bestOption == activeBehavior_ which already gained control

// an arbitrator as option might not return a command, if its applicable options fail verification:
const std::optional<SubCommandT> command = getAndVerifyCommand(bestOption, time);
std::optional<SubCommandT> command;
try {
command = getAndVerifyCommand(bestOption, time);
} catch (const std::exception& e) {
VLOG(1) << bestOption->behavior_->name_ << " threw an exception during getAndVerifyCommand(): " << e.what();
bestOption->verificationResult_.cache(time, VerificationResultT{false});
bestOption->behavior_->loseControl(time);
continue;
}

if (command) {
if (activeBehavior_ && bestOption != activeBehavior_) {
Expand Down
6 changes: 4 additions & 2 deletions include/arbitration_graphs/verification.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ namespace arbitration_graphs::verification {
* robots. Otherwise these are a good starting point to implement your own meaningful verifier.
*/
struct PlaceboResult {
static bool isOk() {
return true;
bool isOk() const {
return isOk_;
};

bool isOk_{true};
};
template <typename DataT>
struct PlaceboVerifier {
Expand Down
15 changes: 10 additions & 5 deletions test/dummy_types.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "behavior.hpp"
#include "verification.hpp"


namespace arbitration_graphs_tests {
Expand Down Expand Up @@ -63,14 +64,18 @@ class DummyBehavior : public Behavior<DummyCommand> {
int loseControlCounter_{0};
};

struct DummyResult {
bool isOk() const {
return isOk_;
};
class BrokenDummyBehavior : public DummyBehavior {
public:
BrokenDummyBehavior(const bool invocation, const bool commitment, const std::string& name = "BrokenDummyBehavior")
: DummyBehavior(invocation, commitment, name){};

bool isOk_;
DummyCommand getCommand(const Time& time) override {
throw std::runtime_error("BrokenDummyBehavior::getCommand() is broken");
}
};

struct DummyResult : public verification::PlaceboResult {};

} // namespace arbitration_graphs_tests


Expand Down
52 changes: 52 additions & 0 deletions test/handle_exceptions.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#include <optional>
#include <string>
#include "gtest/gtest.h"

#include "behavior.hpp"
#include "priority_arbitrator.hpp"

#include "dummy_types.hpp"

using namespace arbitration_graphs;
using namespace arbitration_graphs_tests;

class ExceptionHandlingTest : public ::testing::Test {
protected:
BrokenDummyBehavior::Ptr testBehaviorHighPriority =
std::make_shared<BrokenDummyBehavior>(true, true, "HighPriority");
DummyBehavior::Ptr testBehaviorLowPriority = std::make_shared<DummyBehavior>(true, true, "LowPriority");

Time time{Clock::now()};
};

TEST_F(ExceptionHandlingTest, HandleException) {
using OptionFlags = PriorityArbitrator<DummyCommand>::Option::Flags;

PriorityArbitrator<DummyCommand> testPriorityArbitrator;

testPriorityArbitrator.addOption(testBehaviorHighPriority, OptionFlags::NO_FLAGS);
testPriorityArbitrator.addOption(testBehaviorLowPriority, OptionFlags::NO_FLAGS);

ASSERT_TRUE(testPriorityArbitrator.checkInvocationCondition(time));

testPriorityArbitrator.gainControl(time);

// Since the high priority behavior is broken, we should get the low priority behavior as fallback
EXPECT_EQ("LowPriority", testPriorityArbitrator.getCommand(time));
ASSERT_TRUE(testPriorityArbitrator.options().at(0)->verificationResult_.cached(time));
ASSERT_TRUE(testPriorityArbitrator.options().at(1)->verificationResult_.cached(time));

EXPECT_FALSE(testPriorityArbitrator.options().at(0)->verificationResult_.cached(time)->isOk());
EXPECT_TRUE(testPriorityArbitrator.options().at(1)->verificationResult_.cached(time)->isOk());

testPriorityArbitrator.loseControl(time);

testBehaviorLowPriority->invocationCondition_ = false;
ASSERT_TRUE(testPriorityArbitrator.checkInvocationCondition(time));

testPriorityArbitrator.gainControl(time);

// With no fallback, there is no option to call even if the invocation condition is true
EXPECT_THROW(testPriorityArbitrator.getCommand(time), NoApplicableOptionPassedVerificationError);
}