diff options
Diffstat (limited to 'src')
114 files changed, 2476 insertions, 2046 deletions
diff --git a/src/core/expression/RBAActiveContents.cpp b/src/core/expression/RBAActiveContents.cpp index b5d88a7..818f11d 100644 --- a/src/core/expression/RBAActiveContents.cpp +++ b/src/core/expression/RBAActiveContents.cpp @@ -21,7 +21,7 @@ #include <memory> #include "RBAActiveContents.hpp" #include "RBAConstraintInfo.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAAllocatable.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" @@ -49,7 +49,7 @@ RBAActiveContents::getModelElementType() const } const RBARuleObject* -RBAActiveContents::getReferenceObjectCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +RBAActiveContents::getReferenceObjectCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAActiveContents.hpp b/src/core/expression/RBAActiveContents.hpp index 3ee9f7d..7f3af0a 100644 --- a/src/core/expression/RBAActiveContents.hpp +++ b/src/core/expression/RBAActiveContents.hpp @@ -40,7 +40,7 @@ class RBAActiveContents : public RBAAllocatableOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBAActiveState.cpp b/src/core/expression/RBAActiveState.cpp index 1e0f6b3..920f6d2 100644 --- a/src/core/expression/RBAActiveState.cpp +++ b/src/core/expression/RBAActiveState.cpp @@ -23,7 +23,7 @@ #include "RBAContent.hpp" #include "RBAContentState.hpp" #include "RBAConstraintInfo.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBALogManager.hpp" namespace rba @@ -38,7 +38,7 @@ RBAModelElementType RBAActiveState::getModelElementType() const return RBAModelElementType::ActiveState; } const RBARuleObject* RBAActiveState::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAActiveState.hpp b/src/core/expression/RBAActiveState.hpp index 3876c78..5d96bab 100644 --- a/src/core/expression/RBAActiveState.hpp +++ b/src/core/expression/RBAActiveState.hpp @@ -39,7 +39,7 @@ class RBAActiveState : public RBAContentOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; #endif diff --git a/src/core/expression/RBAAllocatedContent.cpp b/src/core/expression/RBAAllocatedContent.cpp index 923717d..8342827 100644 --- a/src/core/expression/RBAAllocatedContent.cpp +++ b/src/core/expression/RBAAllocatedContent.cpp @@ -20,7 +20,7 @@ #include "RBAAllocatedContent.hpp" #include "RBAAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAContentState.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" @@ -47,7 +47,7 @@ RBAAllocatedContent::getModelElementType() const const RBARuleObject* RBAAllocatedContent::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { const RBARuleObject* object {nullptr}; // return value const auto leftInfo = info->getChild(0U); diff --git a/src/core/expression/RBAAllocatedContent.hpp b/src/core/expression/RBAAllocatedContent.hpp index 6fb44e2..f40c8a8 100644 --- a/src/core/expression/RBAAllocatedContent.hpp +++ b/src/core/expression/RBAAllocatedContent.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAAllocatedContent : public RBAAllocatableOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAAndOperator.cpp b/src/core/expression/RBAAndOperator.cpp index 0f3a30d..08ff794 100644 --- a/src/core/expression/RBAAndOperator.cpp +++ b/src/core/expression/RBAAndOperator.cpp @@ -42,7 +42,7 @@ RBAAndOperator::getModelElementType() const bool RBAAndOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const + RBAArbitratorImpl * arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAAndOperator.hpp b/src/core/expression/RBAAndOperator.hpp index 229c69f..a5ff778 100644 --- a/src/core/expression/RBAAndOperator.hpp +++ b/src/core/expression/RBAAndOperator.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAAndOperator : public RBALogicalOperator public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAContentValue.cpp b/src/core/expression/RBAContentValue.cpp index 23b1b20..a1c6f2e 100644 --- a/src/core/expression/RBAContentValue.cpp +++ b/src/core/expression/RBAContentValue.cpp @@ -22,7 +22,7 @@ #include "RBAContentValue.hpp" #include "RBAAllocatable.hpp" #include "RBAContentState.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -48,7 +48,7 @@ RBAContentValue::getModelElementType() const } std::int32_t -RBAContentValue::getValueCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +RBAContentValue::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { std::int32_t result { -99 }; const auto leftInfo = info->getChild(0U); diff --git a/src/core/expression/RBAContentValue.hpp b/src/core/expression/RBAContentValue.hpp index 52bd841..4b31513 100644 --- a/src/core/expression/RBAContentValue.hpp +++ b/src/core/expression/RBAContentValue.hpp @@ -41,7 +41,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBAExistsOperator.cpp b/src/core/expression/RBAExistsOperator.cpp index 8bb8f05..48d1e4c 100644 --- a/src/core/expression/RBAExistsOperator.cpp +++ b/src/core/expression/RBAExistsOperator.cpp @@ -47,7 +47,7 @@ RBAExistsOperator::getModelElementType() const bool RBAExistsOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const + RBAArbitratorImpl * arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAExistsOperator.hpp b/src/core/expression/RBAExistsOperator.hpp index e75af32..86dce64 100644 --- a/src/core/expression/RBAExistsOperator.hpp +++ b/src/core/expression/RBAExistsOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAExpression.cpp b/src/core/expression/RBAExpression.cpp index 2b9b6fc..2ec0e39 100644 --- a/src/core/expression/RBAExpression.cpp +++ b/src/core/expression/RBAExpression.cpp @@ -41,7 +41,7 @@ RBAExpression::accept(RBAExpressionVisitor& visitor) } bool -RBAExpression::execute(RBAConstraintInfo* const info, RBAArbitrator * const arb) const +RBAExpression::execute(RBAConstraintInfo* const info, RBAArbitratorImpl * const arb) const { info->setExpression(this); for (RBALetStatement* const& letStatement : letStatements_) { @@ -57,7 +57,7 @@ RBAExpression::execute(RBAConstraintInfo* const info, RBAArbitrator * const arb) } bool -RBAExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBAExpression::executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { // This function is called when an Expression that does not define // getReferenceObject() in evaluate() is specified. @@ -67,7 +67,7 @@ RBAExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const const RBARuleObject* RBAExpression::getReferenceObject(RBAConstraintInfo* const info, - RBAArbitrator* const arb) const + RBAArbitratorImpl* const arb) const { info->setExpression(this); for (RBALetStatement* const& letStatement : letStatements_) { @@ -78,7 +78,7 @@ RBAExpression::getReferenceObject(RBAConstraintInfo* const info, const RBARuleObject* RBAExpression::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { // This function is called when an Expression that does not define // getReferenceObject() in evaluateObject() is specified. @@ -86,7 +86,7 @@ RBAExpression::getReferenceObjectCore(RBAConstraintInfo* info, } std::int32_t -RBAExpression::getValue(RBAConstraintInfo* const info, RBAArbitrator * const arb) const +RBAExpression::getValue(RBAConstraintInfo* const info, RBAArbitratorImpl * const arb) const { info->setExpression(this); for (RBALetStatement* const& letStatement : letStatements_) { @@ -101,7 +101,7 @@ RBAExpression::getLetStatements() const return letStatements_; } std::int32_t -RBAExpression::getValueCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBAExpression::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { // This function is called when an Expression that does not define // getValue() in evaluateValue() is specified. @@ -109,7 +109,7 @@ RBAExpression::getValueCore(RBAConstraintInfo* info, RBAArbitrator * arb) const } void -RBAExpression::doAction(RBAConstraintInfo* const info, RBAArbitrator* const arb) +RBAExpression::doAction(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb) { info->setExpression(this); doActionCore(info, arb); @@ -117,7 +117,7 @@ RBAExpression::doAction(RBAConstraintInfo* const info, RBAArbitrator* const arb) } void -RBAExpression::doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) +RBAExpression::doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) { // This function is called when an Expression that does not define // doAction() in evaluateDoAction() is specified. diff --git a/src/core/expression/RBAExpression.hpp b/src/core/expression/RBAExpression.hpp index 9cd14e5..de2a674 100644 --- a/src/core/expression/RBAExpression.hpp +++ b/src/core/expression/RBAExpression.hpp @@ -31,7 +31,7 @@ namespace rba class RBAExpressionVisitor; class RBALetStatement; -class RBAArbitrator; +class RBAArbitratorImpl; class RBARuleObject; class RBAConstraintInfo; #ifdef RBA_USE_LOG @@ -51,11 +51,11 @@ public: virtual ~RBAExpression()=default; void addLetStatement(RBALetStatement* const letStatement); virtual void accept(RBAExpressionVisitor& visitor); - bool execute(RBAConstraintInfo* const info, RBAArbitrator* const arb) const; + bool execute(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb) const; const RBARuleObject* getReferenceObject(RBAConstraintInfo* const info, - RBAArbitrator* const arb) const; - std::int32_t getValue(RBAConstraintInfo* const info, RBAArbitrator* const arb) const; - void doAction(RBAConstraintInfo* const info, RBAArbitrator* const arb); + RBAArbitratorImpl* const arb) const; + std::int32_t getValue(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb) const; + void doAction(RBAConstraintInfo* const info, RBAArbitratorImpl* const arb); const std::vector<RBALetStatement*>& getLetStatements() const; // Log @@ -67,12 +67,12 @@ public: #endif protected: - virtual bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const; + virtual bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const; virtual const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const; + RBAArbitratorImpl* arb) const; virtual std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const; - virtual void doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb); + RBAArbitratorImpl* arb) const; + virtual void doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb); private: #ifdef _MSC_VER diff --git a/src/core/expression/RBAForAllOperator.cpp b/src/core/expression/RBAForAllOperator.cpp index 93a2894..eca8cca 100644 --- a/src/core/expression/RBAForAllOperator.cpp +++ b/src/core/expression/RBAForAllOperator.cpp @@ -48,7 +48,7 @@ RBAForAllOperator::getModelElementType() const bool RBAForAllOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const + RBAArbitratorImpl * arb) const { const RBAExpression* const setObj {getLhsOperand()}; RBALambdaExpression* const lambda {getLambda()}; diff --git a/src/core/expression/RBAForAllOperator.hpp b/src/core/expression/RBAForAllOperator.hpp index 7c0c7cc..7442ab1 100644 --- a/src/core/expression/RBAForAllOperator.hpp +++ b/src/core/expression/RBAForAllOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAGetAllocatables.cpp b/src/core/expression/RBAGetAllocatables.cpp index 18d4cf4..912a26d 100644 --- a/src/core/expression/RBAGetAllocatables.cpp +++ b/src/core/expression/RBAGetAllocatables.cpp @@ -46,7 +46,7 @@ RBAGetAllocatables::getModelElementType() const const RBARuleObject* RBAGetAllocatables::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { RBAConstraintInfo* const leftInfo {info->getChild(0U)}; diff --git a/src/core/expression/RBAGetAllocatables.hpp b/src/core/expression/RBAGetAllocatables.hpp index d1c7167..982ef07 100644 --- a/src/core/expression/RBAGetAllocatables.hpp +++ b/src/core/expression/RBAGetAllocatables.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAGetContentsList.cpp b/src/core/expression/RBAGetContentsList.cpp index c106d5f..ac929af 100644 --- a/src/core/expression/RBAGetContentsList.cpp +++ b/src/core/expression/RBAGetContentsList.cpp @@ -45,7 +45,7 @@ RBAGetContentsList::getModelElementType() const const RBARuleObject* RBAGetContentsList::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { RBAConstraintInfo* const leftInfo {info->getChild(0U)}; diff --git a/src/core/expression/RBAGetContentsList.hpp b/src/core/expression/RBAGetContentsList.hpp index 240a50c..6f89177 100644 --- a/src/core/expression/RBAGetContentsList.hpp +++ b/src/core/expression/RBAGetContentsList.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAGetProperty.cpp b/src/core/expression/RBAGetProperty.cpp index 3a774d8..cee2236 100644 --- a/src/core/expression/RBAGetProperty.cpp +++ b/src/core/expression/RBAGetProperty.cpp @@ -21,7 +21,7 @@ #include "RBAGetProperty.hpp" #include "RBAExpressionVisitor.hpp" #include "RBASceneImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBALogManager.hpp" #include "RBAExpressionType.hpp" #include "RBAModelElementType.hpp" @@ -47,7 +47,7 @@ RBAGetProperty::getModelElementType() const std::int32_t RBAGetProperty::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { std::int32_t value{0}; const RBAAbstractProperty* prop{nullptr}; diff --git a/src/core/expression/RBAGetProperty.hpp b/src/core/expression/RBAGetProperty.hpp index eff3852..299dd4d 100644 --- a/src/core/expression/RBAGetProperty.hpp +++ b/src/core/expression/RBAGetProperty.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const override; + RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAHasBeenDisplayed.cpp b/src/core/expression/RBAHasBeenDisplayed.cpp index 72c1d40..f9a603f 100644 --- a/src/core/expression/RBAHasBeenDisplayed.cpp +++ b/src/core/expression/RBAHasBeenDisplayed.cpp @@ -21,7 +21,7 @@ #include "RBAHasBeenDisplayed.hpp" #include "RBAModelElementType.hpp" #include "RBAExpressionType.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAExpressionVisitor.hpp" @@ -41,7 +41,7 @@ RBAModelElementType RBAHasBeenDisplayed::getModelElementType() const } bool RBAHasBeenDisplayed::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAHasBeenDisplayed.hpp b/src/core/expression/RBAHasBeenDisplayed.hpp index 3e3ebde..5d5a1c3 100644 --- a/src/core/expression/RBAHasBeenDisplayed.hpp +++ b/src/core/expression/RBAHasBeenDisplayed.hpp @@ -38,7 +38,7 @@ class DLL_EXPORT RBAHasBeenDisplayed : public RBAContentOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAHasComeEarlierThan.cpp b/src/core/expression/RBAHasComeEarlierThan.cpp index ae15a2c..5e20ab4 100644 --- a/src/core/expression/RBAHasComeEarlierThan.cpp +++ b/src/core/expression/RBAHasComeEarlierThan.cpp @@ -20,7 +20,7 @@ #include "RBAHasComeEarlierThan.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -43,7 +43,7 @@ void RBAHasComeEarlierThan::accept(RBAExpressionVisitor& visitor) bool RBAHasComeEarlierThan::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAHasComeEarlierThan.hpp b/src/core/expression/RBAHasComeEarlierThan.hpp index fd39782..b9c0bef 100644 --- a/src/core/expression/RBAHasComeEarlierThan.hpp +++ b/src/core/expression/RBAHasComeEarlierThan.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAHasComeLaterThan.cpp b/src/core/expression/RBAHasComeLaterThan.cpp index 341d164..cddc067 100644 --- a/src/core/expression/RBAHasComeLaterThan.cpp +++ b/src/core/expression/RBAHasComeLaterThan.cpp @@ -21,7 +21,7 @@ #include "RBAHasComeLaterThan.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -44,7 +44,7 @@ RBAHasComeLaterThan::getModelElementType() const bool RBAHasComeLaterThan::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { // Add itself to the constraint hierarchy for coverage LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAHasComeLaterThan.hpp b/src/core/expression/RBAHasComeLaterThan.hpp index 659068f..9a9cc2e 100644 --- a/src/core/expression/RBAHasComeLaterThan.hpp +++ b/src/core/expression/RBAHasComeLaterThan.hpp @@ -38,7 +38,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIfStatement.cpp b/src/core/expression/RBAIfStatement.cpp index d776bf7..3f0666d 100644 --- a/src/core/expression/RBAIfStatement.cpp +++ b/src/core/expression/RBAIfStatement.cpp @@ -78,7 +78,7 @@ RBAIfStatement::getModelElementType() const bool RBAIfStatement::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy("IF"); bool isPassed; @@ -116,7 +116,7 @@ RBAIfStatement::executeCore(RBAConstraintInfo* info, const RBARuleObject* RBAIfStatement::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy("IF"); const RBARuleObject* object {nullptr}; @@ -144,7 +144,7 @@ RBAIfStatement::getReferenceObjectCore(RBAConstraintInfo* info, std::int32_t RBAIfStatement::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy("IF"); std::int32_t value; @@ -172,7 +172,7 @@ RBAIfStatement::getValueCore(RBAConstraintInfo* info, void RBAIfStatement::doActionCore(RBAConstraintInfo* info, - RBAArbitrator* arb) + RBAArbitratorImpl* arb) { LOG_addHierarchy("IF"); RBAConstraintInfo* const leftInfo {info->getChild(0U)}; diff --git a/src/core/expression/RBAIfStatement.hpp b/src/core/expression/RBAIfStatement.hpp index 7059583..90659fe 100644 --- a/src/core/expression/RBAIfStatement.hpp +++ b/src/core/expression/RBAIfStatement.hpp @@ -46,12 +46,12 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; - void doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) override; + RBAArbitratorImpl* arb) const override; + void doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAImpliesOperator.cpp b/src/core/expression/RBAImpliesOperator.cpp index ab95dc7..1dd6170 100644 --- a/src/core/expression/RBAImpliesOperator.cpp +++ b/src/core/expression/RBAImpliesOperator.cpp @@ -41,7 +41,7 @@ RBAImpliesOperator::getModelElementType() const bool RBAImpliesOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/core/expression/RBAImpliesOperator.hpp b/src/core/expression/RBAImpliesOperator.hpp index cc1cb33..9d9bbee 100644 --- a/src/core/expression/RBAImpliesOperator.hpp +++ b/src/core/expression/RBAImpliesOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIntegerValue.cpp b/src/core/expression/RBAIntegerValue.cpp index aadffb0..c88bfc1 100644 --- a/src/core/expression/RBAIntegerValue.cpp +++ b/src/core/expression/RBAIntegerValue.cpp @@ -44,7 +44,7 @@ RBAIntegerValue::getModelElementType() const } std::int32_t -RBAIntegerValue::getValueCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBAIntegerValue::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { return getValue(); } diff --git a/src/core/expression/RBAIntegerValue.hpp b/src/core/expression/RBAIntegerValue.hpp index 44cf8cb..236c97d 100644 --- a/src/core/expression/RBAIntegerValue.hpp +++ b/src/core/expression/RBAIntegerValue.hpp @@ -42,7 +42,7 @@ public: std::int32_t getValue() const; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator * arb) const override; + RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsActive.cpp b/src/core/expression/RBAIsActive.cpp index a89745f..2c9d846 100644 --- a/src/core/expression/RBAIsActive.cpp +++ b/src/core/expression/RBAIsActive.cpp @@ -20,7 +20,7 @@ #include "RBAIsActive.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -43,7 +43,7 @@ RBAIsActive::getModelElementType() const bool RBAIsActive::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsActive.hpp b/src/core/expression/RBAIsActive.hpp index 73ab055..fa1394d 100644 --- a/src/core/expression/RBAIsActive.hpp +++ b/src/core/expression/RBAIsActive.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsEqualToOperator.cpp b/src/core/expression/RBAIsEqualToOperator.cpp index 5dfa929..a38eb23 100644 --- a/src/core/expression/RBAIsEqualToOperator.cpp +++ b/src/core/expression/RBAIsEqualToOperator.cpp @@ -17,7 +17,7 @@ /// IsEqualToOperator class definitino file #include "RBAIsEqualToOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsEqualToOperator::getModelElementType() const bool RBAIsEqualToOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsEqualToOperator.hpp b/src/core/expression/RBAIsEqualToOperator.hpp index d66efed..0c9e9fb 100644 --- a/src/core/expression/RBAIsEqualToOperator.hpp +++ b/src/core/expression/RBAIsEqualToOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsGreaterThanEqualOperator.cpp b/src/core/expression/RBAIsGreaterThanEqualOperator.cpp index 368bb3b..633c61e 100644 --- a/src/core/expression/RBAIsGreaterThanEqualOperator.cpp +++ b/src/core/expression/RBAIsGreaterThanEqualOperator.cpp @@ -17,7 +17,7 @@ /// IsGreaterThanEqualOperator class definition file #include "RBAIsGreaterThanEqualOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsGreaterThanEqualOperator::getModelElementType() const bool RBAIsGreaterThanEqualOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsGreaterThanEqualOperator.hpp b/src/core/expression/RBAIsGreaterThanEqualOperator.hpp index 0d5db61..5181c9f 100644 --- a/src/core/expression/RBAIsGreaterThanEqualOperator.hpp +++ b/src/core/expression/RBAIsGreaterThanEqualOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsGreaterThanOperator.cpp b/src/core/expression/RBAIsGreaterThanOperator.cpp index d9153f1..323ac36 100644 --- a/src/core/expression/RBAIsGreaterThanOperator.cpp +++ b/src/core/expression/RBAIsGreaterThanOperator.cpp @@ -17,7 +17,7 @@ /// IsGreaterThanOperator class definition file #include "RBAIsGreaterThanOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsGreaterThanOperator::accept(RBAExpressionVisitor& visitor) bool RBAIsGreaterThanOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsGreaterThanOperator.hpp b/src/core/expression/RBAIsGreaterThanOperator.hpp index 9e0938b..327152b 100644 --- a/src/core/expression/RBAIsGreaterThanOperator.hpp +++ b/src/core/expression/RBAIsGreaterThanOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsLowerThanEqualOperator.cpp b/src/core/expression/RBAIsLowerThanEqualOperator.cpp index 811b34d..cdebf8f 100644 --- a/src/core/expression/RBAIsLowerThanEqualOperator.cpp +++ b/src/core/expression/RBAIsLowerThanEqualOperator.cpp @@ -17,7 +17,7 @@ /// IsLowerThanEqualOperator class definition file #include "RBAIsLowerThanEqualOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAConstraintInfo.hpp" @@ -41,7 +41,7 @@ RBAIsLowerThanEqualOperator::getModelElementType() const bool RBAIsLowerThanEqualOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsLowerThanEqualOperator.hpp b/src/core/expression/RBAIsLowerThanEqualOperator.hpp index 3459110..3830b00 100644 --- a/src/core/expression/RBAIsLowerThanEqualOperator.hpp +++ b/src/core/expression/RBAIsLowerThanEqualOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsLowerThanOperator.cpp b/src/core/expression/RBAIsLowerThanOperator.cpp index 99a7860..6b79b3c 100644 --- a/src/core/expression/RBAIsLowerThanOperator.cpp +++ b/src/core/expression/RBAIsLowerThanOperator.cpp @@ -17,7 +17,7 @@ /// IsLowerThanOperator class definition file #include "RBAIsLowerThanOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALogManager.hpp" #include "RBAModelElementType.hpp" @@ -41,7 +41,7 @@ RBAIsLowerThanOperator::getModelElementType() const bool RBAIsLowerThanOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsLowerThanOperator.hpp b/src/core/expression/RBAIsLowerThanOperator.hpp index 3a23e45..eb1d30c 100644 --- a/src/core/expression/RBAIsLowerThanOperator.hpp +++ b/src/core/expression/RBAIsLowerThanOperator.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsOn.cpp b/src/core/expression/RBAIsOn.cpp index af60c20..004dc98 100644 --- a/src/core/expression/RBAIsOn.cpp +++ b/src/core/expression/RBAIsOn.cpp @@ -19,7 +19,7 @@ */ #include "RBAIsOn.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAExpressionVisitor.hpp" #include "RBASceneImpl.hpp" @@ -44,7 +44,7 @@ RBAIsOn::getModelElementType() const bool RBAIsOn::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAIsOn.hpp b/src/core/expression/RBAIsOn.hpp index 9f3f778..d1f9de9 100644 --- a/src/core/expression/RBAIsOn.hpp +++ b/src/core/expression/RBAIsOn.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAIsTypeOfOperator.cpp b/src/core/expression/RBAIsTypeOfOperator.cpp index 7520f26..06b1f83 100644 --- a/src/core/expression/RBAIsTypeOfOperator.cpp +++ b/src/core/expression/RBAIsTypeOfOperator.cpp @@ -42,7 +42,7 @@ RBAModelElementType RBAIsTypeOfOperator::getModelElementType() const { return RBAModelElementType::IsTypeOfOperator; } -bool RBAIsTypeOfOperator::executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +bool RBAIsTypeOfOperator::executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { bool isPassed {false}; LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/core/expression/RBAIsTypeOfOperator.hpp b/src/core/expression/RBAIsTypeOfOperator.hpp index e91c8e0..c3b8364 100644 --- a/src/core/expression/RBAIsTypeOfOperator.hpp +++ b/src/core/expression/RBAIsTypeOfOperator.hpp @@ -40,7 +40,7 @@ class DLL_EXPORT RBAIsTypeOfOperator : public RBAOperator void setTag(const std::string& tag); void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBALambdaContext.cpp b/src/core/expression/RBALambdaContext.cpp index 7d68513..fe10e4c 100644 --- a/src/core/expression/RBALambdaContext.cpp +++ b/src/core/expression/RBALambdaContext.cpp @@ -56,7 +56,7 @@ RBALambdaContext::createHierarchy() RBAConstraintInfo dummyInfo; // Since it is not referenced by "AllInstanceOf..." or "SetOfOperator" // used for the set of "For-All" or "Exists", nullptr is no problem - RBAArbitrator* dummyArb = nullptr; + RBAArbitratorImpl* dummyArb = nullptr; const RBARuleObject* objset = setObj->getReferenceObject(&dummyInfo, dummyArb); std::vector<const RBARuleObject*> objs; if(objset) { diff --git a/src/core/expression/RBALambdaExpression.cpp b/src/core/expression/RBALambdaExpression.cpp index 7638faa..df1aad4 100644 --- a/src/core/expression/RBALambdaExpression.cpp +++ b/src/core/expression/RBALambdaExpression.cpp @@ -20,7 +20,7 @@ #include "RBALambdaExpression.hpp" #include "RBAVariable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAModelElementType.hpp" @@ -58,7 +58,7 @@ RBALambdaExpression::getModelElementType() const } bool -RBALambdaExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const +RBALambdaExpression::executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const { getX()->setRuleObj(ruleObj_); @@ -74,7 +74,7 @@ RBALambdaExpression::executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) c const RBARuleObject* RBALambdaExpression::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { getX()->setRuleObj(ruleObj_); @@ -88,7 +88,7 @@ RBALambdaExpression::getReferenceObjectCore(RBAConstraintInfo* info, } std::int32_t RBALambdaExpression::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { getX()->setRuleObj(ruleObj_); diff --git a/src/core/expression/RBALambdaExpression.hpp b/src/core/expression/RBALambdaExpression.hpp index 76958e7..fea5604 100644 --- a/src/core/expression/RBALambdaExpression.hpp +++ b/src/core/expression/RBALambdaExpression.hpp @@ -26,7 +26,7 @@ namespace rba { -class RBAArbitrator; +class RBAArbitratorImpl; class RBAConstraintInfo; class RBAVariable; class RBARuleObject; @@ -48,11 +48,11 @@ public: RBAExpression* const getBodyText() const; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setRuleObj(const RBARuleObject* const ruleObj); void clearRuleObj(); diff --git a/src/core/expression/RBALetStatement.cpp b/src/core/expression/RBALetStatement.cpp index f64cc18..4c6d0cb 100644 --- a/src/core/expression/RBALetStatement.cpp +++ b/src/core/expression/RBALetStatement.cpp @@ -44,7 +44,7 @@ RBALetStatement::accept(RBAExpressionVisitor& visitor) visitor.visit(*this); } -void RBALetStatement::setVariable(RBAArbitrator* const arb) +void RBALetStatement::setVariable(RBAArbitratorImpl* const arb) { RBAConstraintInfo* const info {variable_->createConstraintInfo()}; variable_->setRuleObj(getLhsOperand()->getReferenceObject(info, arb)); diff --git a/src/core/expression/RBALetStatement.hpp b/src/core/expression/RBALetStatement.hpp index 636b07d..7c4055f 100644 --- a/src/core/expression/RBALetStatement.hpp +++ b/src/core/expression/RBALetStatement.hpp @@ -42,7 +42,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; void setVariable(RBAVariable* const var); - void setVariable(RBAArbitrator* const arb); + void setVariable(RBAArbitratorImpl* const arb); private: RBAVariable* variable_; diff --git a/src/core/expression/RBAMaxOperator.cpp b/src/core/expression/RBAMaxOperator.cpp index 46d5ed1..08f56f4 100644 --- a/src/core/expression/RBAMaxOperator.cpp +++ b/src/core/expression/RBAMaxOperator.cpp @@ -21,7 +21,7 @@ #include "RBAMaxOperator.hpp" #include "RBAAllocatable.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBALogManager.hpp" #include "RBAConstraintInfo.hpp" #include "RBAExpressionVisitor.hpp" @@ -44,7 +44,7 @@ RBAMaxOperator::getModelElementType() const } const RBARuleObject* RBAMaxOperator::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAMaxOperator.hpp b/src/core/expression/RBAMaxOperator.hpp index 046cec9..c32c894 100644 --- a/src/core/expression/RBAMaxOperator.hpp +++ b/src/core/expression/RBAMaxOperator.hpp @@ -39,7 +39,7 @@ class RBAMaxOperator : public RBALambdaContext void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBAMinOperator.cpp b/src/core/expression/RBAMinOperator.cpp index 923088b..09ebfa2 100644 --- a/src/core/expression/RBAMinOperator.cpp +++ b/src/core/expression/RBAMinOperator.cpp @@ -19,7 +19,7 @@ #include "RBAMinOperator.hpp" #include "RBAAllocatable.hpp" #include "RBAContent.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAExpressionVisitor.hpp" #include "RBALambdaExpression.hpp" @@ -42,7 +42,7 @@ RBAMinOperator::getModelElementType() const } const RBARuleObject* RBAMinOperator::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBAMinOperator.hpp b/src/core/expression/RBAMinOperator.hpp index b128877..4df1749 100644 --- a/src/core/expression/RBAMinOperator.hpp +++ b/src/core/expression/RBAMinOperator.hpp @@ -37,7 +37,7 @@ class RBAMinOperator : public RBALambdaContext void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBANotOperator.cpp b/src/core/expression/RBANotOperator.cpp index afcf3c8..73f6c0e 100644 --- a/src/core/expression/RBANotOperator.cpp +++ b/src/core/expression/RBANotOperator.cpp @@ -41,7 +41,7 @@ RBANotOperator::getModelElementType() const bool RBANotOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBANotOperator.hpp b/src/core/expression/RBANotOperator.hpp index 4af1461..efaba2e 100644 --- a/src/core/expression/RBANotOperator.hpp +++ b/src/core/expression/RBANotOperator.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAObjectCompare.cpp b/src/core/expression/RBAObjectCompare.cpp index 5ed900c..f9aa283 100644 --- a/src/core/expression/RBAObjectCompare.cpp +++ b/src/core/expression/RBAObjectCompare.cpp @@ -43,7 +43,7 @@ RBAObjectCompare::getModelElementType() const bool RBAObjectCompare::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAObjectCompare.hpp b/src/core/expression/RBAObjectCompare.hpp index c7c345d..160eca8 100644 --- a/src/core/expression/RBAObjectCompare.hpp +++ b/src/core/expression/RBAObjectCompare.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAObjectReference.cpp b/src/core/expression/RBAObjectReference.cpp index aefe83c..18df1e9 100644 --- a/src/core/expression/RBAObjectReference.cpp +++ b/src/core/expression/RBAObjectReference.cpp @@ -43,7 +43,7 @@ RBAObjectReference::getModelElementType() const const RBARuleObject* RBAObjectReference::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { const RBARuleObject* obj {refObject_}; if (obj->isModelElementType(RBAModelElementType::Variable)) { diff --git a/src/core/expression/RBAObjectReference.hpp b/src/core/expression/RBAObjectReference.hpp index 2eb38df..79c84d3 100644 --- a/src/core/expression/RBAObjectReference.hpp +++ b/src/core/expression/RBAObjectReference.hpp @@ -38,7 +38,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setRefObject(const RBARuleObject* const newRefObject); // Log diff --git a/src/core/expression/RBAOrOperator.cpp b/src/core/expression/RBAOrOperator.cpp index d55e4a0..5f105be 100644 --- a/src/core/expression/RBAOrOperator.cpp +++ b/src/core/expression/RBAOrOperator.cpp @@ -41,7 +41,7 @@ RBAOrOperator::getModelElementType() const bool RBAOrOperator::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to Constraint hierarchy for coverage diff --git a/src/core/expression/RBAOrOperator.hpp b/src/core/expression/RBAOrOperator.hpp index a52aca4..c6a59e3 100644 --- a/src/core/expression/RBAOrOperator.hpp +++ b/src/core/expression/RBAOrOperator.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAOrOperator : public RBALogicalOperator public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBAPreviousModifier.cpp b/src/core/expression/RBAPreviousModifier.cpp index 53a7112..05bd457 100644 --- a/src/core/expression/RBAPreviousModifier.cpp +++ b/src/core/expression/RBAPreviousModifier.cpp @@ -55,7 +55,7 @@ RBAPreviousModifier::getObjReference() const const RBARuleObject* RBAPreviousModifier::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { previousObj_->setRefObject(objReference_->getReferenceObject(info, arb)); return previousObj_.get(); diff --git a/src/core/expression/RBAPreviousModifier.hpp b/src/core/expression/RBAPreviousModifier.hpp index ff34deb..e9dd0c2 100644 --- a/src/core/expression/RBAPreviousModifier.hpp +++ b/src/core/expression/RBAPreviousModifier.hpp @@ -44,7 +44,7 @@ public: void setObjReference(RBAExpression* const newObjRef); RBAExpression* const getObjReference() const; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/expression/RBASelectOperator.cpp b/src/core/expression/RBASelectOperator.cpp index be74fa5..cdd345f 100644 --- a/src/core/expression/RBASelectOperator.cpp +++ b/src/core/expression/RBASelectOperator.cpp @@ -53,7 +53,7 @@ RBASelectOperator::getModelElementType() const } const RBARuleObject* RBASelectOperator::getReferenceObjectCore( - RBAConstraintInfo* info, RBAArbitrator* arb) const + RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); const RBARuleObject* returnObj {nullptr}; diff --git a/src/core/expression/RBASelectOperator.hpp b/src/core/expression/RBASelectOperator.hpp index 9c85fb0..0166bb7 100644 --- a/src/core/expression/RBASelectOperator.hpp +++ b/src/core/expression/RBASelectOperator.hpp @@ -42,7 +42,7 @@ class RBASelectOperator : public RBALambdaContext void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; diff --git a/src/core/expression/RBASetOfOperator.cpp b/src/core/expression/RBASetOfOperator.cpp index 03e82eb..8bf7e82 100644 --- a/src/core/expression/RBASetOfOperator.cpp +++ b/src/core/expression/RBASetOfOperator.cpp @@ -54,7 +54,7 @@ RBASetOfOperator::getModelElementType() const const RBARuleObject* RBASetOfOperator::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { allocatableSet_->clear(); contentSet_->clear(); @@ -105,7 +105,7 @@ RBASetOfOperator::getReferenceObjectCore(RBAConstraintInfo* info, } void -RBASetOfOperator::doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) +RBASetOfOperator::doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) { // Add itself to Constraint hierarchy for coverage LOG_addHierarchy("SetOf"); diff --git a/src/core/expression/RBASetOfOperator.hpp b/src/core/expression/RBASetOfOperator.hpp index d73e1f7..967d583 100644 --- a/src/core/expression/RBASetOfOperator.hpp +++ b/src/core/expression/RBASetOfOperator.hpp @@ -52,8 +52,8 @@ public: protected: const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; - void doActionCore(RBAConstraintInfo* info, RBAArbitrator* arb) override; + RBAArbitratorImpl* arb) const override; + void doActionCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) override; private: #ifdef _MSC_VER diff --git a/src/core/expression/RBASizeOperator.cpp b/src/core/expression/RBASizeOperator.cpp index c928bcf..4b65057 100644 --- a/src/core/expression/RBASizeOperator.cpp +++ b/src/core/expression/RBASizeOperator.cpp @@ -38,7 +38,7 @@ RBAModelElementType RBASizeOperator::getModelElementType() const return RBAModelElementType::SizeOperator; } std::int32_t RBASizeOperator::getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { LOG_addHierarchy(LOG_getSymbol()); std::int32_t returnValue {-99}; diff --git a/src/core/expression/RBASizeOperator.hpp b/src/core/expression/RBASizeOperator.hpp index 26f22fa..af8e8f4 100644 --- a/src/core/expression/RBASizeOperator.hpp +++ b/src/core/expression/RBASizeOperator.hpp @@ -38,7 +38,7 @@ class RBASizeOperator : public RBASetOperator void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - std::int32_t getValueCore(RBAConstraintInfo* info, RBAArbitrator* arb) const override; + std::int32_t getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const override; #ifdef RBA_USE_LOG const std::string getSymbol() const override; const std::string getExpressionText() const override; diff --git a/src/core/expression/RBAStateValue.cpp b/src/core/expression/RBAStateValue.cpp index 77d14b5..a143e50 100644 --- a/src/core/expression/RBAStateValue.cpp +++ b/src/core/expression/RBAStateValue.cpp @@ -18,7 +18,7 @@ #include <string> #include "RBAStateValue.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAContentState.hpp" @@ -45,7 +45,7 @@ RBAStateValue::getModelElementType() const } std::int32_t -RBAStateValue::getValueCore(RBAConstraintInfo* info, RBAArbitrator* arb) const +RBAStateValue::getValueCore(RBAConstraintInfo* info, RBAArbitratorImpl* arb) const { std::int32_t result { -99 }; const auto leftInfo = info->getChild(0U); diff --git a/src/core/expression/RBAStateValue.hpp b/src/core/expression/RBAStateValue.hpp index 52cf8fc..0cb96c3 100644 --- a/src/core/expression/RBAStateValue.hpp +++ b/src/core/expression/RBAStateValue.hpp @@ -39,7 +39,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; std::int32_t getValueCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/core/logic/RBAArbitrator.cpp b/src/core/logic/RBAArbitrator.cpp index 74db3aa..e9fe59a 100644 --- a/src/core/logic/RBAArbitrator.cpp +++ b/src/core/logic/RBAArbitrator.cpp @@ -18,39 +18,24 @@ * Arbitrator class definition */ -#include <algorithm> -#include <sstream> #include "RBAArbitrator.hpp" #include "RBAModelImpl.hpp" #include "RBAResult.hpp" -#include "RBAResultSet.hpp" -#include "RBAAffectInfo.hpp" -#include "RBAConstraintImpl.hpp" -#include "RBAViewAction.hpp" -#include "RBAViewTransition.hpp" -#include "RBAViewMove.hpp" -#include "RBARollbacker.hpp" -#include "RBALogManager.hpp" -#include "RBAModelElementType.hpp" +#include "RBAArbitratorImpl.hpp" namespace rba { RBAArbitrator::RBAArbitrator(RBAModel* newModel) + : impl_{std::make_unique<RBAArbitrator::Impl>(this, + dynamic_cast<RBAModelImpl*>(newModel))} { - setModel(newModel); } #ifdef RBA_USE_LOG RBAArbitrator::RBAArbitrator(RBAModel* newModel, RBALogManager* logManager) + : impl_(std::make_unique<RBAArbitrator::Impl>(this, + dynamic_cast<RBAModelImpl*>(newModel), logManager)) { - setModel(newModel); - RBALogManager::setLogManager(logManager); - // Even if the argument logManager is null, it may be setLogManager() - // from outside the rba, so it is determined by getLogManager() instead of - // the argument determination. - if (RBALogManager::getLogManager() != nullptr) { - setSimulationMode(true); - } } #endif @@ -61,1927 +46,102 @@ RBAArbitrator::~RBAArbitrator() noexcept void RBAArbitrator::setModel(RBAModel* newModel) { - setModel(dynamic_cast<RBAModelImpl*>(newModel)); + impl_->setModel(dynamic_cast<RBAModelImpl*>(newModel)); } const RBAModel* RBAArbitrator::getModel() const { - return dynamic_cast<RBAModel*>(model_); + return impl_->getModel(); } void RBAArbitrator::initialize(std::list<std::string>& contexts) { - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - setRequestData(contexts, true); + impl_->initialize(contexts); } std::unique_ptr<RBAResult> RBAArbitrator::execute(const std::string& contextName, bool require) { - const std::lock_guard<std::recursive_mutex> lock {getMutex()}; - if (isValidContext(contextName) == false) { - // In case of error, creates a copy of "Result", - // sets the error flag in it and returns - std::unique_ptr<RBAResultImpl> result {std::make_unique<RBAResultImpl>( - this, std::make_unique<RBAResultSet>(*getBackupResultSet()))}; - result->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); - return std::move(result); - } else { - static_cast<void>(setRequestData(contextName, require, nullptr, - static_cast<std::uint32_t>(getRequestQue().size()))); - return arbitrateMain(); - } + return impl_->execute(contextName, require); } std::unique_ptr<RBAResult> RBAArbitrator::execute(std::list<std::string>& contexts, bool require) { - const std::lock_guard<std::recursive_mutex> lock {getMutex()}; - if (isValidContext(contexts) == false) { - // In case of error, creates a copy of "Result", - // sets the error flag in it and returns - std::unique_ptr<RBAResultImpl> result {std::make_unique<RBAResultImpl>( - this, std::make_unique<RBAResultSet>(*getBackupResultSet()))}; - result->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); - return std::move(result); - } else { - setRequestData(contexts, require); - return arbitrateMain(); - } + return impl_->execute(contexts, require); } std::unique_ptr<RBAResult> RBAArbitrator::execute(const std::string& sceneName, std::list<std::pair<std::string,std::int32_t>>& properties) { - const std::lock_guard<std::recursive_mutex> lock {getMutex()}; - // Check argument - if (isValidContext(sceneName) == false) { - // In case of error, creates a copy of "Result", - // sets the error flag in it and returns - std::unique_ptr<RBAResultImpl> result {std::make_unique<RBAResultImpl>( - this, std::make_unique<RBAResultSet>(*getBackupResultSet()))}; - result->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); - return std::move(result); - } else { - static_cast<void>(setRequestData(sceneName, true, &properties, - static_cast<std::uint32_t>(getRequestQue().size()))); - return arbitrateMain(); - } + return impl_->execute(sceneName, properties); } std::unique_ptr<RBAResult> RBAArbitrator::setResultContentState(const std::string& allocatableName, const std::string& contextName) { - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - RBAResultSet* const backupResultSetTmp {getBackupResultSet().get()}; - if (getReservedResultSet() == nullptr) { - setResult(std::make_unique<RBAResultImpl>(this, - std::make_unique<RBAResultSet>(), - std::move(getBackupResultSet()))); - } else { - RBAResultSet* const reservedResultSetTmp {getReservedResultSet().get()}; - setResult(std::make_unique<RBAResultImpl>(this, - std::move(getReservedResultSet()), - std::move(getBackupResultSet()))); - setReservedResultSet(std::make_unique<RBAResultSet>(*reservedResultSetTmp)); - } - setBackupResultSet(std::make_unique<RBAResultSet>(*backupResultSetTmp)); - - // find allocatable - const RBAAllocatable* alloc {nullptr}; - const RBAAreaImpl* const area {model_->findAreaImpl(allocatableName)}; - if(area != nullptr) { - alloc = area; - } - else { - const RBAZoneImpl* const zone {model_->findZoneImpl(allocatableName)}; - if(zone != nullptr) { - alloc = zone; - } - } - // find content state - const RBAContentState* state {nullptr}; - const RBAViewContentStateImpl* const viewState - {model_->findViewContentStateImpl(contextName)}; - if(viewState != nullptr) { - state = viewState; - } - else { - const RBASoundContentStateImpl* const soundState - {model_->findSoundContentStateImpl(contextName)}; - if(soundState != nullptr) { - state = soundState; - } - } - if( (alloc == nullptr) || (state == nullptr) ) { - // Unknown context or allocatable - getResult()->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); - return std::move(getResultRef()); - } - // Set alloc and state to result - const RBAContentState* const beforeContentState {alloc->getState()}; - const_cast<RBAAllocatable*>(alloc)->setState(state); - const_cast<RBAAllocatable*>(alloc)->setChecked(true); - getResult()->setActive(state, true); - getResult()->setContentState(alloc, state); - - // ---------------------------------------------------------- - // Post processing of Arbitration - // ---------------------------------------------------------- - postArbitrate(); - - // Excecute offline constraint -#ifdef RBA_USE_LOG - checkAllConstraints(); -#endif - - // ---------------------------------------------------------- - // Update the state of Content - // ---------------------------------------------------------- - if (beforeContentState != nullptr) { - // Update the state of the Content originally assigned to - // the requested Allocatable - dynamic_cast<RBAContent*>(beforeContentState->getOwner())->updateStatus(getResultRef().get()); - } - // Update the state of requested Content - dynamic_cast<RBAContent*>(state->getOwner())->updateStatus(getResultRef().get()); - - // Cancel processing of Content - checkCancelContent(); - - // Update display and non-display Area - updateResult(); - - // Generate Result - createResultData(); - - // Store backup of current arbitration result set - setBackupResultSet(getResult()->createBackupCurrentResultSet()); - // Create next arbitration result set - setNextResultSet(getResult()->createNextCurrentResultSet()); - - return std::move(getResultRef()); + return impl_->setResultContentState(allocatableName, contextName); } std::unique_ptr<RBAResult> RBAArbitrator::cancelArbitration() { - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - if(getReservedResultSet() == nullptr) { - std::unique_ptr<RBAResultImpl> res - {std::make_unique<RBAResultImpl>(this, - std::make_unique<RBAResultSet>())}; - res->setStatusType(RBAResultStatusType::CANCEL_ERROR); - return std::move(res); - } - - setResult( - std::make_unique<RBAResultImpl>(this, - std::make_unique<RBAResultSet>(), - std::move(getReservedResultSet()))); - setBackupResultSet(getResult()->createBackupCurrentResultSet()); - setNextResultSet(getResult()->createNextCurrentResultSet()); - - return std::move(getResultRef()); + return impl_->cancelArbitration(); } void RBAArbitrator::clearArbitration() { - std::lock_guard<std::recursive_mutex> lock {getMutex()}; - getCancelChecked().clear(); - setReservedResultSet(nullptr); - setBackupResultSet(std::make_unique<RBAResultSet>()); - for(const auto& scene : model_->getSceneImpls()) { - for(const std::string propertyName : scene->getPropertyNames()) { - const std::int32_t value {scene->getPropertyValue(propertyName)}; - getBackupResultSet()->setSceneProperty(scene, propertyName, value); - } - } - setNextResultSet( - std::make_unique<RBAResultSet>(*getBackupResultSet().get())); - setResult(std::make_unique<RBAResultImpl>( - this, - std::make_unique<RBAResultSet>(*getBackupResultSet().get()))); - - model_->clearElementsStatus(); + return impl_->clearArbitration(); } bool RBAArbitrator::setScene(const std::string& sceneName, bool require, std::list<std::pair<std::string, std::int32_t>>& properties) { - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - return setRequestData(sceneName, require, &properties); + return impl_->setScene(sceneName, require, properties); } bool RBAArbitrator::setContentState(const std::string& contextName, bool require) { - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - const std::deque<std::unique_ptr<RBARequestQueMember>>& requestQue{getRequestQue()}; - std::uint32_t syncIndex{static_cast<std::uint32_t>(requestQue.size())}; - if (syncIndex > 0U ) { - const std::unique_ptr<RBARequestQueMember>& prevReq{requestQue.back()}; - if (prevReq->isOn() == require) { - syncIndex = prevReq->getSyncIndex(); - } - } - return setRequestData(contextName, require, nullptr, syncIndex); + return impl_->setContentState(contextName, require); } bool RBAArbitrator::setAllocatableResult(const std::string& allocatableName, const std::string& contextName) { - std::lock_guard<std::recursive_mutex> lock {getMutex()}; - // Get allocatable - const auto alloc = model_->findAllocatable(allocatableName); - if(alloc == nullptr) { - return false; - } - - // Get context - const auto state = model_->findContentState(contextName); - if(state == nullptr) { - return false; - } - - // Set state to allocatable - const auto beforeContentState = alloc->getState(); - const_cast<RBAAllocatable*>(alloc)->setState(state); - RBAResultSet* const nextResultSet {getNextResultSet().get()}; - RBAResultSet* const prevResultSet {getBackupResultSet().get()}; - nextResultSet->setContentState(alloc, state); - prevResultSet->setContentState(alloc, state); - nextResultSet->setActive(state, true); - prevResultSet->setActive(state, true); - - // ---------------------------------------------------------- - // Update the state of Content - // ---------------------------------------------------------- - // Create "result" and update state, because updating the content state - // determines the transition destination this time - // based on previous state. - setResult(std::make_unique<RBAResultImpl>( - this, - std::make_unique<RBAResultSet>(*getBackupResultSet()), - std::make_unique<RBAResultSet>(*getNextResultSet()))); - RBAContent* const content {dynamic_cast<RBAContent*>(state->getOwner())}; - content->updateRequestStatus(getResult()->getCurResultSet().get(), true); - if (beforeContentState != nullptr) { - // Update the state of the content originally assigned to - // the requested Allocatable - dynamic_cast<RBAContent*>(beforeContentState->getOwner())->updateStatus(getResultRef().get()); - } - // Update the state of requested Content - content->updateStatus(getResultRef().get()); - - setBackupResultSet(std::make_unique<RBAResultSet>(*getResult()->getPreResultSet())); - setNextResultSet(getResult()->createNextCurrentResultSet()); - - return true; + return impl_->setAllocatableResult(allocatableName, contextName); } bool RBAArbitrator::RBAArbitrator::evaluate(RBAExpression* expression) { - if(expression == nullptr) { - return false; - } - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - RBAConstraintInfo info; - // Constraint expression evaluation - return expression->execute(&info, this); + return impl_->evaluate(expression); } const RBARuleObject* RBAArbitrator::evaluateObject(RBAExpression* expression) { - if(expression == nullptr) { - return nullptr; - } - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - RBAConstraintInfo info; - // Constraint expression evaluation - const RBARuleObject* const ruleObj - {expression->getReferenceObject(&info, this)}; - if (ruleObj != nullptr) { - return ruleObj->getRawObject(); - } else { - return nullptr; - } + return impl_->evaluateObject(expression); } int32_t RBAArbitrator::evaluateValue(RBAExpression* expression) { - if(expression == nullptr) { - return -99; - } - const std::lock_guard<std::recursive_mutex> lock{getMutex()}; - RBAConstraintInfo info; - // Constraint expression evaluation - return expression->getValue(&info, this); -} - - -void -RBAArbitrator::setModel(RBAModelImpl* const newModel) -{ - std::lock_guard<std::recursive_mutex> lock {getMutex()}; - model_ = newModel; - model_->createSortedAllocatables(); - clearArbitration(); -} - -bool -RBAArbitrator:: -satisfiesConstraints() const -{ - const std::lock_guard<std::recursive_mutex> lock{mutex_}; - // Temporarily store the actual result_ - // because result_ is used for evaluation - std::unique_ptr<RBAResultImpl> tmpResult {std::move(result_)}; - result_ = std::make_unique<RBAResultImpl>( - this, - std::make_unique<RBAResultSet>(*(reservedResultSet_.get())), - std::make_unique<RBAResultSet>(*(resultSetForSatisfiesConstraints_.get()))); - bool result {true}; - for(const RBAConstraintImpl*& constraint : model_->getConstraintImpls()) { - if (constraint->isRuntime() == true) { - result = const_cast<RBAConstraintImpl*>(constraint)->execute(const_cast<RBAArbitrator*>(this)); - if (result == false) { - break; - } - } - } - result_ = std::move(tmpResult); - return result; -} - -/** - * Execute arbitration - */ -std::unique_ptr<RBAResult> -RBAArbitrator::arbitrateMain() -{ - // Store request state before arbitration, - // in case cancelArbitration() is executed - reservedResultSet_ = std::make_unique<RBAResultSet>(*backupResultSet_); - - // Differential arbitration for each request - if (requestQue_.empty()) { - // Prepare Result here because it will be used in differenceArbitrate. - result_ = std::make_unique<RBAResultImpl>(this, - std::move(backupResultSet_), - std::move(nextResultSet_)); - // Arbitration request without arguments. - // there is a possibility of being queued in "requestQue_" - // due to "onDisplayed" in this, - differenceArbitrate(); - } - if (!requestQue_.empty()) { - result_ = std::make_unique<RBAResultImpl>(this, - std::move(backupResultSet_), - std::move(nextResultSet_)); - do { - const std::unique_ptr<RBARequestQueMember> request {std::move(requestQue_.front())}; - requestQue_.pop_front(); - result_->setActive(request->getContentState(), request->isOn()); - // Update the state of Content - RBAContent* const content {dynamic_cast<RBAContent*>(request->getContentState()->getOwner())}; - content->updateRequestStatus(result_->getCurResultSet().get(), request->isOn()); - if (requestQue_.empty()) { - differenceArbitrate(); - if (!requestQue_.empty()) { - // Update "result_" for the next differenceArbitrate(). - result_ = std::make_unique<RBAResultImpl>(this, - std::move(backupResultSet_), - std::move(nextResultSet_)); - } - } else if (requestQue_.front()->getSyncIndex() != request->getSyncIndex()) { - differenceArbitrate(); - // Update "result_" for the next differenceArbitrate(). - result_ = std::make_unique<RBAResultImpl>(this, - std::move(backupResultSet_), - std::move(nextResultSet_)); - } else { - // No Operation - } - } while (!requestQue_.empty()); - } - - result_ = std::make_unique<RBAResultImpl>( - this, std::make_unique<RBAResultSet>(*reservedResultSet_), - result_->createBackupCurrentResultSet()); - - // Cancel processing of Content - checkCancelContent(); - - // Update displayed and non-displayed Area - updateResult(); - -#ifdef RBA_USE_LOG - RBALogManager::setType(RBALogManager::TYPE_RESULT); - logResultArbitration(); - - setLogToResult(); - RBALogManager::setType(RBALogManager::TYPE_NOTHING); -#endif - - createResultData(); - // Store backup of current arbitration result set - backupResultSet_ = result_->createBackupCurrentResultSet(); - // Create next arbitration result set - nextResultSet_ = result_->createNextCurrentResultSet(); - - // The "result_" of the return value is changed to another name, - // because "result_" will be used for storing. - auto retResult = std::move(result_); - - // Hold the arbitration result because the arbitration result may be used - // in cases other than arbitration. - result_ = std::make_unique<RBAResultImpl>(retResult.get()); - - // A compile error occurs if std::move() is missing because - // std::unique_ptr<RBAResultImpl> is cast to std::unique_ptr<RBAResult> - return std::move(retResult); -} - -bool -RBAArbitrator:: -isValidContext(const std::string& context) -{ - if (context != "") { - const RBAContentState* const state {model_->findContentState(context)}; - if (state == nullptr) { - const RBASceneImpl* const scene {model_->findSceneImpl(context)}; - if (scene == nullptr) { - return false; - } - } - } - - return true; -} - -bool -RBAArbitrator:: -isValidContext(std::list<std::string>& contexts) -{ - for(const std::string contextName : contexts) { - if(isValidContext(contextName) == false) { - return false; - } - } - - return true; -} - -/** - * Reflect input information - */ - -bool -RBAArbitrator::setRequestData( - const std::string& context, bool require, - std::list<std::pair<std::string, std::int32_t>>* const properties, - std::uint32_t syncIndex) -{ - bool isSet {false}; - if (context != "") { - // When content state is specified - // If contextName is the only content name, pop the first content state - const RBAContentState* state {model_->findContentState(context)}; - if (state != nullptr) { - requestQue_.push_back( std::make_unique<RBARequestQueMember>(state, require, syncIndex)); - isSet = true; - } else { - // When Scene is specified - const RBASceneImpl* const scene {model_->findSceneImpl(context)}; - if (scene != nullptr) { - // for next arbitration - nextResultSet_->setActive(scene, require); - // For when "Result" is referenced before the next arbitration - result_->setActive(scene, require); - isSet = true; - if (properties != nullptr) { - for (auto& p : *properties) { - const RBAAbstractProperty* const ap {scene->getProperty(p.first)}; - if (ap != nullptr) { - // for next arbitration - nextResultSet_->setSceneProperty(ap, p.second); - // For when "Result" is referenced before the next arbitration - result_->setSceneProperty(ap, p.second); - } - } - } - } - } - } - return isSet; -} - -void -RBAArbitrator::setRequestData(const RBAContentState* state, - bool require) -{ - if (requestQue_.empty()){ - requestQue_.push_back( std::make_unique<RBARequestQueMember>(state, require, 0U)); - } else { - requestQue_.push_back( std::make_unique<RBARequestQueMember>(state, require, requestQue_.back()->getSyncIndex())); - } -} - -void -RBAArbitrator::setRequestData(const RBAContent* const content, - bool require) -{ - if (requestQue_.empty()){ - requestQue_.push_back( std::make_unique<RBARequestQueMember>(content->getStates().front(), require, 0U)); - } else { - requestQue_.push_back( std::make_unique<RBARequestQueMember>(content->getStates().front(), require, requestQue_.back()->getSyncIndex())); - } -} - -void -RBAArbitrator::setActive(const RBASceneImpl* const scene, const bool require) -{ - if (nextResultSet_ != nullptr) { - // Update nextResultSet_" when onScene is done in onRequest or onWithdrawn - nextResultSet_->setActive(scene, require); - } else { - result_->setActive(scene, require); - } -} - -void -RBAArbitrator::setSceneProperty(const RBAAbstractProperty* const prop, const std::int32_t value) -{ - if (nextResultSet_ != nullptr) { - // Update nextResultSet_" when onScene is done in onRequest or onWithdrawn - nextResultSet_->setSceneProperty(prop, value); - } else { - result_->getCurResultSet()->setSceneProperty(prop, value); - } -} - -void -RBAArbitrator::setRequestData(std::list<std::string>& contexts, - const bool require) -{ - const std::uint32_t syncIndex {static_cast<std::uint32_t>(requestQue_.size())}; - for (auto& c : contexts) { - static_cast<void>(setRequestData(c, require, nullptr, syncIndex)); - } -} - -/** - * @brief Execute an extended version of arbitration that allows arbitration - when the "implication" is false - * @param areas - */ -void -RBAArbitrator:: -arbitrate(std::list<RBAAllocatable*>& allocatables) -{ - LOG_arbitrateAreaLogLine("----Arbitrate----"); - std::set<const RBAAllocatable*> revisitedInitSet; - - std::set<const RBAAllocatable*> revisited; - for (auto& alloc : allocatables) { - revisited = revisitedInitSet; - // ------------------------------------------------------------------------- - // To prevent an infinite loop, generate information to limit registration - // of other "allocable" that affected the target "allocatable" - // during arbitration - // ------------------------------------------------------------------------- - RBAAffectInfo affectInfo; - LOG_arbitrateAreaLogLine( - alloc->getSymbol() + "[" + alloc->getElementName() + "] check start"); - arbitrateAllocatable(alloc, revisited, 0, &affectInfo, nullptr); - } - for (auto& a : model_->getSortedAllocatables()) { - result_->setContentState(a, a->getState()); - } -} - -/** - * @brief Recursively arbitrate "allocatable" - * @param allocatable Allocatable that you want to arbitrate - * @param revisited Allocatable that re-arbitration is complete - * @param nest Re-arbitration nesting hierarchy (first arbitration is zero) - * @param affectInfo Allocatable information affected by "allocatable" - */ -void RBAArbitrator::arbitrateAllocatable( - RBAAllocatable* allocatable, - std::set<const RBAAllocatable*>& revisited, - const std::int32_t nest, - RBAAffectInfo* const affectInfo, - RBARollbacker* const parentRollbacker) -{ -#ifdef RBA_USE_LOG - RBALogManager::setIndent(nest); -#endif - // "Allocable" affected by "Allocable" which is the target of this arbitration - // during the recursive process until this variable is defined, - std::set<const RBAAllocatable*> affectAllocatables; - affectAllocatables.insert(allocatable->getAllocatablesAffectedByYou().begin(), - allocatable->getAllocatablesAffectedByYou().end()); - - const RBAContentState* const beforeState {allocatable->getState()}; - - // Mark Content allocation for target Allocable" as "checked" - allocatable->setChecked(true); - // Get content status sorted by arbitration policy - // (only active requests) - std::list<const RBAContentState*> contentStates; - getSortedContentStates(allocatable, contentStates); - for(const RBAContentState* const contentState : contentStates) { - // Allocate Content to Area - allocatable->setState(contentState); -#ifdef RBA_USE_LOG - { - std::string str = " Content["; - if (contentState == nullptr) { - str += "null"; - } else { - str += contentState->getOwner()->getElementName() + "::" - + contentState->getElementName(); - } - str += "] check online constraints start"; - RBALogManager::arbitrateContentLogLine(str); - } -#endif - bool isSkipped {false}; - const bool isPassed {checkConstraintAndReArbitrate( - allocatable, revisited, nest, affectInfo, parentRollbacker, - allocatable->getConstraints(), &isSkipped, false)}; - if (isPassed == true) { - - // ---------------------------------------------------------- - // Check if self-allocatable should be hidden - // by constraint expression after content allocation process. - // Check even if content is not assigned because there is contentValue() - // ---------------------------------------------------------- -#ifdef RBA_USE_LOG - std::string alloSymbol = allocatable->getSymbol(); - std::string alloName = allocatable->getElementName(); - if (allocatable->isArea() == true) { - LOG_arbitrateAreaLogLine( - " check online constraints to confirm area hidden state"); - } else { - LOG_arbitrateAreaLogLine( - " check online constraints to confirm zone muted state"); - } -#endif - // Mark "hidden" of target "Allocable" as "checked" - allocatable->setHiddenChecked(true); - // Set "hidden" of target "Allocable" to false - allocatable->setHidden(false); - bool hiddenIsPassed {checkConstraintAndReArbitrate( - allocatable, revisited, nest, affectInfo, parentRollbacker, - allocatable->getHiddenFalseCheckConstraints(), &isSkipped, - !allocatable->isZone())}; - if (hiddenIsPassed == false) { - allocatable->setHidden(true); - hiddenIsPassed = checkConstraintAndReArbitrate( - allocatable, revisited, nest, affectInfo, parentRollbacker, - allocatable->getHiddenTrueCheckConstraints(), &isSkipped, - !allocatable->isZone()); - if (hiddenIsPassed == false) { - // Clear hiding state of Allocatable - allocatable->setHiddenChecked(false); - } else { - LOG_arbitrateAreaLogLine( - alloSymbol + "[" + alloName + "] change " - + allocatable->getHiddenSymbol()); - } - } - - // ------------------------------------- - // For Zone, judge attenuation after hiding (mute) - // ------------------------------------- - bool attenuateIsPassed {true}; - if (allocatable->isZone()) { - RBAZoneImpl* const zone {dynamic_cast<RBAZoneImpl*>(allocatable)}; - // Mark "attenuattion" of target "Zone" as checked" - zone->setAttenuateChecked(true); - // Set "attenuattion" of target "Zone" to false - zone->setAttenuated(false); - LOG_arbitrateAreaLogLine( - " check online constraints to confirm zone attenuated state"); - attenuateIsPassed = checkConstraintAndReArbitrate( - allocatable, revisited, nest, affectInfo, parentRollbacker, - allocatable->getAttenuateFalseCheckConstraints(), &isSkipped, true); - if (attenuateIsPassed == false) { - zone->setAttenuated(true); - attenuateIsPassed = checkConstraintAndReArbitrate( - allocatable, revisited, nest, affectInfo, parentRollbacker, - allocatable->getAttenuateTrueCheckConstraints(), &isSkipped, true); - if (attenuateIsPassed == false) { - allocatable->setAttenuateChecked(false); - } else { - LOG_arbitrateAreaLogLine( - alloSymbol + "[" + alloName + "] change attenuated"); - } - } - } -#ifdef RBA_USE_LOG - { - std::string str = alloSymbol + "[" + alloName + "] "; - if (allocatable->isArea() == true) { - str += "displays"; - } else { - str += "outputs"; - } - str += " Content["; - const RBAContentState* state = allocatable->getState(); - if (state == nullptr) { - str += "null"; - } else { - str += state->getOwner()->getElementName() + "::" - + state->getElementName(); - } - str += "] " + allocatable->getHiddenSymbol() + "[" - + RBALogManager::boolToString(allocatable->isHidden()) + "]"; - if (allocatable->isZone() == true) { - str += " attenuated[" - + RBALogManager::boolToString(allocatable->isAttenuated()) + "]"; - } - str += "\n"; - LOG_arbitrateAreaLogLine(str); - } -#endif - if ((hiddenIsPassed == true) && (attenuateIsPassed == true)) { - break; - } - } - } - // --------------------------------------------------------------------- - // Re-arbitration of the Allocatable that influenced - // --------------------------------------------------------------------- - if ((beforeState != allocatable->getState()) - || allocatable->isHidden() - || allocatable->isAttenuated()) { - - // Re-arbitration is performed in a state other than "hidden" - // When allocating content. Therefore, if state become "hidden" or - // "attenuation", re-arbitration is required for the "allocatable" - // that was affected by re-arbitration during content allocation. - // Update the increased Area that influenced - if (allocatable->isHidden() || allocatable->isAttenuated()) { - for (const auto& a : allocatable->getAllocatablesAffectedByYou()) { - static_cast<void>(affectAllocatables.insert(a)); - } - } - - // If the re-arbitration source of Area/Zone (including any re-arbitration - // sources, if any reconciliation nests) becomes an Area/Zone affected by - // the re-arbitration area/zone, such Area/Zone is excluded from - // the re-arbitration target and the affected Area/Zone is re-arbitrated. - // Further, even if the affected Area/Zone is unarbitrated Allocatable - // at that time, it is excluded from the re-arbitration target of - // the affected Area. This is because it is sufficient to arbitrate - // during normal arbitration. - for (const auto& a : revisited) { - if (affectAllocatables.find(a) != affectAllocatables.end() - || (!a->isChecked())) { - static_cast<void>(affectAllocatables.erase(a)); - } - } - std::list<const RBAAllocatable*> sortedAllocatables(affectAllocatables.begin(),affectAllocatables.end()); - sortedAllocatables.sort(&RBAAllocatable::compareIndex); - if (parentRollbacker != nullptr) { - std::shared_ptr<RBARollbacker> rollbacker {std::make_shared<RBARollbacker>()}; - parentRollbacker->addChild(rollbacker); - rollbacker->backup(sortedAllocatables); - } - - for (auto& affect : sortedAllocatables) { - // Remove Allocatable which will be re-arbitration from Allocatable - // that influenced Allocable during arbitration. - allocatable->removeAffectAllocatable(affect); - } - static_cast<void>(revisited.insert(allocatable)); // Add to arbitrated Area - for (auto& affectAllocatable : sortedAllocatables) { - // @Deviation (EXP55-CPP,Rule-5_2_5,A5-2-3) - // [Contents that deviate from the rules] - // This is a 'const_cast' expression that strips away a 'const' or - // 'volatile' qualifier. - // [Why there is no problem if it deviate from the rules] - // Confirmed that there is no problem from the design point of view. - // We won't fix it now because we need to redesign the class, but - // no much effort as of now. - RBAAllocatable* allo {const_cast<RBAAllocatable*>(affectAllocatable)}; - - // Initialize the check flag of the Allocatable that performs the - // re-arbitration of the affetcted Allocatable - // If the affected Allocables are cleared in advance, a skip occurred in - // the constraint expression evaluation during the re-arbitration of - // the affected Allocatable that was carried out earlier, after that - // re-arbitration will work during re-arbitration of affected Allocatable. - // Therefore, clear check flag individually - // before re-arbitration of affected Allocable - allo->clearChecked(); - - LOG_arbitrateAreaLogLine( " " + - affectAllocatable->getSymbol() + "[" - + affectAllocatable->getElementName() - + "] affect allocatable check start"); - // @Deviation (MEM05-CPP,Rule-7_5_4,A7-5-2) - // [Contents that deviate from the rules] - // Recursively calling arbitrateAllocatable() - // [Why there is no problem if it deviate from the rules] - // - This process is necessary for re-arbitration of the affected Area, - // - stack overflow will not occur becasue the infinite loop - // prevention process is imeplemented. - arbitrateAllocatable(allo, revisited, nest + 1, affectInfo, - parentRollbacker); - } - for(const RBAAllocatable* const revisitAllocatable : sortedAllocatables) { - static_cast<void>(revisited.erase(revisitAllocatable)); - } - } - - // -------------------------------------------------- - // Delete temporary affect information - // to prevent infinite loop during re-arbitration - // -------------------------------------------------- - affectInfo->removeAffectInfo(allocatable); -#ifdef RBA_USE_LOG - RBALogManager::setIndent(nest-1); -#endif + return impl_->evaluateValue(expression); } -/** - * @brief Sort content state based on arbitration policy - * @param allocatable - * @param contentStates - * @return success/failure of sort - */ -bool -RBAArbitrator:: -sortContentStates(const RBAAllocatable* const allocatable, - std::list<const RBAContentState*>& states) const +RBAArbitratorImpl* +RBAArbitrator::getImpl() const { - bool isResult {true}; - switch(allocatable->getAllocatableArbitrationPolicy()) { - case RBAArbitrationPolicy::FIRST_COME_FIRST: - states.sort(&RBAContentState::compareFirstComeFirst); - break; - case RBAArbitrationPolicy::LAST_COME_FIRST: - states.sort(&RBAContentState::compareLastComeFirst); - break; - case RBAArbitrationPolicy::PRIORITY_FIRST_COME_FIRST: - states.sort(&RBAContentState::comparePriorityFirstComeFirst); - break; - case RBAArbitrationPolicy::DEFAULT: - case RBAArbitrationPolicy::PRIORITY_LAST_COME_FIRST: - states.sort(&RBAContentState::comparePriorityLastComeFirst); - break; - default: - isResult = false; - break; - } - - return isResult; + return impl_->getImpl(); } -/** - * @brief Get re-arbitration list from judgment NG constraint - * @param totalRevisitAllocatables - * @param allocatable - * @param falseConstraints - * @param revisited - */ -void -RBAArbitrator:: -collectRevisitAllocatable(std::list<const RBAAllocatable*>* const totalRevisitAllocatables, - RBAAllocatable*& allocatable, - std::list<RBAConstraintImpl*>& falseConstraints, - std::set<const RBAAllocatable*>& revisited) -{ - std::set<const RBAAllocatable*> revisitAllocatablesSet; - - // Determine if re-arbitration should be done based on the constraint - // that the determination was NG - for(RBAConstraintImpl*& constraint : falseConstraints) { - // Get Contraint information - const RBAConstraintInfo* const info {constraint->getInfo()}; - // Allocatable, a candidate for re-arbitration - std::set<const RBAAllocatable*> rightFalseAllocatables; - - if (info->needsRearbitrationFor(allocatable)) { - info->collectRearbitrationTargetFor(allocatable, rightFalseAllocatables, false); - } - if (rightFalseAllocatables.empty()) { - // Non-implication constraint expression - // To ensure that "currently arbitrated allocable" does not lose to lower - // priority allocable, arbitration of low priority Allocable is performed - // if low priority Allocable is included in - // "re-arbitration candidate Allocable". - info->collectFalseAllocatables(rightFalseAllocatables); - bool isContainsLowPriorityAllocatable {false}; - for(const RBAAllocatable* const rightFalseAllocatable - : rightFalseAllocatables) { - if(RBAAllocatable::compareIndex(allocatable,rightFalseAllocatable)) { - // index is smaller for higher priority allocable - isContainsLowPriorityAllocatable = true; - break; - } - } - if(!isContainsLowPriorityAllocatable) { - continue; - } - } - - // Remove Allocable during arbitration from re-arbitration target - static_cast<void>(rightFalseAllocatables.erase(allocatable)); - - // If even one Allocable candidate for re-arbitration has been - // re-arbitrated, re-arbitration will not be performed again. - // Go to next content assignment - for(const RBAAllocatable* const rightFalseAllocatable : rightFalseAllocatables) { - if(revisited.find(rightFalseAllocatable) != revisited.end()) { - return; - } - } - - // Set re-arbitration Allocable - for(const RBAAllocatable* const alloc : rightFalseAllocatables) { - static_cast<void>(revisitAllocatablesSet.insert(alloc)); - } - } - - // Re-arbitration Allocatable exists - if(!(revisitAllocatablesSet.empty())) { - // copy std::set to std::list - static_cast<void>(totalRevisitAllocatables->insert(totalRevisitAllocatables->end(), - revisitAllocatablesSet.begin(), - revisitAllocatablesSet.end())); - // Sort re-arbitration Areas in ascending order based on priority - // It is necessary to sort by index comparison considering the order of models. - totalRevisitAllocatables->sort(&RBAAllocatable::compareIndex); - } -} - -/** - * Confirm cancellation of all content status - * to cancel Request which lost in arbitration - */ -void -RBAArbitrator:: -postArbitrate() -{ -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine("----Cancel Request----"); -#endif - for(const RBAContentState* const state : model_->getContentStates()) { -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine("Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] check start"); -#endif - static_cast<void>(cancelChecked_.insert(state)); - if(!result_->isActive(state)) { -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine(" Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] is not Active skip"); -#endif - continue; - } - if(result_->isAlreadyOutputting(state)) { -#ifdef RBA_USE_LOG - std::string contTypeName; - if(state->isViewContentState()) { - contTypeName = "Visible"; - } - else { - contTypeName = "Sounding"; - } - RBALogManager::cancelRequestLogLine(" Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] is "+contTypeName+" skip"); -#endif - continue; - } - - changeContentStateCancelWithPolicy(state); - } - -#ifdef RBA_USE_LOG - // Log output for coverage of request cancellation - for(const RBAContentState* state : model_->getContentStates()) { - std::string contentName = state->getOwner()->getElementName(); - std::string stateName = state->getElementName(); - std::string canceled = isCancel(state) ? "t" : "f"; - RBALogManager::coverageCanceledRequestLogLine( - contentName + "," + stateName + ',' +canceled); - } -#endif -} - -/** - * @brief Change the cancellation information of hidden Content status - based on arbitration results and cancellation policy - * @param state - */ -void -RBAArbitrator:: -changeContentStateCancelWithPolicy(const RBAContentState* const state) -{ - switch(dynamic_cast<RBAContent*>(state->getOwner())->getContentLoserType()) { - case RBAContentLoserType::GOOD_LOSER: -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine(" Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] is Canceled because GOOD_LOSER"); -#endif - setCancel(state, true); - break; - case RBAContentLoserType::NEVER_GIVEUP: -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine(" Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] is not Canceled because NEVER_GIVEUP"); -#endif - setCancel(state, false); - break; - case RBAContentLoserType::DO_NOT_GIVEUP_UNTIL_WIN: - if(state->isModelElementType(RBAModelElementType::ViewContentState)) { - if(result_->isPreVisible(dynamic_cast<const RBAViewContentStateImpl*>(state))) { -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine(" Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] is Canceled because DO_NOT_GIVEUP_UNTIL_WIN"); -#endif - setCancel(state, true); - } else { -#ifdef RBA_USE_LOG - RBALogManager::cancelRequestLogLine(" Content["+ - state->getOwner()->getElementName()+"::"+ - state->getElementName()+ - "] is not Canceled because DO_NOT_GIVEUP_UNTIL_WIN"); -#endif - setCancel(state, false); - } - } - else { - if(result_->isPreSounding(dynamic_cast<const RBASoundContentStateImpl*>(state))) { - setCancel(state, true); - } else { - setCancel(state, false); - } - } - break; - default: - break; - } -} - -#ifdef RBA_USE_LOG -void -RBAArbitrator:: -checkAllConstraints() -{ - std::string log; - LOG_arbitrateConstraintLogLine("----Check All Constraint----"); - - if(simulationMode_) { - for(const RBAConstraintImpl* constraint : model_->getConstraintImpls()) { - bool result = const_cast<RBAConstraintImpl*>(constraint)->execute(this); - if(result == false) { - result_->addFailedConstraint(constraint); - } - if (constraint->isRuntime() == true) { - log += "online "; - } else { - log += "offline "; - } - log += "constraint[" + constraint->getElementName() + "] "; - log += "result[" + RBALogManager::boolToString(result) + "]\n"; - } - if (log.empty() != true ) { - log.erase(log.end() - 1, log.end()); // Remove last line break - } - } - -} -#endif - -void -RBAArbitrator:: -checkCancelContent() const -{ - for(const RBAViewContentState* const viewState - : result_->getActiveViewContentStates()) { - if(result_->isCancel(viewState)) { - result_->cancelContentState(dynamic_cast<const RBAContentState*>(viewState)); - } - } - for(const RBASoundContentState* const soundState - : result_->getActiveSoundContentStates()) { - if(result_->isCancel(soundState)) { - result_->cancelContentState(dynamic_cast<const RBAContentState*>(soundState)); - } - } -} - -/** - * @brief Update display and non-dislay Allocatable List - */ -void -RBAArbitrator:: -updateResult() -{ - // Deactivate canceled Content - result_->updateActiveContentStates(); - - // Update coordinates of Area - for(auto& area : result_->getVisibleAreas()) { - const RBAAreaImpl* const areaImpl {dynamic_cast<const RBAAreaImpl*>(area)}; - const auto posCont = model_->findPositionContainerImpl(area->getName()); - const auto sizeObj = result_->getSize(area); - if((posCont != nullptr) && (sizeObj != nullptr)) { - const auto offset = posCont->getOffset(sizeObj->getName()); - const_cast<RBAAreaImpl*>(areaImpl)->setOffsetX(offset.first); - const_cast<RBAAreaImpl*>(areaImpl)->setOffsetY(offset.second); - } - } - - // Set output Content state list - std::set<const RBAContentState*> outputtingContentStateSet; - for(auto& alloc : result_->getOutputtingAllocatables()) { - const auto state = result_->getAllocatedContentState(alloc); - static_cast<void>(outputtingContentStateSet.insert(state)); - } - for(auto& state : outputtingContentStateSet) { - static_cast<void>(result_->addOutputtingContentState(state)); - } - - for(auto& state : result_->getActiveContentStates()) { - // If the Area allocated in the display request is not displayed, - // set it to "Stanby Content". - const auto allocs = result_->getAllocatable(state); - if(allocs.empty()) { - result_->addStandbyContent(dynamic_cast<RBAContent*>(state->getOwner())); - } - } -} - -/** - * ### Generate result information - * - * Generate animation information (RBAViewAction) and register it in the - * viewActions list of RBAResult. - * The animation information generation pattern is as follows. - * | Area A(pre) | Area B(pre) | Area A(cur) | Area B(cur) | type | - * |:-: |:-: |:-: |:-: |:---- | - * | (none) | - | **content** | - | TRANSITON_ADD | - * | **content** | - | (none) | - | TRANSITION_REMOVE | - * | **contentA** | - | **contentB** | - | TRANSITION_REPLACE | - * | **content** | (none) | (none) | **content** | MOVE | - */ -void -RBAArbitrator:: -createResultData() -{ - std::list<std::unique_ptr<RBAViewAction>> actions; - // Check the Areas that have not changed - std::set<const RBAArea*> stableAreas; - for(const RBAArea* const preArea : result_->getPreVisibleAreas()) { - if(result_->isVisible(preArea)) { - const RBAViewContent* const curContent {result_->getContentState(preArea)->getOwner()}; - const RBAViewContent* const preContent {result_->getPreContentState(preArea)->getOwner()}; - if(curContent == preContent) { - static_cast<void>(stableAreas.insert(preArea)); - } - } - } - // Check "MOVE" - std::set<const RBAViewContent*> movedContents; - for(const RBAArea* curArea : result_->getVisibleAreas()) { - // Current display Area - const RBAViewContentState* curState {result_->getContentState(curArea)}; - const RBAViewContent* const curContent {curState->getOwner()}; - // Skip stable Area - if(stableAreas.find(curArea) != stableAreas.end()) { - continue; - } - for(const RBAArea* preArea : result_->getPreVisibleAreas()) { - // Do not consider stable areas to have changed - if (stableAreas.find(preArea) != stableAreas.end()) { - continue; - } - // Previous display Area - const RBAViewContent* const preContent {result_->getPreContentState(preArea)->getOwner()}; - if(curContent == preContent) { - // "MOVE" if there is matching content - actions.push_back(std::make_unique<RBAViewMove>(preArea, curArea, - curState)); - // Check moved Content - static_cast<void>(movedContents.insert(curState->getOwner())); - } - } - } - // Check "REMOVE" - for(const RBAArea* preArea : result_->getPreVisibleAreas()) { - // Skip stable Area - if(stableAreas.find(preArea) != stableAreas.end()) { - continue; - } - const RBAViewContentState* preState {result_->getPreContentState(preArea)}; - // Skip if Content is "MOVE" - if(movedContents.find(preState->getOwner()) - != movedContents.end()) { - continue; - } - if(!result_->isVisible(preArea)) { - // If the previously displayed Area isn't displayed, it is REMOVE. - actions.push_back(std::make_unique<RBAViewTransition>( - RBAViewActionType::TRANSITION_REMOVE, preArea, preState)); - } - } - // Check Examine ADD/REMOVE and REPLACE related to MOVE - for(const RBAArea* curArea : result_->getVisibleAreas()) { - // Display Area at this time - // Skip stable Area - if(stableAreas.find(curArea) != stableAreas.end()) { - continue; - } - const RBAViewContentState* curState {result_->getContentState(curArea)}; - const RBAViewContent* const curContent {curState->getOwner()}; - const RBAViewContentState* preState {result_->getPreContentState(curArea)}; - - if(movedContents.find(curContent) != movedContents.end()) { - if((preState != nullptr) && (!result_->isVisible(preState))) { - // If the previously displayed content isn't displayed, it is REMOVE. - actions.push_back(std::make_unique<RBAViewTransition>( - RBAViewActionType::TRANSITION_REMOVE, - curArea, preState)); - } - else { - continue; - } - } - else if(result_->isPreVisible(curArea)) { - // It was the display Area last time - // If pre is MOVE content - const RBAViewContent* const preContent {preState->getOwner()}; - if(movedContents.find(preContent) != movedContents.end()) { - // Content at this time is ADD - actions.push_back(std::make_unique<RBAViewTransition>( - RBAViewActionType::TRANSITION_ADD, - curArea, curState)); - } - else if(curContent != preContent) { - // REPLACE because the content is different - actions.push_back(std::make_unique<RBAViewTransition>( - RBAViewActionType::TRANSITION_REPLACE, - curArea, preState, curState)); - } else { - ; - } - } - else { - // ADD because it was not the display Area last time - actions.push_back(std::make_unique<RBAViewTransition>( - RBAViewActionType::TRANSITION_ADD, - curArea, curState)); - } - } - - // Sort and register - actions.sort(&compareViewAction); - for(auto& action : actions) { - result_->addViewAction(action); - } -} - -void -RBAArbitrator::differenceArbitrate() -{ -#ifdef RBA_USE_LOG - // Set request information in log - RBALogManager::setType(RBALogManager::TYPE_REQUEST); - logRequestArbitration(); - RBALogManager::setType(RBALogManager::TYPE_PREVIOUS_RESULT); - logPreResultArbitration(); - logRequestForCoverage(); -#endif - - for (auto& a : model_->getSortedAllocatables()) { - a->clearStatus(); - } - - // ---------------------------------------------------------- - // Arbitration - // ---------------------------------------------------------- - // Priority and post-win arbitoration - // (Value arbitration is the same as priority arbitration) -#ifdef RBA_USE_LOG -RBALogManager::setType(RBALogManager::TYPE_ARBITRATE); -#endif - arbitrate(model_->getSortedAllocatables()); - - // ---------------------------------------------------------- - // Post processing of arbitration - // ---------------------------------------------------------- -#ifdef RBA_USE_LOG -RBALogManager::setType(RBALogManager::TYPE_CANCEL_REQUEST); -#endif - // when the constraint expression is evaluated by satisfiesConstraints(), - // if the cancel state is different from the time when execute() is executed, - // the result may be false. Therefore, it is necessary to store - // the state before cancellation processing. - // When performing the constraint expression evaluation in - // satisfiedConstraints(), restore to this value and evaluate. - resultSetForSatisfiesConstraints_ = std::make_unique<RBAResultSet>( - *result_->getCurResultSet()); - postArbitrate(); - - // Move offline Constraint -#ifdef RBA_USE_LOG -RBALogManager::setType(RBALogManager::TYPE_CHECK_ALL_CONSTRAINTS); - checkAllConstraints(); -#endif - - // ---------------------------------------------------------- - // Update Content state - // ---------------------------------------------------------- - for (auto& c : model_->getContents()){ - const_cast<RBAContent*>(c)->updateStatus(result_.get()); - } - - backupResultSet_ = result_->createBackupCurrentResultSet(); - nextResultSet_ = result_->createNextCurrentResultSet(); - -#ifdef RBA_USE_LOG - logResultForCoverage(); -#endif -} - -bool -RBAArbitrator:: -checkConstraints( std::list<RBAConstraintImpl*>& constraints, - std::list<RBAConstraintImpl*>& falseConstraints, - const RBAAllocatable* const allocatable) -{ - bool containsSkip {false}; - for (const auto& constraint : constraints) { - const bool isPassed {constraint->execute(this)}; - if (isPassed == false) { - falseConstraints.push_back(constraint); - } - if (constraint->getInfo()->isExceptionBeforeArbitrate()) { - if (constraint->getInfo()->needsReRearbitrationFor(allocatable)) { - containsSkip = true; - } - } - } - return containsSkip; -} - -bool -RBAArbitrator:: -checkConstraintAndReArbitrate(RBAAllocatable* allocatable, - std::set<const RBAAllocatable*>& revisited, - const std::int32_t nest, - RBAAffectInfo* const affectInfo, - RBARollbacker* const parentRollbacker, - std::list<RBAConstraintImpl*>& constraints, - bool * const isSkipped, - const bool isFinal) -{ - bool isPassed {false}; - std::list<RBAConstraintImpl*> falseConstraints; - const bool containsSkip {checkConstraints(constraints, falseConstraints, allocatable)}; - if(falseConstraints.empty()) { - *isSkipped = (*isSkipped || containsSkip); - if(!containsSkip && !*isSkipped && isFinal) { - static_cast<void>(revisited.insert(allocatable)); - } - isPassed = true; - } else { - std::list<const RBAAllocatable*> revisitAllocatables; - collectRevisitAllocatable(&revisitAllocatables, allocatable, falseConstraints, revisited); - if(!(revisitAllocatables.empty())) { - // There is re-arbitration Allocatable. - // Generates backup information for rollback when re-arbitration fails. - // For efficiency, instantiate only once when re-arbitration is needed - // for the first time. - // Since it is backed up after content allocation, - // it is necessary to set NULL to the allocated content after rollback. - - // Rollback information when arbitration fails - std::shared_ptr<RBARollbacker> rollbacker {std::make_shared<RBARollbacker>()}; - if (parentRollbacker != nullptr) { - parentRollbacker->addChild(rollbacker); - } - rollbacker->backup(revisitAllocatables); - // Initialize all re-arbitration Allocatable - for (auto& a : revisitAllocatables) { - const_cast<RBAAllocatable*>(a)->clearChecked(); - } - // -------------------------------------------------- - // Re-arbitrate "Allocatable" that has not been re-arbitrated - // in the re-arbitration candidate list - // -------------------------------------------------- - static_cast<void>(revisited.insert(allocatable)); - for(const RBAAllocatable* const revisitAllocatable : revisitAllocatables) { - LOG_arbitrateAreaLogLine( " " + - revisitAllocatable->getSymbol() + "[" - + revisitAllocatable->getElementName() - + "] revisit allocatable check start"); - arbitrateAllocatable(const_cast<RBAAllocatable*>(revisitAllocatable), - revisited, nest + 1, affectInfo, rollbacker.get()); - } - for(const RBAAllocatable* const revisitAllocatable : revisitAllocatables) { - static_cast<void>(revisited.erase(revisitAllocatable)); - } - // -------------------------------------------------- - // Check if content allocation succeeded as a result of re-arbitration - // -------------------------------------------------- - falseConstraints.clear(); - static_cast<void>(checkConstraints(constraints, falseConstraints, allocatable)); - if (falseConstraints.empty()) { - // The content of the allocatable allocation is fixed by re-arbitration, - // so exit the loop and proceed to the next allocatable. - // In some cases, "Allocatable" is re-arbitrated due to recursion and - // allocated Content is lost, but go to the next Allocable because - // all contents have been checked - isPassed = true; - } else { - // Roll back arbitration status and affected information - rollbacker->rollback(); - if (parentRollbacker != nullptr) { - parentRollbacker->removeChild(rollbacker); - } - } - } - } - if (isPassed == false) { - //Collect Areas that affected the area in arbitration status - std::set<const RBAAllocatable*> allocatablesWhichHaveAffectedToThisAllocatable; - - for (const RBAConstraintImpl* const constraint : falseConstraints) { - constraint->getInfo()->collectAffectedAllocatables( - false, allocatablesWhichHaveAffectedToThisAllocatable, false, - false); - } - static_cast<void>(allocatablesWhichHaveAffectedToThisAllocatable.erase(allocatable)); - - // Record fact that affected the area being arbitrated on Area that - // affected Area during arbitration. - // The re-arbitration of the affected area is recorded in AffectInfo, - // so it does not record the re-arbitrated area. - for (const RBAAllocatable* const a : allocatablesWhichHaveAffectedToThisAllocatable) { - if (!(affectInfo->alreadyKnowsThatFormerHasAffectedToLatter(a, - allocatable))) { - const_cast<RBAAllocatable*>(a)->addAllocatableWhichHasBeenAffectedByYou( - allocatable); - affectInfo->addInfoThatFormerAffectedToLatter(a, allocatable); - } - } - } - return isPassed; -} - -void -RBAArbitrator:: -setCancel(const RBAContentState* const state, const bool checked) -{ - result_->setCancel(state, checked); -} - -bool -RBAArbitrator:: -isCancel(const RBAContentState* const state) const -{ - if(state->isViewContentState()) { - return result_->isCancel(state); - } - else { - return result_->isCancel(state); - } -} - -void -RBAArbitrator:: -getSortedContentStates(const RBAAllocatable* const allocatable, - std::list<const RBAContentState*>& contentStates) const -{ - for (const RBAContent* const content : allocatable->getInternalContents()) { - const RBAContentState* const state {result_->getActiveState(content)}; - if (state != nullptr) { - contentStates.push_back(state); -#ifdef RBA_USE_LOG - } else { - RBALogManager::arbitrateContentLogLine( - " Content[" + content->getElementName() + "] is not Active skip"); -#endif - } - } - static_cast<void>(sortContentStates(allocatable, contentStates)); - // Add null at the end, to evaluate constraint expression when unassigned - contentStates.push_back(nullptr); -} - -std::int32_t -RBAArbitrator:: -getViewActionPriority(const RBAViewActionType viewActionType) -{ - std::int32_t result{0}; - - switch(viewActionType) { - case RBAViewActionType::TRANSITION_REMOVE: - result = 4; - break; - case RBAViewActionType::MOVE: - result = 3; - break; - case RBAViewActionType::TRANSITION_ADD: - result = 2; - break; - case RBAViewActionType::TRANSITION_REPLACE: - result = 1; - break; - default: - break; - } - - return result; -} - -bool -RBAArbitrator:: -compareViewAction(const std::unique_ptr<RBAViewAction>& lhs, - const std::unique_ptr<RBAViewAction>& rhs) -{ - const std::int32_t lval {getViewActionPriority(lhs->getViewActionType())}; - const std::int32_t rval {getViewActionPriority(rhs->getViewActionType())}; - - return lval > rval; -} - -RBAResultImpl* -RBAArbitrator::getResult() const -{ - return result_.get(); -} - -void RBAArbitrator::setResult(std::unique_ptr<RBAResultImpl> result) -{ - result_ = std::move(result); -} - -std::set<const RBAContentState*>& RBAArbitrator::getCancelChecked() -{ - return cancelChecked_; -} - -std::unique_ptr<RBAResultImpl>& RBAArbitrator::getResultRef() const -{ - return result_; -} - -std::unique_ptr<RBAResultSet>& RBAArbitrator::getNextResultSet() -{ - return nextResultSet_; -} - -void RBAArbitrator::setNextResultSet(std::unique_ptr<RBAResultSet> nextResultSet) -{ - nextResultSet_ = std::move(nextResultSet); -} - -std::unique_ptr<RBAResultSet>& RBAArbitrator::getBackupResultSet() -{ - return backupResultSet_; -} - -void RBAArbitrator::setBackupResultSet(std::unique_ptr<RBAResultSet> backupResultSet) -{ - backupResultSet_ = std::move(backupResultSet); -} - -std::unique_ptr<RBAResultSet>& RBAArbitrator::getReservedResultSet() -{ - return reservedResultSet_; -} - -void RBAArbitrator::setReservedResultSet(std::unique_ptr<RBAResultSet> reservedResultSet) -{ - reservedResultSet_ = std::move(reservedResultSet); -} - -std::recursive_mutex& RBAArbitrator::getMutex() const -{ - return mutex_; -} - -#ifdef RBA_USE_LOG -void RBAArbitrator::setSimulationMode(bool simulationMode) -{ - simulationMode_ = simulationMode; -} -#endif - -std::deque<std::unique_ptr<RBARequestQueMember>>& RBAArbitrator::getRequestQue() -{ - return requestQue_; -} - -#ifdef RBA_USE_LOG -/** - * Output request information for log view - */ -void -RBAArbitrator::logRequestArbitration() -{ - const std::list<const RBAAllocatable*> allocatables = - model_->getAllocatables(); - RBALogManager::requestLogLine("----Request Information----"); - RBALogManager::requestLogLine( - "Allocatable Count:" + std::to_string(allocatables.size())); - for (const RBAAllocatable* allocatable : allocatables) { - RBALogManager::requestLogLine( - " " + allocatable->getSymbol() + "[" + allocatable->getElementName() - + "] policy[" + allocatable->getArbitrationPolicyString() - + "] visibility[" + allocatable->getVisibilityString() + "]"); - } - - const std::list<const RBAContentState*> contentStates = model_ - ->getContentStates(); - RBALogManager::requestLogLine( - "ContentState Count:" + std::to_string(contentStates.size())); - for (const RBAContentState* contentState : contentStates) { - std::string active; - if (contentState->getModelElementType() == RBAModelElementType::ViewContentState) { - active = RBALogManager::boolToString( - result_->isActive( - dynamic_cast<const RBAViewContentState*>(contentState))); - } else { - active = RBALogManager::boolToString( - result_->isActive( - dynamic_cast<const RBASoundContentState*>(contentState))); - } - RBALogManager::requestLogLine( - " " + dynamic_cast<RBAContent*>(contentState->getOwner())->getSymbol() + "[" - + contentState->getOwner()->getElementName() + "::" - + contentState->getElementName() + "] priority[" - + contentState->getPriorityString() + "] isActive[" + active - + "] order[" + contentState->getOrderString() + "]"); - } - - const std::list<const RBAScene*> scenes = model_->getScenes(); - RBALogManager::requestLogLine("Scene Count:" + std::to_string(scenes.size())); - for (const RBAScene* scene : scenes) { - RBALogManager::requestLogLine( - " Scene[" + scene->getName() + "] isActive[" - + RBALogManager::boolToString(result_->isActive(scene)) - + "]"); - } - - std::list<RBAConstraint*> constraints = model_->getConstraints(); - RBALogManager::requestLogLine( - "Constraint Count:" + std::to_string(constraints.size())); - for (RBAConstraint* constraint : constraints) { - RBAConstraintImpl* impl = dynamic_cast<RBAConstraintImpl*>(constraint); - RBALogManager::requestLogLine( - " Constraint[" + impl->getName() + "] Expression[" - + impl->getExpression()->getExpressionText() + "] runtime[" - + RBALogManager::boolToString(impl->isRuntime()) + "]"); - } - -} - -/** - * Output previous arbitration result for log view - */ -void -RBAArbitrator::logPreResultArbitration() -{ - RBALogManager::resultLogLine("----Previous Result Information----"); - - auto allocs = model_->getAllocatables(); - RBALogManager::resultLogLine("Allocatable TotalCount:" - + std::to_string(allocs.size())); - for (auto& alloc : allocs) { - auto contentState = result_->getPreContentState(alloc); - auto hidden = result_->isPreHidden(alloc); - std::string str = " " + alloc->getSymbol() - + "[" + alloc->getElementName() + "] Content["; - if (contentState == nullptr) { - str += "null"; - } else { - str += contentState->getOwner()->getElementName() - + "::" + contentState->getElementName(); - } - str += "] " + alloc->getHiddenSymbol() - + "[" + RBALogManager::boolToString(hidden) + "]"; - if (alloc->isZone() == true) { - str += " attenuated["; - str += RBALogManager::boolToString( - result_->isPreAttenuated(dynamic_cast<const RBAZone*>(alloc))); - str += "]"; - } - RBALogManager::resultLogLine(str); - if (contentState && !hidden) { - RBALogManager::coveragePrevResultLogLine( - "A," + alloc->getElementName() + "," - + contentState->getOwner()->getElementName() + "," - + contentState->getElementName()); - } - } - - auto contents = model_->getContents(); - RBALogManager::resultLogLine("Content TotalCount:" - + std::to_string(contents.size())); - for (auto& content : contents) { - auto state = result_->getPreActiveState(content); - bool isOutputting = false; - bool isActive = false; - if (state != nullptr) { - isActive = true; - isOutputting = result_->isPreOutputting(state); - } - RBALogManager::resultLogLine( - " " + content->getSymbol() + "[" + content->getElementName() + "] " - + content->getVisibleSymbol() + "[" - + RBALogManager::boolToString(isOutputting) + "] active[" - + RBALogManager::boolToString(isActive) + "]"); - for (auto alloc : content->getAllocatables()) { - auto allocatedState = result_->getPreContentState(alloc); - if ((allocatedState != nullptr) - && (allocatedState->getOwner() == content)) { - RBALogManager::resultLogLine( - " allocated " + alloc->getSymbol() + "[" - + alloc->getElementName() + "]"); - } - } - } -} - -/** - * Output current arbitration result for log view - */ -void -RBAArbitrator::logResultArbitration() -{ - RBALogManager::resultLogLine("----Result Information----"); - - const std::list<const RBAAllocatable*> allocatables - = model_->getAllocatables(); - RBALogManager::resultLogLine("Allocatable TotalCount:" + std::to_string(allocatables.size())); - for(const RBAAllocatable* allocatable : allocatables) { - const RBAContentState* contentState = result_->getContentState(allocatable); - std::string str = " "; - str += allocatable->getSymbol(); - str += "["; - str += allocatable->getElementName(); - str += "] Content["; - if (contentState == nullptr) { - str += "null"; - } else { - str += contentState->getOwner()->getElementName() + "::" - + contentState->getElementName(); - } - str += "] "; - str += allocatable->getHiddenSymbol(); - str += "["; - str += RBALogManager::boolToString(result_->isHidden(allocatable)); - str += "]"; - if (allocatable->isZone() == true) { - str += " attenuated["; - str += RBALogManager::boolToString(result_->isAttenuated(dynamic_cast<const RBAZone*>(allocatable))); - str += "]"; - } - RBALogManager::resultLogLine(str); - } - - const std::list<const RBAContent*> contents = model_->getContents(); - RBALogManager::resultLogLine("Content TotalCount:" + std::to_string(contents.size())); - for(const RBAContent* content : contents) { - bool isOutputting = false; - bool isCancel = false; - const RBAContentState* state = result_->getActiveState(content); - if(state != nullptr) { - isOutputting = result_->isOutputting(state); - } else { - for(const RBAContentState* state : content->getStates()) { - isCancel |= result_->isCancel(state); - } - } - RBALogManager::resultLogLine(" " - + content->getSymbol() - + "[" - + content->getElementName() - + "] " - + content->getVisibleSymbol() - + "[" - + RBALogManager::boolToString(isOutputting) - + "] cancel[" - + RBALogManager::boolToString(isCancel) - + "]"); - for(const RBAAllocatable* allocatable : content->getAllocatables()) { - const RBAContentState* allocatedState - = result_->getContentState(allocatable); - if((allocatedState != nullptr) && (allocatedState->getOwner() == content)) { - RBALogManager::resultLogLine(" allocated " - + allocatable->getSymbol() + "[" - + allocatable->getElementName() + "]"); - } - } - } -} - -/** - * For coverage: Output request information - */ -void -RBAArbitrator::logRequestForCoverage() -{ - for(const RBAContentState* contentState : model_->getContentStates()) { - std::ostringstream oss; - oss << "C,"; - if(result_->isActive(contentState)) { - oss << "on,"; - } - else { - oss << "off,"; - } - oss << contentState->getOwner()->getElementName() << ","; - oss << contentState->getElementName() << ","; - oss << contentState->getContentStateOrder(); - RBALogManager::coverageRequestLogLine(oss.str()); - } - for(const RBAScene* scene : model_->getScenes()) { - std::ostringstream oss; - oss << "S,"; - if(result_->isActive(scene)) { - oss << "on,"; - } - else { - oss << "off,"; - } - oss << scene->getName(); - for(const auto& name : scene->getPropertyNames()) { - std::int32_t value {result_->getSceneProperty(scene, name)}; - oss << ","; - oss << name; - oss << ":"; - oss << value; - } - RBALogManager::coverageRequestLogLine(oss.str()); - } -} - -/** - * For coverage: Output result information - */ -void -RBAArbitrator::logResultForCoverage() -{ - for(const RBAAllocatable* allocatable : model_->getAllocatables()) { - std::ostringstream oss; - oss << "A,"; - oss << allocatable->getElementName() + ","; - const RBAContentState* contentState = result_->getContentState(allocatable); - if((contentState != nullptr) && (!result_->isHidden(allocatable))) { - oss << contentState->getOwner()->getElementName(); - } - RBALogManager::coverageResultLogLine(oss.str()); - } -} - -void -RBAArbitrator::setLogToResult() -{ - std::ostringstream oss; - oss << RBALogManager::getAllConstraintLog(); - oss << RBALogManager::getRequestLog(); - oss << RBALogManager::getPreviousResultLog(); - oss << RBALogManager::getArbitrateLog(); - oss << RBALogManager::getCancelRequestLog(); - oss << RBALogManager::getCheckAllConstraintLog(); - oss << RBALogManager::getResultLog(); - result_->setLog(oss.str()); -} -#endif - -} +}
\ No newline at end of file diff --git a/src/core/logic/RBAArbitratorImpl.cpp b/src/core/logic/RBAArbitratorImpl.cpp new file mode 100644 index 0000000..466d439 --- /dev/null +++ b/src/core/logic/RBAArbitratorImpl.cpp @@ -0,0 +1,2036 @@ +/** + * 調停ロジック実装クラス定義ファイル + */ + +#include <algorithm> +#include <sstream> +#include "RBAArbitratorImpl.hpp" +#include "RBAModelImpl.hpp" +#include "RBAResultImpl.hpp" +#include "RBAResultSet.hpp" +#include "RBAAreaImpl.hpp" +#include "RBAAllocatable.hpp" +#include "RBAAffectInfo.hpp" +#include "RBAViewContentImpl.hpp" +#include "RBAViewContentStateImpl.hpp" +#include "RBAConstraintImpl.hpp" +#include "RBARuleObject.hpp" +#include "RBAViewAction.hpp" +#include "RBAViewTransition.hpp" +#include "RBAViewMove.hpp" +#include "RBAConstraintInfo.hpp" +#include "RBAZoneImpl.hpp" +#include "RBASoundContentImpl.hpp" +#include "RBAContentState.hpp" +#include "RBARollbacker.hpp" +#include "RBALogManager.hpp" +#include "RBAModelFactory.hpp" +#include "RBAAllwaysCheckConstraintCollector.hpp" +#include "RBAModelElementType.hpp" +#include "RBARequestQueMember.hpp" + +namespace rba { + +RBAArbitrator::Impl:: +Impl(RBAArbitrator* const arb, RBAModelImpl* const newModel) + : impl_{} +{ + impl_.setArb(arb); + setModel(newModel); +} + +#ifdef RBA_USE_LOG +RBAArbitrator::Impl:: +Impl(RBAArbitrator* arb, + RBAModelImpl* newModel, RBALogManager* logManager) +{ + impl_.setArb(arb); + setModel(newModel); + RBALogManager::setLogManager(logManager); + // 引数logManagerがnullだとしても、rba外部からsetLogManager()されている可能性があるので、 + // 引数判定ではなく、getLogManager()で判定 + if (RBALogManager::getLogManager() != nullptr) { + impl_.setSimulationMode(true); + } +} +#endif + +RBAModelImpl* +RBAArbitrator::Impl:: +getModel() +{ + return impl_.getModel(); +} + +void +RBAArbitrator::Impl:: +setModel(RBAModelImpl* const newModel) +{ + std::lock_guard<std::recursive_mutex> lock {impl_.getMutex()}; + impl_.setModel(newModel); + impl_.getModel()->createSortedAllocatables(); + clearArbitration(); +} + +void +RBAArbitrator::Impl:: +initialize(std::list<std::string>& contexts) +{ + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + impl_.setRequestData(contexts, true); +} + +std::unique_ptr<RBAResult> RBAArbitrator::Impl::execute( + const std::string& contextName, const bool require) +{ + const std::lock_guard<std::recursive_mutex> lock {impl_.getMutex()}; + if (impl_.isValidContext(contextName) == false) { + // エラーの場合は、Resultのコピーを生成してエラーフラグをセットして返す + std::unique_ptr<RBAResultImpl> result {std::make_unique<RBAResultImpl>( + &impl_, std::make_unique<RBAResultSet>(*impl_.getBackupResultSet()))}; + result->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); + return std::move(result); + } else { + static_cast<void>(impl_.setRequestData(contextName, require, nullptr, + static_cast<std::uint32_t>(impl_.getRequestQue().size()))); + return impl_.arbitrateMain(); + } +} + +std::unique_ptr<RBAResult> RBAArbitrator::Impl::execute( + std::list<std::string>& contexts, const bool require) +{ + const std::lock_guard<std::recursive_mutex> lock {impl_.getMutex()}; + if (impl_.isValidContext(contexts) == false) { + // エラーの場合は、Resultのコピーを生成してエラーフラグをセットして返す + std::unique_ptr<RBAResultImpl> result {std::make_unique<RBAResultImpl>( + &impl_, std::make_unique<RBAResultSet>(*impl_.getBackupResultSet()))}; + result->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); + return std::move(result); + } else { + impl_.setRequestData(contexts, require); + return impl_.arbitrateMain(); + } +} + +std::unique_ptr<RBAResult> RBAArbitrator::Impl::execute( + const std::string& sceneName, + std::list<std::pair<std::string, std::int32_t>>& properties) +{ + const std::lock_guard<std::recursive_mutex> lock {impl_.getMutex()}; + // 引数チェック + if (impl_.isValidContext(sceneName) == false) { + // エラーの場合は、Resultのコピーを生成してエラーフラグをセットして返す + std::unique_ptr<RBAResultImpl> result {std::make_unique<RBAResultImpl>( + &impl_, std::make_unique<RBAResultSet>(*impl_.getBackupResultSet()))}; + result->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); + return std::move(result); + } else { + static_cast<void>(impl_.setRequestData(sceneName, true, &properties, + static_cast<std::uint32_t>(impl_.getRequestQue().size()))); + return impl_.arbitrateMain(); + } +} + +std::unique_ptr<RBAResult> +RBAArbitrator::Impl:: +setResultContentState(const std::string& allocatableName, + const std::string& contextName) +{ + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + RBAResultSet* const backupResultSetTmp {impl_.getBackupResultSet().get()}; + if (impl_.getReservedResultSet() == nullptr) { + impl_.setResult(std::make_unique<RBAResultImpl>(&impl_, + std::make_unique<RBAResultSet>(), + std::move(impl_.getBackupResultSet()))); + } else { + RBAResultSet* const reservedResultSetTmp {impl_.getReservedResultSet().get()}; + impl_.setResult(std::make_unique<RBAResultImpl>(&impl_, + std::move(impl_.getReservedResultSet()), + std::move(impl_.getBackupResultSet()))); + impl_.setReservedResultSet(std::make_unique<RBAResultSet>(*reservedResultSetTmp)); + } + impl_.setBackupResultSet(std::make_unique<RBAResultSet>(*backupResultSetTmp)); + + // find allocatable + const RBAAllocatable* alloc {nullptr}; + const RBAAreaImpl* const area {impl_.getModel()->findAreaImpl(allocatableName)}; + if(area != nullptr) { + alloc = area; + } + else { + const RBAZoneImpl* const zone {impl_.getModel()->findZoneImpl(allocatableName)}; + if(zone != nullptr) { + alloc = zone; + } + } + // find content state + const RBAContentState* state {nullptr}; + const RBAViewContentStateImpl* const viewState + {impl_.getModel()->findViewContentStateImpl(contextName)}; + if(viewState != nullptr) { + state = viewState; + } + else { + const RBASoundContentStateImpl* const soundState + {impl_.getModel()->findSoundContentStateImpl(contextName)}; + if(soundState != nullptr) { + state = soundState; + } + } + if( (alloc == nullptr) || (state == nullptr) ) { + // Unknown context or allocatable + impl_.getResult()->setStatusType(RBAResultStatusType::UNKNOWN_CONTENT_STATE); + return std::move(impl_.getResultRef()); + } + // Set alloc and state to result + const RBAContentState* const beforeContentState {alloc->getState()}; + const_cast<RBAAllocatable*>(alloc)->setState(state); + const_cast<RBAAllocatable*>(alloc)->setChecked(true); + impl_.getResult()->setActive(state, true); + impl_.getResult()->setContentState(alloc, state); + + // ---------------------------------------------------------- + // 調停後処理 + // ---------------------------------------------------------- + impl_.postArbitrate(); + + // オフライン制約を動かす +#ifdef RBA_USE_LOG + impl_.checkAllConstraints(); +#endif + + // ---------------------------------------------------------- + // コンテントの状態を更新する + // ---------------------------------------------------------- + if (beforeContentState != nullptr) { + // 要求されたアロケータブルに元々割り当てられていたコンテントの状態を更新する + dynamic_cast<RBAContent*>(beforeContentState->getOwner())->updateStatus(impl_.getResultRef().get()); + } + // 要求されたコンテントの状態を更新する + dynamic_cast<RBAContent*>(state->getOwner())->updateStatus(impl_.getResultRef().get()); + + // コンテントのキャンセル処理 + // C++版で追加した処理 + impl_.checkCancelContent(); + + // C++版で追加した処理 + // 表示エリア,非表示エリアの更新 + impl_.updateResult(); + + // 結果を生成 + impl_.createResultData(); + + // 現在の調停結果セットのバックアップを保存 + impl_.setBackupResultSet(impl_.getResult()->createBackupCurrentResultSet()); + // 次の調停結果セットを作成 + impl_.setNextResultSet(impl_.getResult()->createNextCurrentResultSet()); + + return std::move(impl_.getResultRef()); +} + +std::unique_ptr<RBAResult> +RBAArbitrator::Impl:: +cancelArbitration() +{ + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + if(impl_.getReservedResultSet() == nullptr) { + std::unique_ptr<RBAResultImpl> res + {std::make_unique<RBAResultImpl>(&impl_, + std::make_unique<RBAResultSet>())}; + res->setStatusType(RBAResultStatusType::CANCEL_ERROR); + return std::move(res); + } + + impl_.setResult( + std::make_unique<RBAResultImpl>(&impl_, + std::make_unique<RBAResultSet>(), + std::move(impl_.getReservedResultSet()))); + impl_.setBackupResultSet(impl_.getResult()->createBackupCurrentResultSet()); + impl_.setNextResultSet(impl_.getResult()->createNextCurrentResultSet()); + + return std::move(impl_.getResultRef()); +} + +void +RBAArbitrator::Impl:: +clearArbitration() +{ + std::lock_guard<std::recursive_mutex> lock {impl_.getMutex()}; + impl_.getCancelChecked().clear(); + impl_.setReservedResultSet(nullptr); + impl_.setBackupResultSet(std::make_unique<RBAResultSet>()); + for(const auto& scene : impl_.getModel()->getSceneImpls()) { + for(const std::string propertyName : scene->getPropertyNames()) { + const std::int32_t value {scene->getPropertyValue(propertyName)}; + impl_.getBackupResultSet()->setSceneProperty(scene, propertyName, value); + } + } + impl_.setNextResultSet( + std::make_unique<RBAResultSet>(*impl_.getBackupResultSet().get())); + impl_.setResult(std::make_unique<RBAResultImpl>( + &impl_, + std::make_unique<RBAResultSet>(*impl_.getBackupResultSet().get()))); + + impl_.getModel()->clearElementsStatus(); +} + +bool +RBAArbitrator::Impl:: +setScene( + const std::string& sceneName, const bool require, + std::list<std::pair<std::string, std::int32_t>>& properties) +{ + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + return impl_.setRequestData(sceneName, require, &properties); +} + +bool +RBAArbitrator::Impl:: +setContentState(const std::string& contextName, const bool require) +{ + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + const std::deque<std::unique_ptr<RBARequestQueMember>>& requestQue{impl_.getRequestQue()}; + std::uint32_t syncIndex{static_cast<std::uint32_t>(requestQue.size())}; + if (syncIndex > 0U ) { + const std::unique_ptr<RBARequestQueMember>& prevReq{requestQue.back()}; + if (prevReq->isOn() == require) { + syncIndex = prevReq->getSyncIndex(); + } + } + return impl_.setRequestData(contextName, require, nullptr, syncIndex); +} + +bool +RBAArbitrator::Impl:: +setAllocatableResult(const std::string& allocatableName, + const std::string& contextName) +{ + std::lock_guard<std::recursive_mutex> lock {impl_.getMutex()}; + // Get allocatable + const auto alloc = impl_.getModel()->findAllocatable(allocatableName); + if(alloc == nullptr) { + return false; + } + + // Get context + const auto state = impl_.getModel()->findContentState(contextName); + if(state == nullptr) { + return false; + } + + // Set state to allocatable + const auto beforeContentState = alloc->getState(); + const_cast<RBAAllocatable*>(alloc)->setState(state); + RBAResultSet* const nextResultSet {impl_.getNextResultSet().get()}; + RBAResultSet* const prevResultSet {impl_.getBackupResultSet().get()}; + nextResultSet->setContentState(alloc, state); + prevResultSet->setContentState(alloc, state); + nextResultSet->setActive(state, true); + prevResultSet->setActive(state, true); + + /////////////////////////// + // コンテントの状態を更新する + /////////////////////////// + // コンテントの状態を更新は前回の状態を見て今回の遷移先を決定するので、 + // Resultを作成して、状態を更新している + impl_.setResult(std::make_unique<RBAResultImpl>( + &impl_, + std::make_unique<RBAResultSet>(*impl_.getBackupResultSet()), + std::make_unique<RBAResultSet>(*impl_.getNextResultSet()))); + RBAContent* const content {dynamic_cast<RBAContent*>(state->getOwner())}; + content->updateRequestStatus(impl_.getResult()->getCurResultSet().get(), true); + if (beforeContentState != nullptr) { + // 要求されたアロケータブルに元々割り当てられていたコンテントの状態を更新する + dynamic_cast<RBAContent*>(beforeContentState->getOwner())->updateStatus(impl_.getResultRef().get()); + } + // 要求されたコンテントの状態を更新する + content->updateStatus(impl_.getResultRef().get()); + + impl_.setBackupResultSet(std::make_unique<RBAResultSet>(*impl_.getResult()->getPreResultSet())); + impl_.setNextResultSet(impl_.getResult()->createNextCurrentResultSet()); + + return true; +} + +bool +RBAArbitrator::Impl:: +evaluate(const RBAExpression* const expression) +{ + if(expression == nullptr) { + return false; + } + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + RBAConstraintInfo info; + // 制約式の評価 + return expression->execute(&info, &impl_); +} + +const RBARuleObject* +RBAArbitrator::Impl:: +evaluateObject(const RBAExpression* const expression) +{ + if(expression == nullptr) { + return nullptr; + } + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + RBAConstraintInfo info; + // 制約式の評価 + const RBARuleObject* const ruleObj + {expression->getReferenceObject(&info, &impl_)}; + if (ruleObj != nullptr) { + return ruleObj->getRawObject(); + } else { + return nullptr; + } +} + +int32_t +RBAArbitrator::Impl:: +evaluateValue(const RBAExpression* const expression) +{ + if(expression == nullptr) { + return -99; + } + const std::lock_guard<std::recursive_mutex> lock{impl_.getMutex()}; + RBAConstraintInfo info; + // 制約式の評価 + return expression->getValue(&info, &impl_); +} + +RBAArbitratorImpl* +RBAArbitrator::Impl:: +getImpl() +{ + return &impl_; +} + +// @Deviation (EXP55-CPP) +// 【ルールに逸脱している内容】 +// このconstメンバ関数は、メンバ変数を変更します。 +// 【ルールを逸脱しても問題ないことの説明】 +// constメンバ関数であるsatisfiesConstraintsで、thisからconstを外して、使用しているが、 +// execute()では、キャッシュ値しか変更しないので、問題なし。 +bool +RBAArbitratorImpl:: +satisfiesConstraints() const +{ + const std::lock_guard<std::recursive_mutex> lock{mutex_}; + // 評価用にresult_を使うため、実際のresult_を一時保管する + std::unique_ptr<RBAResultImpl> tmpResult {std::move(result_)}; + result_ = std::make_unique<RBAResultImpl>( + this, + std::make_unique<RBAResultSet>(*(reservedResultSet_.get())), + std::make_unique<RBAResultSet>(*(resultSetForSatisfiesConstraints_.get()))); + bool result {true}; + for(const RBAConstraintImpl*& constraint : model_->getConstraintImpls()) { + if (constraint->isRuntime() == true) { + // 引数のRBAArbitratorImplの実体は、内部状態を変更するメソッド呼び出しを + // 使用するため、constにできない。そのため、ここではconst_castで渡して + // constを外している。 + result = const_cast<RBAConstraintImpl*>(constraint)->execute(const_cast<RBAArbitratorImpl*>(this)); + if (result == false) { + break; + } + } + } + result_ = std::move(tmpResult); + return result; +} + +/** + * 調停実行 + */ +std::unique_ptr<RBAResult> +RBAArbitratorImpl::arbitrateMain() +{ + // cancelArbitration()されたときのために調停前の要求状態を保存 + reservedResultSet_ = std::make_unique<RBAResultSet>(*backupResultSet_); + + // 要求毎の差分調停 + if (requestQue_.empty()) { + // differenceArbitrateで使用するのでここで、Resultを用意しておく + result_ = std::make_unique<RBAResultImpl>(this, + std::move(backupResultSet_), + std::move(nextResultSet_)); + // 引数なしの調停要求。この中のonDisplayedにより、requestQue_にキューイングされる可能性がある + differenceArbitrate(); + } + if (!requestQue_.empty()) { + result_ = std::make_unique<RBAResultImpl>(this, + std::move(backupResultSet_), + std::move(nextResultSet_)); + do { + const std::unique_ptr<RBARequestQueMember> request {std::move(requestQue_.front())}; + requestQue_.pop_front(); + result_->setActive(request->getContentState(), request->isOn()); + // コンテントの状態を更新する + RBAContent* const content {dynamic_cast<RBAContent*>(request->getContentState()->getOwner())}; + content->updateRequestStatus(result_->getCurResultSet().get(), request->isOn()); + if (requestQue_.empty()) { + differenceArbitrate(); + if (!requestQue_.empty()) { + // 次のdifferenceArbitrate()に備えて、更新しておく。 + result_ = std::make_unique<RBAResultImpl>(this, + std::move(backupResultSet_), + std::move(nextResultSet_)); + } + } else if (requestQue_.front()->getSyncIndex() != request->getSyncIndex()) { + differenceArbitrate(); + // 次のdifferenceArbitrate()に備えて、更新しておく。 + result_ = std::make_unique<RBAResultImpl>(this, + std::move(backupResultSet_), + std::move(nextResultSet_)); + } else { + // 何もしない + } + } while (!requestQue_.empty()); + } + + result_ = std::make_unique<RBAResultImpl>( + this, std::make_unique<RBAResultSet>(*reservedResultSet_), + result_->createBackupCurrentResultSet()); + + // コンテントのキャンセル処理 + // C++版で追加した処理 + checkCancelContent(); + + // C++版で追加した処理 + // 表示エリア,非表示エリアの更新 + updateResult(); + +#ifdef RBA_USE_LOG + RBALogManager::setType(RBALogManager::TYPE_RESULT); + logResultArbitration(); + + setLogToResult(); + RBALogManager::setType(RBALogManager::TYPE_NOTHING); +#endif + + createResultData(); + // 現在の調停結果セットのバックアップを保存 + backupResultSet_ = result_->createBackupCurrentResultSet(); + // 次の調停結果セットを作成 + nextResultSet_ = result_->createNextCurrentResultSet(); + + // 保管用にresult_を使うため、戻り値のresult_を別名にする + auto retResult = std::move(result_); + + // 調停中以外の場合で、調停結果を利用することがあるため、調停結果を保持しておく + result_ = std::make_unique<RBAResultImpl>(retResult.get()); + + // std::unique_ptr<RBAResultImpl>をstd::unique_ptr<RBAResult>にキャストするので + // std::move()がないとコンパイルエラーになる + return std::move(retResult); +} + +bool +RBAArbitratorImpl:: +isValidContext(const std::string& context) +{ + if (context != "") { + const RBAContentState* const state {model_->findContentState(context)}; + if (state == nullptr) { + const RBASceneImpl* const scene {model_->findSceneImpl(context)}; + if (scene == nullptr) { + return false; + } + } + } + + return true; +} + +bool +RBAArbitratorImpl:: +isValidContext(std::list<std::string>& contexts) +{ + for(const std::string contextName : contexts) { + if(isValidContext(contextName) == false) { + return false; + } + } + + return true; +} + +/** + * 入力情報を反映 + */ + +bool +RBAArbitratorImpl::setRequestData( + const std::string& context, bool require, + std::list<std::pair<std::string, std::int32_t>>* const properties, + std::uint32_t syncIndex) +{ + bool isSet {false}; + if (context != "") { + // コンテントステートが指定された場合 + // contextNameがコンテント名のみの場合は、先頭のコンテントステートを取り出す + const RBAContentState* state {model_->findContentState(context)}; + if (state != nullptr) { + requestQue_.push_back( std::make_unique<RBARequestQueMember>(state, require, syncIndex)); + isSet = true; + } else { + // シーンが指定された場合 + const RBASceneImpl* const scene {model_->findSceneImpl(context)}; + if (scene != nullptr) { + nextResultSet_->setActive(scene, require); // 次の調停用 + result_->setActive(scene, require); // 次の調停前にResultを参照されたとき用 + isSet = true; + if (properties != nullptr) { + for (auto& p : *properties) { + const RBAAbstractProperty* const ap {scene->getProperty(p.first)}; + if (ap != nullptr) { + nextResultSet_->setSceneProperty(ap, p.second); // 次の調停用 + result_->setSceneProperty(ap, p.second); // 次の調停前にResultを参照されたとき用 + } + } + } + } + } + } + return isSet; +} + +void +RBAArbitratorImpl::setRequestData(const RBAContentState* state, + bool require) +{ + if (requestQue_.empty()){ + requestQue_.push_back( std::make_unique<RBARequestQueMember>(state, require, 0U)); + } else { + requestQue_.push_back( std::make_unique<RBARequestQueMember>(state, require, requestQue_.back()->getSyncIndex())); + } +} + +void +RBAArbitratorImpl::setRequestData(const RBAContent* const content, + bool require) +{ + if (requestQue_.empty()){ + requestQue_.push_back( std::make_unique<RBARequestQueMember>(content->getStates().front(), require, 0U)); + } else { + requestQue_.push_back( std::make_unique<RBARequestQueMember>(content->getStates().front(), require, requestQue_.back()->getSyncIndex())); + } +} + +void +RBAArbitratorImpl::setActive(const RBASceneImpl* const scene, const bool require) +{ + if (nextResultSet_ != nullptr) { + // onRequest、onWithdrawnでonSceneされるときはnextResultSet_を更新する + nextResultSet_->setActive(scene, require); + } else { + result_->setActive(scene, require); + } +} + +void +RBAArbitratorImpl::setSceneProperty(const RBAAbstractProperty* const prop, const std::int32_t value) +{ + if (nextResultSet_ != nullptr) { + // onRequest、onWithdrawnでsetされるときはnextResultSet_を更新する + nextResultSet_->setSceneProperty(prop, value); + } else { + result_->getCurResultSet()->setSceneProperty(prop, value); + } +} + +void +RBAArbitratorImpl::setRequestData(std::list<std::string>& contexts, + const bool require) +{ + const std::uint32_t syncIndex {static_cast<std::uint32_t>(requestQue_.size())}; + for (auto& c : contexts) { + static_cast<void>(setRequestData(c, require, nullptr, syncIndex)); + } +} + +/** + * 含意がfalse時に再調停を行える拡張版の調停を行う + * @param areas + */ +void +RBAArbitratorImpl:: +arbitrate(std::list<RBAAllocatable*>& allocatables) +{ + LOG_arbitrateAreaLogLine("----Arbitrate----"); + std::set<const RBAAllocatable*> revisitedInitSet; + + std::set<const RBAAllocatable*> revisited; + for (auto& alloc : allocatables) { + revisited = revisitedInitSet; + // ------------------------------------------------------------------------- + // 無限ループ対策として調停の中で対象アロケータブルに影響を与えた他アロケータブルの + // 登録は一回までに制限させるための情報を生成 + // ------------------------------------------------------------------------- + RBAAffectInfo affectInfo; + LOG_arbitrateAreaLogLine( + alloc->getSymbol() + "[" + alloc->getElementName() + "] check start"); + arbitrateAllocatable(alloc, revisited, 0, &affectInfo, nullptr); + } + for (auto& a : model_->getSortedAllocatables()) { + result_->setContentState(a, a->getState()); + } +} + +/** + * アロケータブルの調停を再帰的に行う + * @param allocatable 調停したいアロケータブル + * @param revisited 再調停済のアロケータブル + * @param nest 再調停のネスト階層（一番初めの調停は0） + * @param affectInfo allocatableが影響を与えたアロケータブルの情報 + */ +void RBAArbitratorImpl::arbitrateAllocatable( + RBAAllocatable* allocatable, + std::set<const RBAAllocatable*>& revisited, + const std::int32_t nest, + RBAAffectInfo* const affectInfo, + RBARollbacker* const parentRollbacker) +{ +#ifdef RBA_USE_LOG + RBALogManager::setIndent(nest); +#endif + // この変数が定義されるまでの再帰処理中に、今回の調停対象アロケータブルが影響を与えたアロケータブル + // 再調停前の状態を覚えておく + std::set<const RBAAllocatable*> affectAllocatables; + affectAllocatables.insert(allocatable->getAllocatablesAffectedByYou().begin(), allocatable->getAllocatablesAffectedByYou().end()); + + const RBAContentState* const beforeState {allocatable->getState()}; + + // 対象アロケータブルのコンテンツ割当をチェック済とする + allocatable->setChecked(true); + // 調停ポリシーでソートされたコンテンツ状態を取得(Activeな要求だけが入る) + std::list<const RBAContentState*> contentStates; + getSortedContentStates(allocatable, contentStates); + for(const RBAContentState* const contentState : contentStates) { + // エリアにコンテンツを割り当てる + allocatable->setState(contentState); +#ifdef RBA_USE_LOG + { + std::string str = " Content["; + if (contentState == nullptr) { + str += "null"; + } else { + str += contentState->getOwner()->getElementName() + "::" + + contentState->getElementName(); + } + str += "] check online constraints start"; + RBALogManager::arbitrateContentLogLine(str); + } +#endif + bool isSkipped {false}; + const bool isPassed {checkConstraintAndReArbitrate( + allocatable, revisited, nest, affectInfo, parentRollbacker, + allocatable->getConstraints(), &isSkipped, false)}; + if (isPassed == true) { + + // ---------------------------------------------------------- + // コンテンツ割り当て処理後に制約式によって自アロケータブルが隠蔽されるべきかをチェック + // contentValue()があるため、コンテンツ未割り当てでも確認する + // ---------------------------------------------------------- +#ifdef RBA_USE_LOG + std::string alloSymbol = allocatable->getSymbol(); + std::string alloName = allocatable->getElementName(); + if (allocatable->isArea() == true) { + LOG_arbitrateAreaLogLine( + " check online constraints to confirm area hidden state"); + } else { + LOG_arbitrateAreaLogLine( + " check online constraints to confirm zone muted state"); + } +#endif + // 対象アロケータブルのhiddenをチェック済とする + allocatable->setHiddenChecked(true); + // 対象アロケータブルのhiddenをfalseにする + allocatable->setHidden(false); + bool hiddenIsPassed {checkConstraintAndReArbitrate( + allocatable, revisited, nest, affectInfo, parentRollbacker, + allocatable->getHiddenFalseCheckConstraints(), &isSkipped, !allocatable->isZone())}; + if (hiddenIsPassed == false) { + allocatable->setHidden(true); + hiddenIsPassed = checkConstraintAndReArbitrate( + allocatable, revisited, nest, affectInfo, parentRollbacker, + allocatable->getHiddenTrueCheckConstraints(), &isSkipped, !allocatable->isZone()); + if (hiddenIsPassed == false) { + // アロケータブルの隠蔽状態をクリアする + allocatable->setHiddenChecked(false); + } else { + LOG_arbitrateAreaLogLine( + alloSymbol + "[" + alloName + "] change " + + allocatable->getHiddenSymbol()); + } + } + + // ------------------------------------- + // ゾーンは隠蔽(ミュート)後にアッテネートを判定する + // ------------------------------------- + bool attenuateIsPassed {true}; + if (allocatable->isZone()) { + RBAZoneImpl* const zone {dynamic_cast<RBAZoneImpl*>(allocatable)}; + // 対象ゾーンのアッテネートをチェック済とする + zone->setAttenuateChecked(true); + // 対象ゾーンのアッテネートをfalseにする + zone->setAttenuated(false); + LOG_arbitrateAreaLogLine( + " check online constraints to confirm zone attenuated state"); + attenuateIsPassed = checkConstraintAndReArbitrate( + allocatable, revisited, nest, affectInfo, parentRollbacker, + allocatable->getAttenuateFalseCheckConstraints(), &isSkipped, true); + if (attenuateIsPassed == false) { + zone->setAttenuated(true); + attenuateIsPassed = checkConstraintAndReArbitrate( + allocatable, revisited, nest, affectInfo, parentRollbacker, + allocatable->getAttenuateTrueCheckConstraints(), &isSkipped, true); + if (attenuateIsPassed == false) { + allocatable->setAttenuateChecked(false); + } else { + LOG_arbitrateAreaLogLine( + alloSymbol + "[" + alloName + "] change attenuated"); + } + } + } +#ifdef RBA_USE_LOG + { + std::string str = alloSymbol + "[" + alloName + "] "; + if (allocatable->isArea() == true) { + str += "displays"; + } else { + str += "outputs"; + } + str += " Content["; + const RBAContentState* state = allocatable->getState(); + if (state == nullptr) { + str += "null"; + } else { + str += state->getOwner()->getElementName() + "::" + + state->getElementName(); + } + str += "] " + allocatable->getHiddenSymbol() + "[" + + RBALogManager::boolToString(allocatable->isHidden()) + "]"; + if (allocatable->isZone() == true) { + str += " attenuated[" + + RBALogManager::boolToString(allocatable->isAttenuated()) + "]"; + } + str += "\n"; + LOG_arbitrateAreaLogLine(str); + } +#endif + if ((hiddenIsPassed == true) && (attenuateIsPassed == true)) { + break; + } + } + } + // --------------------------------------------------------------------- + // 影響を与えたアロケータブルを再調停 + // --------------------------------------------------------------------- + if ((beforeState != allocatable->getState()) + || allocatable->isHidden() + || allocatable->isAttenuated()) { + + // コンテント割当時には隠蔽ではない状態で再調停しているので、 + // 隠蔽、アッテネート状態になった場合、コンテント割り当て時の再調停で影響を与えたアロケータブルも再調停が必要 + // 影響を与えたエリアが増えた分を更新する + if (allocatable->isHidden() || allocatable->isAttenuated()) { + for (const auto& a : allocatable->getAllocatablesAffectedByYou()) { + static_cast<void>(affectAllocatables.insert(a)); + } + } + + // 影響エリア/ゾーンの再調停対象に、再調停元のエリア/ゾーン(再調停のネストがある場合そのすべての再調停元を含む)が、 + // 調停中のエリア/ゾーンに影響を受けたエリア/ゾーンとなった場合は、そのエリア/ゾーンは再調停対象から除外して影響エリア/ゾーンの再調停を行う。 + // また、影響エリア/ゾーンがその時点で、未調停アロケータブルだった場合も、 + // 通常手番の調停時に調停すればよいため、影響エリアの再調停対象から除外する。 + for (const auto& a : revisited) { + if (affectAllocatables.find(a) != affectAllocatables.end() + || (!a->isChecked())) { + static_cast<void>(affectAllocatables.erase(a)); + } + } + std::list<const RBAAllocatable*> sortedAllocatables(affectAllocatables.begin(),affectAllocatables.end()); + sortedAllocatables.sort(&RBAAllocatable::compareIndex); + if (parentRollbacker != nullptr) { + std::shared_ptr<RBARollbacker> rollbacker {std::make_shared<RBARollbacker>()}; + parentRollbacker->addChild(rollbacker); + rollbacker->backup(sortedAllocatables); + } + + for (auto& affect : sortedAllocatables) { + // これから再調停するアロケータブルを、調停中アロケータブルの影響を与えたアロケータブルから削除 + allocatable->removeAffectAllocatable(affect); + } + static_cast<void>(revisited.insert(allocatable)); // 調停済みエリアに追加する + for (auto& affectAllocatable : sortedAllocatables) { + // @Deviation (EXP55-CPP,Rule-5_2_5,A5-2-3) + // 【ルールに逸脱している内容】 + // This is a 'const_cast' expression that strips away a 'const' or 'volatile' qualifier. + // 【ルールを逸脱しても問題ないことの説明】 + // 設計書上、問題無いことを確認出来ており、改修にはクラス設計の見直しが必要なため、今は修正しない。 + RBAAllocatable* allo {const_cast<RBAAllocatable*>(affectAllocatable)}; + + // これから影響アロケータブルの再調停を実施するアロケータブルのチェックフラグを初期化 + // 影響アロケータブルを事前にまとめてクリアすると、 + // 先に実施した影響アロケータブルの再調停中の制約式評価でスキップが発生し、 + // その後実施した影響アロケータブルの再調停中に、再調停が動いてしまうため、 + // 影響アロケータブルの再調停前に個別にクリアする + allo->clearChecked(); + + LOG_arbitrateAreaLogLine( " " + + affectAllocatable->getSymbol() + "[" + + affectAllocatable->getElementName() + + "] affect allocatable check start"); + // @Deviation (MEM05-CPP,Rule-7_5_4,A7-5-2) + // 【ルールに逸脱している内容】 + // arbitrateAllocatable()を再帰呼び出ししている + // 【ルールを逸脱しても問題ないことの説明】 + // 影響エリアの再調停に必要な処理であり、無限ループ防止処理を入れているため、 + // スタックオーバーフローすることはなく、問題無い。 + arbitrateAllocatable(allo, revisited, nest + 1, affectInfo, + parentRollbacker); + } + for(const RBAAllocatable* const revisitAllocatable : sortedAllocatables) { + static_cast<void>(revisited.erase(revisitAllocatable)); + } + } + + // -------------------------------------------------- + // 再調停の中での無限ループ防止用の一時的な影響情報を削除する + // -------------------------------------------------- + affectInfo->removeAffectInfo(allocatable); +#ifdef RBA_USE_LOG + RBALogManager::setIndent(nest-1); +#endif +} + +/** + * 調停ポリシーに基づいてコンテンツ状態のソートを行う + * @param allocatable + * @param contentStates + * @return sort成否 + */ +bool +RBAArbitratorImpl:: +sortContentStates(const RBAAllocatable* const allocatable, + std::list<const RBAContentState*>& states) const +{ + bool isResult {true}; + switch(allocatable->getAllocatableArbitrationPolicy()) { + case RBAArbitrationPolicy::FIRST_COME_FIRST: + states.sort(&RBAContentState::compareFirstComeFirst); + break; + case RBAArbitrationPolicy::LAST_COME_FIRST: + states.sort(&RBAContentState::compareLastComeFirst); + break; + case RBAArbitrationPolicy::PRIORITY_FIRST_COME_FIRST: + states.sort(&RBAContentState::comparePriorityFirstComeFirst); + break; + case RBAArbitrationPolicy::DEFAULT: + case RBAArbitrationPolicy::PRIORITY_LAST_COME_FIRST: + states.sort(&RBAContentState::comparePriorityLastComeFirst); + break; + default: + isResult = false; + break; + } + + return isResult; +} + +/** + * 判定NG制約から再調停リストを取得する + * @param totalRevisitAllocatables + * @param allocatable + * @param falseConstraints + * @param revisited + */ +void +RBAArbitratorImpl:: +collectRevisitAllocatable(std::list<const RBAAllocatable*>* const totalRevisitAllocatables, + RBAAllocatable*& allocatable, + std::list<RBAConstraintImpl*>& falseConstraints, + std::set<const RBAAllocatable*>& revisited) +{ + std::set<const RBAAllocatable*> revisitAllocatablesSet; + + // 再調停をすべきかを判定NGだった制約から判断する + for(RBAConstraintImpl*& constraint : falseConstraints) { + // 制約情報取得 + const RBAConstraintInfo* const info {constraint->getInfo()}; + // 再調停候補のアロケータブル + std::set<const RBAAllocatable*> rightFalseAllocatables; + + if (info->needsRearbitrationFor(allocatable)) { + info->collectRearbitrationTargetFor(allocatable, rightFalseAllocatables, false); + } + if (rightFalseAllocatables.empty()) { + // 含意でない制約式 + // "現在調停中のアロケータブル"がより"低優先度のアロケータブル"に調停負けしてしまうことを防ぐために、 + // "再調停候補のアロケータブル"に"低優先度のアロケータブル"が含まれている場合は"低優先度のアロケータブル"を再調停する。 + // 調停は優先度順に行われるので、"低優先度のアロケータブル"が"再調停候補のアロケータブル"に含まれることは通常ないが、 + // "低優先度のアロケータブル"が調停された後の"現在調停中のアロケータブル"の再調停で含まれる。 + info->collectFalseAllocatables(rightFalseAllocatables); + bool isContainsLowPriorityAllocatable {false}; + for(const RBAAllocatable* const rightFalseAllocatable + : rightFalseAllocatables) { + if(RBAAllocatable::compareIndex(allocatable,rightFalseAllocatable)) { // indexは優先度の高いアロケータブルほど小さい + isContainsLowPriorityAllocatable = true; + break; + } + } + if(!isContainsLowPriorityAllocatable) { + continue; + } + } + + // 調停中のアロケータブルを再調停対象から外す + static_cast<void>(rightFalseAllocatables.erase(allocatable)); + + // 再調停候補のアロケータブルが、1つでも再調停済なら再々調停は無し。次のコンテンツの割り当てに移る + for(const RBAAllocatable* const rightFalseAllocatable : rightFalseAllocatables) { + if(revisited.find(rightFalseAllocatable) != revisited.end()) { + return; + } + } + + // 再調停アロケータブルを設定 + for(const RBAAllocatable* const alloc : rightFalseAllocatables) { + static_cast<void>(revisitAllocatablesSet.insert(alloc)); + } + } + + // 再調停アロケータブルがある + if(!(revisitAllocatablesSet.empty())) { + // std::setをstd::listに詰め替え + static_cast<void>(totalRevisitAllocatables->insert(totalRevisitAllocatables->end(), revisitAllocatablesSet.begin(), revisitAllocatablesSet.end())); + // 再調停エリアを優先度に基づいて低い順にソートする + // モデルの並び順も考慮するのでindex比較でのソートが必要 + totalRevisitAllocatables->sort(&RBAAllocatable::compareIndex); + } +} + +/** + * 調停負けの要求キャンセルをするために全コンテント状態のキャンセル確認をする + */ +void +RBAArbitratorImpl:: +postArbitrate() +{ +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine("----Cancel Request----"); +#endif + for(const RBAContentState* const state : model_->getContentStates()) { +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine("Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] check start"); +#endif + static_cast<void>(cancelChecked_.insert(state)); + if(!result_->isActive(state)) { +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine(" Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] is not Active skip"); +#endif + continue; + } + if(result_->isAlreadyOutputting(state)) { +#ifdef RBA_USE_LOG + std::string contTypeName; + if(state->isViewContentState()) { + contTypeName = "Visible"; + } + else { + contTypeName = "Sounding"; + } + RBALogManager::cancelRequestLogLine(" Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] is "+contTypeName+" skip"); +#endif + continue; + } + + changeContentStateCancelWithPolicy(state); + } + +#ifdef RBA_USE_LOG + // 要求キャンセルのカバレッジ向けログ出力 + for(const RBAContentState* state : model_->getContentStates()) { + std::string contentName = state->getOwner()->getElementName(); + std::string stateName = state->getElementName(); + std::string canceled = isCancel(state) ? "t" : "f"; + RBALogManager::coverageCanceledRequestLogLine( + contentName + "," + stateName + ',' +canceled); + } +#endif +} + +/** + * 非表示であるコンテント状態のキャンセル情報を調停結果とキャンセルポリシーに + * 基づいて変更する + * @param state + */ +void +RBAArbitratorImpl:: +changeContentStateCancelWithPolicy(const RBAContentState* const state) +{ + switch(dynamic_cast<RBAContent*>(state->getOwner())->getContentLoserType()) { + case RBAContentLoserType::GOOD_LOSER: +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine(" Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] is Canceled because GOOD_LOSER"); +#endif + setCancel(state, true); + break; + case RBAContentLoserType::NEVER_GIVEUP: +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine(" Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] is not Canceled because NEVER_GIVEUP"); +#endif + setCancel(state, false); + break; + case RBAContentLoserType::DO_NOT_GIVEUP_UNTIL_WIN: + if(state->isModelElementType(RBAModelElementType::ViewContentState)) { + if(result_->isPreVisible(dynamic_cast<const RBAViewContentStateImpl*>(state))) { +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine(" Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] is Canceled because DO_NOT_GIVEUP_UNTIL_WIN"); +#endif + setCancel(state, true); + } else { +#ifdef RBA_USE_LOG + RBALogManager::cancelRequestLogLine(" Content["+ + state->getOwner()->getElementName()+"::"+ + state->getElementName()+ + "] is not Canceled because DO_NOT_GIVEUP_UNTIL_WIN"); +#endif + setCancel(state, false); + } + } + else { + if(result_->isPreSounding(dynamic_cast<const RBASoundContentStateImpl*>(state))) { + setCancel(state, true); + } else { + setCancel(state, false); + } + } + break; + default: + break; + } +} + +#ifdef RBA_USE_LOG +void +RBAArbitratorImpl:: +checkAllConstraints() +{ + std::string log; + LOG_arbitrateConstraintLogLine("----Check All Constraint----"); + + if(simulationMode_) { + for(const RBAConstraintImpl* constraint : model_->getConstraintImpls()) { + bool result = const_cast<RBAConstraintImpl*>(constraint)->execute(this); + if(result == false) { + result_->addFailedConstraint(constraint); + } + if (constraint->isRuntime() == true) { + log += "online "; + } else { + log += "offline "; + } + log += "constraint[" + constraint->getElementName() + "] "; + log += "result[" + RBALogManager::boolToString(result) + "]\n"; + } + if (log.empty() != true ) { + log.erase(log.end() - 1, log.end()); //最後の改行を削除する + } + } + +} +#endif + +bool +RBAArbitratorImpl:: +isDefeat(const RBAContentState* const winner, const RBAContentState* const loser) const +{ + bool loserVisible {false}; // 負けコンテンツの表示有無 + bool winnerVisible {false}; // 勝ちコンテンツの表示有無 + const RBAContent* const loserContent {dynamic_cast<RBAContent*>(loser->getOwner())}; + const RBAContent* const winnerContent {dynamic_cast<RBAContent*>(winner->getOwner())}; + + // -------------------------------------------------------------------- + // 判定の優先順位 + // loserが表示されているならfalse + // winnerが全エリア調停済にも関わらず表示されていないならfalse + // loserが表示されておらず全エリアが調停済で、winnerが表示されているならtrue + // -------------------------------------------------------------------- + for(const RBAAllocatable* const allocatable : loserContent->getAllocatables()) { + // エリアが隠蔽されている + if(allocatable->isHiddenChecked() && allocatable->isHidden()) { + continue; + } + // loserが表示されている + const RBAContentState* const state {result_->getContentState(allocatable)}; + if(state == loser) { + loserVisible = true; + break; + } + } + for(const RBAAllocatable* const allocatable : winnerContent->getAllocatables()) { + // エリアが隠蔽されている + if(allocatable->isHiddenChecked() && allocatable->isHidden()) { + continue; + } + // winnerが表示されている + const RBAContentState* const state {result_->getContentState(allocatable)}; + if(state == winner) { + winnerVisible = true; + } + } + if(loserVisible) { + // loserが表示されているならfalse + return false; + } + else if(!winnerVisible) { + // winnerが全エリア調停済にも関わらず表示されていないならfalse + return false; + } + else { + // loserが表示されておらず全エリアが調停済で、winnerが表示されているならtrue + return true; + } +} + +void +RBAArbitratorImpl:: +checkCancelContent() const +{ + for(const RBAViewContentState* const viewState + : result_->getActiveViewContentStates()) { + if(result_->isCancel(viewState)) { + result_->cancelContentState(dynamic_cast<const RBAContentState*>(viewState)); + } + } + for(const RBASoundContentState* const soundState + : result_->getActiveSoundContentStates()) { + if(result_->isCancel(soundState)) { + result_->cancelContentState(dynamic_cast<const RBAContentState*>(soundState)); + } + } +} + +/** + * @brief 表示アロケータブルリスト、非表示アロケータブルリストを更新する + */ +void +RBAArbitratorImpl:: +updateResult() +{ + // キャンセルしたコンテントのアクティブを解除する + result_->updateActiveContentStates(); + + // エリアの座標を更新する + for(auto& area : result_->getVisibleAreas()) { + const RBAAreaImpl* const areaImpl {dynamic_cast<const RBAAreaImpl*>(area)}; + const auto posCont = model_->findPositionContainerImpl(area->getName()); + const auto sizeObj = result_->getSize(area); + if((posCont != nullptr) && (sizeObj != nullptr)) { + const auto offset = posCont->getOffset(sizeObj->getName()); + const_cast<RBAAreaImpl*>(areaImpl)->setOffsetX(offset.first); + const_cast<RBAAreaImpl*>(areaImpl)->setOffsetY(offset.second); + } + } + + // 出力コンテントステートリストを設定 + std::set<const RBAContentState*> outputtingContentStateSet; + for(auto& alloc : result_->getOutputtingAllocatables()) { + const auto state = result_->getAllocatedContentState(alloc); + static_cast<void>(outputtingContentStateSet.insert(state)); + } + for(auto& state : outputtingContentStateSet) { + static_cast<void>(result_->addOutputtingContentState(state)); + } + + for(auto& state : result_->getActiveContentStates()) { + // 表示要求で割り当てられたエリアが表示されていなければStanbyContentに設定 + const auto allocs = result_->getAllocatable(state); + if(allocs.empty()) { + result_->addStandbyContent(dynamic_cast<RBAContent*>(state->getOwner())); + } + } +} + +/** + * ### 結果情報を生成する + * + * アニメーション情報(RBAViewAction)を生成し、RBAResultのviewActionsリスト + * に登録する。\n + * アニメーション情報の生成パターンは以下の通り。 + * + * | エリアA(pre) | エリアB(pre) | エリアA(cur) | エリアB(cur) | type | + * |:-: |:-: |:-: |:-: |:---- | + * | (none) | - | **content** | - | TRANSITON_ADD | + * | **content** | - | (none) | - | TRANSITION_REMOVE | + * | **contentA** | - | **contentB** | - | TRANSITION_REPLACE | + * | **content** | (none) | (none) | **content** | MOVE | + */ +void +RBAArbitratorImpl:: +createResultData() +{ + std::list<std::unique_ptr<RBAViewAction>> actions; + // 変化がなかったエリアはチェックしておく + std::set<const RBAArea*> stableAreas; + for(const RBAArea* const preArea : result_->getPreVisibleAreas()) { + if(result_->isVisible(preArea)) { + const RBAViewContent* const curContent {result_->getContentState(preArea)->getOwner()}; + const RBAViewContent* const preContent {result_->getPreContentState(preArea)->getOwner()}; + if(curContent == preContent) { + static_cast<void>(stableAreas.insert(preArea)); + } + } + } + // MOVEを調べる + std::set<const RBAViewContent*> movedContents; + for(const RBAArea* curArea : result_->getVisibleAreas()) { + // 今回の表示エリア + const RBAViewContentState* curState {result_->getContentState(curArea)}; + const RBAViewContent* const curContent {curState->getOwner()}; + // stableなエリアをスキップ + if(stableAreas.find(curArea) != stableAreas.end()) { + continue; + } + for(const RBAArea* preArea : result_->getPreVisibleAreas()) { + // stableエリアは変化したと見なさない + if (stableAreas.find(preArea) != stableAreas.end()) { + continue; + } + // 前回の表示エリア + const RBAViewContent* const preContent {result_->getPreContentState(preArea)->getOwner()}; + if(curContent == preContent) { + // 一致したコンテンツがあればMOVE + actions.push_back(std::make_unique<RBAViewMove>(preArea, curArea, + curState)); + // 移動したコンテントはチェック + static_cast<void>(movedContents.insert(curState->getOwner())); + } + } + } + // REMOVEを調べる + for(const RBAArea* preArea : result_->getPreVisibleAreas()) { + // stableなエリアをスキップ + if(stableAreas.find(preArea) != stableAreas.end()) { + continue; + } + const RBAViewContentState* preState {result_->getPreContentState(preArea)}; + // MOVEのコンテンツならスキップ + if(movedContents.find(preState->getOwner()) + != movedContents.end()) { + continue; + } + if(!result_->isVisible(preArea)) { + // 前回表示されていたエリアが今回非表示ならばREMOVE + actions.push_back(std::make_unique<RBAViewTransition>( + RBAViewActionType::TRANSITION_REMOVE, preArea, preState)); + } + } + // MOVE絡みのADD/REMOVEとREPLACEを調べる + for(const RBAArea* curArea : result_->getVisibleAreas()) { + // 今回の表示エリア + // stableなエリアをスキップ + if(stableAreas.find(curArea) != stableAreas.end()) { + continue; + } + const RBAViewContentState* curState {result_->getContentState(curArea)}; + const RBAViewContent* const curContent {curState->getOwner()}; + const RBAViewContentState* preState {result_->getPreContentState(curArea)}; + // MOVEのコンテンツなら + if(movedContents.find(curContent) != movedContents.end()) { + if((preState != nullptr) && (!result_->isVisible(preState))) { + // 前回表示していたコンテンツが非表示ならREMOVE + actions.push_back(std::make_unique<RBAViewTransition>( + RBAViewActionType::TRANSITION_REMOVE, + curArea, preState)); + } + else { + continue; + } + } + else if(result_->isPreVisible(curArea)) { + // 前回も表示エリアだった + // preがMOVEのコンテンツなら + const RBAViewContent* const preContent {preState->getOwner()}; + if(movedContents.find(preContent) != movedContents.end()) { + // 今回表示のコンテンツはADD + actions.push_back(std::make_unique<RBAViewTransition>( + RBAViewActionType::TRANSITION_ADD, + curArea, curState)); + } + else if(curContent != preContent) { + // コンテントが違うのでREPLACE + actions.push_back(std::make_unique<RBAViewTransition>( + RBAViewActionType::TRANSITION_REPLACE, + curArea, preState, curState)); + } else { + ; + } + } + else { + // 前回は表示エリアでなかったのでADD + actions.push_back(std::make_unique<RBAViewTransition>( + RBAViewActionType::TRANSITION_ADD, + curArea, curState)); + } + } + + // ソートして登録 + actions.sort(&compareViewAction); + for(auto& action : actions) { + result_->addViewAction(action); + } +} + +void +RBAArbitratorImpl::differenceArbitrate() +{ +#ifdef RBA_USE_LOG + // 要求情報をログに設定 + RBALogManager::setType(RBALogManager::TYPE_REQUEST); + logRequestArbitration(); + RBALogManager::setType(RBALogManager::TYPE_PREVIOUS_RESULT); + logPreResultArbitration(); + logRequestForCoverage(); +#endif + + for (auto& a : model_->getSortedAllocatables()) { + a->clearStatus(); + } + + // ---------------------------------------------------------- + // 調停 + // ---------------------------------------------------------- + // 優先度と後勝ち調停（価値調停は今のところ優先度調停と同じ） +#ifdef RBA_USE_LOG +RBALogManager::setType(RBALogManager::TYPE_ARBITRATE); +#endif + arbitrate(model_->getSortedAllocatables()); + + // ---------------------------------------------------------- + // 調停後処理 + // ---------------------------------------------------------- +#ifdef RBA_USE_LOG +RBALogManager::setType(RBALogManager::TYPE_CANCEL_REQUEST); +#endif + // satisfiesConstraints()で制約式評価を行うとき、キャンセル状態がexecute()時と異なっていると、 + // 結果がfalseになる可能性があるため、キャンセル処理前の状態を保存しておく。 + // satisfiesConstraints()で制約式評価を行うときに、この値に戻して評価する。 + resultSetForSatisfiesConstraints_ = std::make_unique<RBAResultSet>( + *result_->getCurResultSet()); + postArbitrate(); + + // オフライン制約を動かす +#ifdef RBA_USE_LOG +RBALogManager::setType(RBALogManager::TYPE_CHECK_ALL_CONSTRAINTS); + checkAllConstraints(); +#endif + + // ---------------------------------------------------------- + // コンテントの状態を更新する + // ---------------------------------------------------------- + for (auto& c : model_->getContents()){ + const_cast<RBAContent*>(c)->updateStatus(result_.get()); + } + + backupResultSet_ = result_->createBackupCurrentResultSet(); + nextResultSet_ = result_->createNextCurrentResultSet(); + +#ifdef RBA_USE_LOG + logResultForCoverage(); +#endif +} + +bool +RBAArbitratorImpl:: +checkConstraints( std::list<RBAConstraintImpl*>& constraints, + std::list<RBAConstraintImpl*>& falseConstraints, + const RBAAllocatable* const allocatable) +{ + bool containsSkip {false}; + for (const auto& constraint : constraints) { + const bool isPassed {constraint->execute(this)}; + if (isPassed == false) { + falseConstraints.push_back(constraint); + } + if (constraint->getInfo()->isExceptionBeforeArbitrate()) { + if (constraint->getInfo()->needsReRearbitrationFor(allocatable)) { + containsSkip = true; + } + } + } + return containsSkip; +} + +bool +RBAArbitratorImpl:: +checkConstraintAndReArbitrate(RBAAllocatable* allocatable, + std::set<const RBAAllocatable*>& revisited, + const std::int32_t nest, + RBAAffectInfo* const affectInfo, + RBARollbacker* const parentRollbacker, + std::list<RBAConstraintImpl*>& constraints, + bool * const isSkipped, + const bool isFinal) +{ + bool isPassed {false}; + std::list<RBAConstraintImpl*> falseConstraints; + const bool containsSkip {checkConstraints(constraints, falseConstraints, allocatable)}; + if(falseConstraints.empty()) { + *isSkipped = (*isSkipped || containsSkip); + if(!containsSkip && !*isSkipped && isFinal) { + static_cast<void>(revisited.insert(allocatable)); + } + isPassed = true; + } else { + std::list<const RBAAllocatable*> revisitAllocatables; + collectRevisitAllocatable(&revisitAllocatables, allocatable, falseConstraints, revisited); + if(!(revisitAllocatables.empty())) { + // 再調停アロケータブルが存在する + // 再調停失敗時のロールバック向けバックアップ情報を生成 + // 処理速度を考え、再調停が初めて必要になった場合にのみ1回だけインスタンスを生成 + // コンテント割り当て後にバックアップしているので、ロールバック後は割り当てたコンテントをNULLに戻す必要有り + std::shared_ptr<RBARollbacker> rollbacker {std::make_shared<RBARollbacker>()}; // 再調停失敗時のロールバック情報 + if (parentRollbacker != nullptr) { + parentRollbacker->addChild(rollbacker); + } + rollbacker->backup(revisitAllocatables); + // 先に再調停するアロケータブルを全て初期化 + for (auto& a : revisitAllocatables) { + const_cast<RBAAllocatable*>(a)->clearChecked(); + } + // -------------------------------------------------- + // 再調停候補リストから、再帰内で再調停済でないアロケータブルを再調停する + // -------------------------------------------------- + static_cast<void>(revisited.insert(allocatable)); + for(const RBAAllocatable* const revisitAllocatable : revisitAllocatables) { + LOG_arbitrateAreaLogLine( " " + + revisitAllocatable->getSymbol() + "[" + + revisitAllocatable->getElementName() + + "] revisit allocatable check start"); + arbitrateAllocatable(const_cast<RBAAllocatable*>(revisitAllocatable), + revisited, nest + 1, affectInfo, rollbacker.get()); + } + for(const RBAAllocatable* const revisitAllocatable : revisitAllocatables) { + static_cast<void>(revisited.erase(revisitAllocatable)); + } + // -------------------------------------------------- + // 再調停によりコンテントの割り当てが成功するようになったかを確認する + // -------------------------------------------------- + falseConstraints.clear(); + static_cast<void>(checkConstraints(constraints, falseConstraints, allocatable)); + if (falseConstraints.empty()) { + // 再調停によってアロケータブルの割当コンテンツが確定したので、 + // ループを抜けて次のアロケータブルへ + // 再帰によって自アロケータブルの再調停がされて割当コンテンツがなくなるケースも + // あるが、全コンテンツチェックが済のため次のアロケータブルへ + isPassed = true; + } else { + rollbacker->rollback(); // 調停状態と影響情報をロールバックする + if (parentRollbacker != nullptr) { + parentRollbacker->removeChild(rollbacker); + } + } + } + } + if (isPassed == false) { + //調停中のエリアに影響を与えたエリアを収集する + std::set<const RBAAllocatable*> allocatablesWhichHaveAffectedToThisAllocatable; + + for (const RBAConstraintImpl* const constraint : falseConstraints) { + constraint->getInfo()->collectAffectedAllocatables( + false, allocatablesWhichHaveAffectedToThisAllocatable, false, + false); + } + static_cast<void>(allocatablesWhichHaveAffectedToThisAllocatable.erase(allocatable)); + + //調停中のエリアが影響を受けたエリアを記録する + //逆に言えば、調停中のエリアに影響を与えたエリアに、調停中のエリアに影響を与えたことを記録する + //AffectInfoには影響を与えたエリアの再調停済みのものを覚えておくので、すでに再調停済みのものは記憶しない + for (const RBAAllocatable* const a : allocatablesWhichHaveAffectedToThisAllocatable) { + if (!(affectInfo->alreadyKnowsThatFormerHasAffectedToLatter(a, + allocatable))) { + const_cast<RBAAllocatable*>(a)->addAllocatableWhichHasBeenAffectedByYou( + allocatable); + affectInfo->addInfoThatFormerAffectedToLatter(a, allocatable); + } + } + } + return isPassed; +} + +bool +RBAArbitratorImpl:: +isCancelChecked(const RBAContentState* const state) const +{ + return cancelChecked_.find(state) != cancelChecked_.end(); +} + +void +RBAArbitratorImpl:: +setCancel(const RBAContentState* const state, const bool checked) +{ + result_->setCancel(state, checked); +} + +bool +RBAArbitratorImpl:: +isCancel(const RBAContentState* const state) const +{ + if(state->isViewContentState()) { + return result_->isCancel(state); + } + else { + return result_->isCancel(state); + } +} + +void +RBAArbitratorImpl:: +getSortedContentStates(const RBAAllocatable* const allocatable, + std::list<const RBAContentState*>& contentStates) const +{ + for (const RBAContent* const content : allocatable->getInternalContents()) { + const RBAContentState* const state {result_->getActiveState(content)}; + if (state != nullptr) { + contentStates.push_back(state); +#ifdef RBA_USE_LOG + } else { + RBALogManager::arbitrateContentLogLine( + " Content[" + content->getElementName() + "] is not Active skip"); +#endif + } + } + static_cast<void>(sortContentStates(allocatable, contentStates)); + // 未割り当て時の制約式評価をするため、最後にnullを追加 + contentStates.push_back(nullptr); +} + +std::int32_t +RBAArbitratorImpl:: +getViewActionPriority(const RBAViewActionType viewActionType) +{ + std::int32_t result{0}; + + switch(viewActionType) { + case RBAViewActionType::TRANSITION_REMOVE: + result = 4; + break; + case RBAViewActionType::MOVE: + result = 3; + break; + case RBAViewActionType::TRANSITION_ADD: + result = 2; + break; + case RBAViewActionType::TRANSITION_REPLACE: + result = 1; + break; + default: + break; + } + + return result; +} + +bool +RBAArbitratorImpl:: +compareViewAction(const std::unique_ptr<RBAViewAction>& lhs, + const std::unique_ptr<RBAViewAction>& rhs) +{ + const std::int32_t lval {getViewActionPriority(lhs->getViewActionType())}; + const std::int32_t rval {getViewActionPriority(rhs->getViewActionType())}; + + return lval > rval; +} + +RBAResultImpl* +RBAArbitratorImpl::getResult() const +{ + return result_.get(); +} + +void RBAArbitratorImpl::setResult(std::unique_ptr<RBAResultImpl> result) +{ + result_ = std::move(result); +} + +RBAArbitrator* RBAArbitratorImpl::getArb() const +{ + return arb_; +} + +void RBAArbitratorImpl::setArb(RBAArbitrator* const arb) +{ + arb_ = arb; +} + +RBAModelImpl* RBAArbitratorImpl::getModel() const +{ + return model_; +} + +void RBAArbitratorImpl::setModel(RBAModelImpl* const model) +{ + model_ = model; +} + +std::set<const RBAContentState*>& RBAArbitratorImpl::getCancelChecked() +{ + return cancelChecked_; +} + +std::unique_ptr<RBAResultImpl>& RBAArbitratorImpl::getResultRef() const +{ + return result_; +} + +std::unique_ptr<RBAResultSet>& RBAArbitratorImpl::getNextResultSet() +{ + return nextResultSet_; +} + +void RBAArbitratorImpl::setNextResultSet(std::unique_ptr<RBAResultSet> nextResultSet) +{ + nextResultSet_ = std::move(nextResultSet); +} + +std::unique_ptr<RBAResultSet>& RBAArbitratorImpl::getBackupResultSet() +{ + return backupResultSet_; +} + +void RBAArbitratorImpl::setBackupResultSet(std::unique_ptr<RBAResultSet> backupResultSet) +{ + backupResultSet_ = std::move(backupResultSet); +} + +std::unique_ptr<RBAResultSet>& RBAArbitratorImpl::getReservedResultSet() +{ + return reservedResultSet_; +} + +void RBAArbitratorImpl::setReservedResultSet(std::unique_ptr<RBAResultSet> reservedResultSet) +{ + reservedResultSet_ = std::move(reservedResultSet); +} + +std::recursive_mutex& RBAArbitratorImpl::getMutex() const +{ + return mutex_; +} + +#ifdef RBA_USE_LOG +bool RBAArbitratorImpl::getSimulationMode() +{ + return simulationMode_; +} + +void RBAArbitratorImpl::setSimulationMode(bool simulationMode) +{ + simulationMode_ = simulationMode; +} +#endif + +std::deque<std::unique_ptr<RBARequestQueMember>>& RBAArbitratorImpl::getRequestQue() +{ + return requestQue_; +} + +#ifdef RBA_USE_LOG +/** + * ログビュー向けにリクエスト情報を出力する + */ +void +RBAArbitratorImpl::logRequestArbitration() +{ + const std::list<const RBAAllocatable*> allocatables = + model_->getAllocatables(); + RBALogManager::requestLogLine("----Request Information----"); + RBALogManager::requestLogLine( + "Allocatable Count:" + std::to_string(allocatables.size())); + for (const RBAAllocatable* allocatable : allocatables) { + RBALogManager::requestLogLine( + " " + allocatable->getSymbol() + "[" + allocatable->getElementName() + + "] policy[" + allocatable->getArbitrationPolicyString() + + "] visibility[" + allocatable->getVisibilityString() + "]"); + } + + const std::list<const RBAContentState*> contentStates = model_ + ->getContentStates(); + RBALogManager::requestLogLine( + "ContentState Count:" + std::to_string(contentStates.size())); + for (const RBAContentState* contentState : contentStates) { + std::string active; + if (contentState->getModelElementType() == RBAModelElementType::ViewContentState) { + active = RBALogManager::boolToString( + result_->isActive( + dynamic_cast<const RBAViewContentState*>(contentState))); + } else { + active = RBALogManager::boolToString( + result_->isActive( + dynamic_cast<const RBASoundContentState*>(contentState))); + } + RBALogManager::requestLogLine( + " " + dynamic_cast<RBAContent*>(contentState->getOwner())->getSymbol() + "[" + + contentState->getOwner()->getElementName() + "::" + + contentState->getElementName() + "] priority[" + + contentState->getPriorityString() + "] isActive[" + active + + "] order[" + contentState->getOrderString() + "]"); + } + + const std::list<const RBAScene*> scenes = model_->getScenes(); + RBALogManager::requestLogLine("Scene Count:" + std::to_string(scenes.size())); + for (const RBAScene* scene : scenes) { + RBALogManager::requestLogLine( + " Scene[" + scene->getName() + "] isActive[" + + RBALogManager::boolToString(result_->isActive(scene)) + + "]"); + } + + std::list<RBAConstraint*> constraints = model_->getConstraints(); + RBALogManager::requestLogLine( + "Constraint Count:" + std::to_string(constraints.size())); + for (RBAConstraint* constraint : constraints) { + RBAConstraintImpl* impl = dynamic_cast<RBAConstraintImpl*>(constraint); + RBALogManager::requestLogLine( + " Constraint[" + impl->getName() + "] Expression[" + + impl->getExpression()->getExpressionText() + "] runtime[" + + RBALogManager::boolToString(impl->isRuntime()) + "]"); + } + +} + +/** + * ログビュー向けに前回調停結果を出力する + */ +void +RBAArbitratorImpl::logPreResultArbitration() +{ + RBALogManager::resultLogLine("----Previous Result Information----"); + + auto allocs = model_->getAllocatables(); + RBALogManager::resultLogLine("Allocatable TotalCount:" + + std::to_string(allocs.size())); + for (auto& alloc : allocs) { + auto contentState = result_->getPreContentState(alloc); + auto hidden = result_->isPreHidden(alloc); + std::string str = " " + alloc->getSymbol() + + "[" + alloc->getElementName() + "] Content["; + if (contentState == nullptr) { + str += "null"; + } else { + str += contentState->getOwner()->getElementName() + + "::" + contentState->getElementName(); + } + str += "] " + alloc->getHiddenSymbol() + + "[" + RBALogManager::boolToString(hidden) + "]"; + if (alloc->isZone() == true) { + str += " attenuated["; + str += RBALogManager::boolToString( + result_->isPreAttenuated(dynamic_cast<const RBAZone*>(alloc))); + str += "]"; + } + RBALogManager::resultLogLine(str); + if (contentState && !hidden) { + RBALogManager::coveragePrevResultLogLine( + "A," + alloc->getElementName() + "," + + contentState->getOwner()->getElementName() + "," + + contentState->getElementName()); + } + } + + auto contents = model_->getContents(); + RBALogManager::resultLogLine("Content TotalCount:" + + std::to_string(contents.size())); + for (auto& content : contents) { + auto state = result_->getPreActiveState(content); + bool isOutputting = false; + bool isActive = false; + if (state != nullptr) { + isActive = true; + isOutputting = result_->isPreOutputting(state); + } + RBALogManager::resultLogLine( + " " + content->getSymbol() + "[" + content->getElementName() + "] " + + content->getVisibleSymbol() + "[" + + RBALogManager::boolToString(isOutputting) + "] active[" + + RBALogManager::boolToString(isActive) + "]"); + for (auto alloc : content->getAllocatables()) { + auto allocatedState = result_->getPreContentState(alloc); + if ((allocatedState != nullptr) + && (allocatedState->getOwner() == content)) { + RBALogManager::resultLogLine( + " allocated " + alloc->getSymbol() + "[" + + alloc->getElementName() + "]"); + } + } + } +} + +/** + * ログビュー向けに今回調停結果を出力する + */ +void +RBAArbitratorImpl::logResultArbitration() +{ + RBALogManager::resultLogLine("----Result Information----"); + + const std::list<const RBAAllocatable*> allocatables + = model_->getAllocatables(); + RBALogManager::resultLogLine("Allocatable TotalCount:" + std::to_string(allocatables.size())); + for(const RBAAllocatable* allocatable : allocatables) { + const RBAContentState* contentState = result_->getContentState(allocatable); + std::string str = " "; + str += allocatable->getSymbol(); + str += "["; + str += allocatable->getElementName(); + str += "] Content["; + if (contentState == nullptr) { + str += "null"; + } else { + str += contentState->getOwner()->getElementName() + "::" + + contentState->getElementName(); + } + str += "] "; + str += allocatable->getHiddenSymbol(); + str += "["; + str += RBALogManager::boolToString(result_->isHidden(allocatable)); + str += "]"; + if (allocatable->isZone() == true) { + str += " attenuated["; + str += RBALogManager::boolToString(result_->isAttenuated(dynamic_cast<const RBAZone*>(allocatable))); + str += "]"; + } + RBALogManager::resultLogLine(str); + } + + const std::list<const RBAContent*> contents = model_->getContents(); + RBALogManager::resultLogLine("Content TotalCount:" + std::to_string(contents.size())); + for(const RBAContent* content : contents) { + bool isOutputting = false; + bool isCancel = false; + const RBAContentState* state = result_->getActiveState(content); + if(state != nullptr) { + isOutputting = result_->isOutputting(state); + } else { + for(const RBAContentState* state : content->getStates()) { + isCancel |= result_->isCancel(state); + } + } + RBALogManager::resultLogLine(" " + + content->getSymbol() + + "[" + + content->getElementName() + + "] " + + content->getVisibleSymbol() + + "[" + + RBALogManager::boolToString(isOutputting) + + "] cancel[" + + RBALogManager::boolToString(isCancel) + + "]"); + for(const RBAAllocatable* allocatable : content->getAllocatables()) { + const RBAContentState* allocatedState + = result_->getContentState(allocatable); + if((allocatedState != nullptr) && (allocatedState->getOwner() == content)) { + RBALogManager::resultLogLine(" allocated " + + allocatable->getSymbol() + "[" + + allocatable->getElementName() + "]"); + } + } + } +} + +/** + * カバレッジ向け：要求情報を出力する + */ +void +RBAArbitratorImpl::logRequestForCoverage() +{ + for(const RBAContentState* contentState : model_->getContentStates()) { + std::ostringstream oss; + oss << "C,"; + if(result_->isActive(contentState)) { + oss << "on,"; + } + else { + oss << "off,"; + } + oss << contentState->getOwner()->getElementName() << ","; + oss << contentState->getElementName() << ","; + oss << contentState->getContentStateOrder(); + RBALogManager::coverageRequestLogLine(oss.str()); + } + for(const RBAScene* scene : model_->getScenes()) { + std::ostringstream oss; + oss << "S,"; + if(result_->isActive(scene)) { + oss << "on,"; + } + else { + oss << "off,"; + } + oss << scene->getName(); + for(const auto& name : scene->getPropertyNames()) { + std::int32_t value {result_->getSceneProperty(scene, name)}; + oss << ","; + oss << name; + oss << ":"; + oss << value; + } + RBALogManager::coverageRequestLogLine(oss.str()); + } +} + +/** + * カバレッジ向け：結果情報を出力する + */ +void +RBAArbitratorImpl::logResultForCoverage() +{ + for(const RBAAllocatable* allocatable : model_->getAllocatables()) { + std::ostringstream oss; + oss << "A,"; + oss << allocatable->getElementName() + ","; + const RBAContentState* contentState = result_->getContentState(allocatable); + if((contentState != nullptr) && (!result_->isHidden(allocatable))) { + oss << contentState->getOwner()->getElementName(); + } + RBALogManager::coverageResultLogLine(oss.str()); + } +} + +void +RBAArbitratorImpl::setLogToResult() +{ + std::ostringstream oss; + oss << RBALogManager::getAllConstraintLog(); + oss << RBALogManager::getRequestLog(); + oss << RBALogManager::getPreviousResultLog(); + oss << RBALogManager::getArbitrateLog(); + oss << RBALogManager::getCancelRequestLog(); + oss << RBALogManager::getCheckAllConstraintLog(); + oss << RBALogManager::getResultLog(); + result_->setLog(oss.str()); +} +#endif + +} diff --git a/src/core/logic/RBAArbitratorImpl.hpp b/src/core/logic/RBAArbitratorImpl.hpp new file mode 100644 index 0000000..e6c37a1 --- /dev/null +++ b/src/core/logic/RBAArbitratorImpl.hpp @@ -0,0 +1,234 @@ +/** + * 調停ロジック実装クラスヘッダファイル + */ + +#ifndef RBAARBITORATORIMPL_HPP +#define RBAARBITORATORIMPL_HPP + +#include <cstdint> +#include <set> +#include <memory> +#include <mutex> +#include <deque> +#include <unordered_map> +#include "RBAArbitrator.hpp" +#include "RBARequestQueMember.hpp" +#include "RBAResultSet.hpp" +#include "RBAResultImpl.hpp" + +namespace rba +{ + +class RBAModelImpl; +class RBAAffectInfo; +class RBARollbacker; +class RBAWindowRouter; +class RBAConstraintImpl; +#ifdef RBA_USE_LOG +class RBALogManager; +#endif + +class DLL_EXPORT RBAArbitratorImpl +{ +public: + RBAArbitratorImpl()=default; + RBAArbitratorImpl(const RBAArbitratorImpl&)=delete; + RBAArbitratorImpl(const RBAArbitratorImpl&&)=delete; + RBAArbitratorImpl& operator=(const RBAArbitratorImpl&)=delete; + RBAArbitratorImpl& operator=(const RBAArbitratorImpl&&)=delete; + virtual ~RBAArbitratorImpl()=default; + + bool isValidContext(const std::string& context); + bool isValidContext(std::list<std::string>& contexts); + bool setRequestData( + const std::string& context, bool require, + std::list<std::pair<std::string, std::int32_t>>* const properties = nullptr, + std::uint32_t syncIndex = 0xFFFFU); + void setRequestData(const RBAContentState* state, bool require); + void setRequestData(const RBAContent* const content, bool require); + void setActive(const RBASceneImpl* const scene, const bool require); + void setSceneProperty(const RBAAbstractProperty* const prop, const std::int32_t value); + void setRequestData(std::list<std::string>& contexts, const bool require); +#ifdef RBA_USE_LOG + void checkAllConstraints(); +#endif + void updateResult(); + void checkCancelContent() const; + void createResultData(); + + bool satisfiesConstraints() const; + std::unique_ptr<RBAResult> arbitrateMain(); + void arbitrate(std::list<RBAAllocatable*>& allocatables); + void arbitrateAllocatable(RBAAllocatable* allocatable, + std::set<const RBAAllocatable*>& revisited, + const std::int32_t nest, RBAAffectInfo* const affectInfo, + RBARollbacker* const parentRollbacker); + void getAffectedAllocatables( + RBAAllocatable* allocatable, + std::list<RBAConstraintImpl*>& falseConstraints, + std::list<RBAAllocatable*>& affectedAllocatables); + void getAffectAllocatableWithoutAlreadyAffected( + std::list<RBAAllocatable*>& allocatables, + RBAAllocatable* affectAllocatable, RBAAffectInfo* affectInfo, + std::list<RBAAllocatable*>& result); + void addAffectAllocatable(std::list<RBAAllocatable*>& allocatables, + RBAAllocatable* affectAllocatable, + RBAAffectInfo* affectInfo); + + bool sortContentStates(const RBAAllocatable* const allocatable, + std::list<const RBAContentState*>& states) const; + void postArbitrate(); + void changeContentStateCancelWithPolicy(const RBAContentState* const state); + void collectRevisitAllocatable( + std::list<const RBAAllocatable*>* const totalRevisitAllocatables, + RBAAllocatable*& allocatable, + std::list<RBAConstraintImpl*>& falseConstraints, + std::set<const RBAAllocatable*>& revisited); + + bool isDefeat(const RBAContentState* const winner, + const RBAContentState* const loser) const; + + static std::int32_t getViewActionPriority(const RBAViewActionType viewActionType); + static bool compareViewAction(const std::unique_ptr<RBAViewAction>& lhs, + const std::unique_ptr<RBAViewAction>& rhs); + RBAResultImpl* getResult() const; /// rba_toolで使用する + bool isCancelChecked(const RBAContentState* const state) const; + bool isCancel(const RBAContentState* const state) const; + +#ifdef RBA_USE_LOG + void setResultLog(); +#endif + + private: + void differenceArbitrate(); + bool checkConstraints(std::list<RBAConstraintImpl*>& constraints, + std::list<RBAConstraintImpl*>& falseConstraints, + const RBAAllocatable* const allocatable); + bool checkConstraintAndReArbitrate(RBAAllocatable* allocatable, + std::set<const RBAAllocatable*>& revisited, + const std::int32_t nest, + RBAAffectInfo* const affectInfo, + RBARollbacker* const parentRollbacker, + std::list<RBAConstraintImpl*>& constraints, + bool * const isSkipped, const bool isFinal); + void setCancel(const RBAContentState* const state, const bool checked); + void getSortedContentStates( + const RBAAllocatable* const allocatable, + std::list<const RBAContentState*>& contentStates) const; + +#ifdef RBA_USE_LOG + // ログ出力 + void logRequestArbitration(); + void logPreResultArbitration(); + void logRequestForCoverage(); + void logResultArbitration(); + void logResultForCoverage(); + void setLogToResult(); +#endif + + public: + RBAArbitrator* getArb() const; + void setArb(RBAArbitrator* const arb); + RBAModelImpl* getModel() const; + void setModel(RBAModelImpl* const model); + std::set<const RBAContentState*>& getCancelChecked(); + std::unique_ptr<RBAResultImpl>& getResultRef() const; + void setResult(std::unique_ptr<RBAResultImpl> result); + std::unique_ptr<RBAResultSet>& getNextResultSet(); + void setNextResultSet(std::unique_ptr<RBAResultSet> nextResultSet); + std::unique_ptr<RBAResultSet>& getBackupResultSet(); + void setBackupResultSet(std::unique_ptr<RBAResultSet> backupResultSet); + std::unique_ptr<RBAResultSet>& getReservedResultSet(); + void setReservedResultSet(std::unique_ptr<RBAResultSet> reservedResultSet); + std::recursive_mutex& getMutex() const; +#ifdef RBA_USE_LOG + bool getSimulationMode(); + void setSimulationMode(bool simulationMode); +#endif + std::deque<std::unique_ptr<RBARequestQueMember>>& getRequestQue(); + + private: + RBAArbitrator* arb_ {nullptr}; + RBAModelImpl* model_ {nullptr}; + RBAWindowRouter* windowRouter_ {nullptr}; + +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4251) +#endif + std::set<const RBAContentState*> cancelChecked_; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + + mutable std::unique_ptr<RBAResultImpl> result_; + // 次の調停でCurrentResultSetとして使用するResultSet + std::unique_ptr<RBAResultSet> nextResultSet_; + // 次の調停でPreviousResultSetとして使用するResultSet + std::unique_ptr<RBAResultSet> backupResultSet_; + // cancelArbitration()でCurrentResultSetとして使用するResultSet + std::unique_ptr<RBAResultSet> reservedResultSet_; + // satisfiesConstraints()でCurrentResultSetとして使用するResultSet + std::unique_ptr<RBAResultSet> resultSetForSatisfiesConstraints_; + mutable std::recursive_mutex mutex_; + // 調停要求を受けた時とき、常に調停するアロケータブル + std::set<const RBAAllocatable*> allwaysArbitrateAllocatables_; +#ifdef RBA_USE_LOG + bool simulationMode_ = false; +#endif + std::deque<std::unique_ptr<RBARequestQueMember>> requestQue_; + std::uint32_t syncIndex_ {0xFFFFU}; + +}; + +class DLL_EXPORT RBAArbitrator::Impl +{ + public: + Impl(RBAArbitrator* const arb, RBAModelImpl* const newModel); + Impl(const Impl&)=delete; + Impl(const Impl&&)=delete; + Impl& operator=(const Impl&)=delete; + Impl& operator=(const Impl&&)=delete; +#ifdef RBA_USE_LOG + Impl(RBAArbitrator* arb, + RBAModelImpl* newModel, RBALogManager* logManager); +#endif + virtual ~Impl()=default; + + public: + RBAModelImpl* getModel(); + void setModel(RBAModelImpl* const newModel); + void initialize(std::list<std::string>& contexts); + std::unique_ptr<RBAResult> execute(const std::string& contextName, + const bool require = true); + std::unique_ptr<RBAResult> execute(std::list<std::string>& contexts, + const bool require = true); + std::unique_ptr<RBAResult> execute( + const std::string& sceneName, + std::list<std::pair<std::string, std::int32_t>>& properties); + std::unique_ptr<RBAResult> + setResultContentState(const std::string& allocatableName, + const std::string& contextName); + std::unique_ptr<RBAResult> cancelArbitration(); + + void clearArbitration(); + bool setScene(const std::string& sceneName, const bool require, + std::list<std::pair<std::string, std::int32_t>>& properties); + bool setContentState(const std::string& contextName, const bool require); + bool setAllocatableResult(const std::string& allocatableName, + const std::string& contextName); + + bool evaluate(const RBAExpression* const expression); + const RBARuleObject* evaluateObject(const RBAExpression* const expression); + int32_t evaluateValue(const RBAExpression* const expression); + + RBAArbitratorImpl* getImpl(); + + private: + RBAArbitratorImpl impl_; + +}; + +} + +#endif diff --git a/src/core/logic/RBAResultImpl.cpp b/src/core/logic/RBAResultImpl.cpp index 41c291f..a64364a 100644 --- a/src/core/logic/RBAResultImpl.cpp +++ b/src/core/logic/RBAResultImpl.cpp @@ -21,7 +21,7 @@ #include "RBAResultImpl.hpp" #include "RBAContentStatusType.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAViewContentImpl.hpp" #include "RBAViewContentStateImpl.hpp" #include "RBASoundContentImpl.hpp" @@ -42,7 +42,7 @@ namespace rba { -RBAResultImpl::RBAResultImpl(const RBAArbitrator* const arb, +RBAResultImpl::RBAResultImpl(const RBAArbitratorImpl* const arb, std::unique_ptr<RBAResultSet> newPrevResultSet): RBAResult(), preResultSet_{std::move(newPrevResultSet)}, @@ -54,7 +54,7 @@ RBAResultImpl::RBAResultImpl(const RBAArbitrator* const arb, curResultSet_->copyProperties(preResultSet_); } -RBAResultImpl::RBAResultImpl(const RBAArbitrator* const arb, +RBAResultImpl::RBAResultImpl(const RBAArbitratorImpl* const arb, std::unique_ptr<RBAResultSet> newPrevResultSet, std::unique_ptr<RBAResultSet> newCurResultSet): RBAResult(), diff --git a/src/core/logic/RBAResultImpl.hpp b/src/core/logic/RBAResultImpl.hpp index d7a1aa1..8936053 100644 --- a/src/core/logic/RBAResultImpl.hpp +++ b/src/core/logic/RBAResultImpl.hpp @@ -30,7 +30,7 @@ namespace rba { -class RBAArbitrator; +class RBAArbitratorImpl; class RBAArea; class RBAViewContent; class RBAViewContentState; @@ -60,9 +60,9 @@ class RBAContentStatus; class DLL_EXPORT RBAResultImpl : public RBAResult { public: - RBAResultImpl(const RBAArbitrator* const arb, + RBAResultImpl(const RBAArbitratorImpl* const arb, std::unique_ptr<RBAResultSet> newPrevResultSet); - RBAResultImpl(const RBAArbitrator* const arb, + RBAResultImpl(const RBAArbitratorImpl* const arb, std::unique_ptr<RBAResultSet> newPrevResultSet, std::unique_ptr<RBAResultSet> newCurResultSet); RBAResultImpl(const RBAResultImpl* const replicationTarget); @@ -332,7 +332,7 @@ private: #pragma warning(push) #pragma warning(disable:4251) #endif - const RBAArbitrator* arb_; + const RBAArbitratorImpl* arb_; RBAResultStatusType statusType_; std::string log_; diff --git a/src/core/logic/RBARollbacker.cpp b/src/core/logic/RBARollbacker.cpp index 9870fa9..7e05ac6 100644 --- a/src/core/logic/RBARollbacker.cpp +++ b/src/core/logic/RBARollbacker.cpp @@ -21,7 +21,7 @@ #include "RBARollbacker.hpp" #include "RBAModelImpl.hpp" #include "RBABackUpAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" namespace rba { diff --git a/src/core/logic/RBARollbacker.hpp b/src/core/logic/RBARollbacker.hpp index 08ee4e9..9a361ed 100644 --- a/src/core/logic/RBARollbacker.hpp +++ b/src/core/logic/RBARollbacker.hpp @@ -29,7 +29,7 @@ namespace rba { class RBAModel; class RBAAllocatable; -class RBAArbitrator; +class RBAArbitratorImpl; class RBARollbacker { diff --git a/src/core/model/RBAConstraintImpl.cpp b/src/core/model/RBAConstraintImpl.cpp index a634621..2e27867 100644 --- a/src/core/model/RBAConstraintImpl.cpp +++ b/src/core/model/RBAConstraintImpl.cpp @@ -57,7 +57,7 @@ RBAConstraintImpl::isRuntime() const } bool -RBAConstraintImpl::execute(RBAArbitrator* const arb) +RBAConstraintImpl::execute(RBAArbitratorImpl* const arb) { LOG_arbitrateConstraintLogicLogLine(" constraint expression[" + getExpression()->LOG_getExpressionText() diff --git a/src/core/model/RBAConstraintImpl.hpp b/src/core/model/RBAConstraintImpl.hpp index eb4d6ab..a70dfc2 100644 --- a/src/core/model/RBAConstraintImpl.hpp +++ b/src/core/model/RBAConstraintImpl.hpp @@ -27,7 +27,7 @@ namespace rba { -class RBAArbitrator; +class RBAArbitratorImpl; class DLL_EXPORT RBAConstraintImpl : public RBAConstraint, public RBAAbstractConstraint @@ -45,7 +45,7 @@ public: std::string getName() const override; bool isConstraint() const override; bool isRuntime() const; - bool execute(RBAArbitrator* const arb); + bool execute(RBAArbitratorImpl* const arb); private: bool runtime_ {RUNTIME_EDEFAULT}; diff --git a/src/core/model/RBAContent.hpp b/src/core/model/RBAContent.hpp index 17e912c..47f1e3d 100644 --- a/src/core/model/RBAContent.hpp +++ b/src/core/model/RBAContent.hpp @@ -30,7 +30,7 @@ namespace rba { -class RBAArbitrator; +class RBAArbitratorImpl; class RBAAllocatable; class RBAContentState; class RBAResultImpl; diff --git a/src/optimize/RBAAbstractCollector.cpp b/src/optimize/RBAAbstractCollector.cpp index 8d1574b..b1549ea 100644 --- a/src/optimize/RBAAbstractCollector.cpp +++ b/src/optimize/RBAAbstractCollector.cpp @@ -26,7 +26,7 @@ #include "RBAAllocatableSet.hpp" #include "RBAAllocatedContent.hpp" #include "RBAAndOperator.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAContentSet.hpp" @@ -299,7 +299,7 @@ void RBAAbstractCollector::visit(RBAForAllOperator& exp) { visitLetStatement(exp); RBAConstraintInfo dummyInfo; - RBAArbitrator dummyArb; + RBAArbitratorImpl dummyArb; dummyArb.setModel(model_); dummyArb.setResult(std::make_unique<RBAResultImpl>( &dummyArb, std::make_unique<RBAResultSet>())); @@ -335,7 +335,7 @@ void RBAAbstractCollector::visit(RBAExistsOperator& exp) { visitLetStatement(exp); RBAConstraintInfo dummyInfo; - RBAArbitrator dummyArb; + RBAArbitratorImpl dummyArb; dummyArb.setModel(model_); dummyArb.setResult(std::make_unique<RBAResultImpl>( &dummyArb, std::make_unique<RBAResultSet>())); @@ -424,7 +424,7 @@ void RBAAbstractCollector::visit(RBAMaxOperator& exp) { visitLetStatement(exp); RBAConstraintInfo dummyInfo; - RBAArbitrator dummyArb; + RBAArbitratorImpl dummyArb; dummyArb.setModel(model_); dummyArb.setResult(std::make_unique<RBAResultImpl>( &dummyArb, std::make_unique<RBAResultSet>())); @@ -460,7 +460,7 @@ void RBAAbstractCollector::visit(RBAMinOperator& exp) { visitLetStatement(exp); RBAConstraintInfo dummyInfo; - RBAArbitrator dummyArb; + RBAArbitratorImpl dummyArb; dummyArb.setModel(model_); dummyArb.setResult(std::make_unique<RBAResultImpl>( &dummyArb, std::make_unique<RBAResultSet>())); @@ -496,7 +496,7 @@ void RBAAbstractCollector::visit(RBASelectOperator& exp) { visitLetStatement(exp); RBAConstraintInfo dummyInfo; - RBAArbitrator dummyArb; + RBAArbitratorImpl dummyArb; dummyArb.setModel(model_); dummyArb.setResult(std::make_unique<RBAResultImpl>( &dummyArb, std::make_unique<RBAResultSet>())); diff --git a/src/sound/RBAAllInstanceOfSoundContent.cpp b/src/sound/RBAAllInstanceOfSoundContent.cpp index 181fb7b..19d722c 100644 --- a/src/sound/RBAAllInstanceOfSoundContent.cpp +++ b/src/sound/RBAAllInstanceOfSoundContent.cpp @@ -20,7 +20,7 @@ #include "RBAAllInstanceOfSoundContent.hpp" #include "RBASoundContentImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBAModelImpl.hpp" #include "RBAModelElementType.hpp" @@ -46,7 +46,7 @@ RBAAllInstanceOfSoundContent::getModelElementType() const const RBARuleObject* RBAAllInstanceOfSoundContent::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { return &allSoundContentSet_; } diff --git a/src/sound/RBAAllInstanceOfSoundContent.hpp b/src/sound/RBAAllInstanceOfSoundContent.hpp index 08ea67f..7c9a1bd 100644 --- a/src/sound/RBAAllInstanceOfSoundContent.hpp +++ b/src/sound/RBAAllInstanceOfSoundContent.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setContents(const std::list<const RBASoundContentImpl*>& contents); // Log diff --git a/src/sound/RBAAllInstanceOfZone.cpp b/src/sound/RBAAllInstanceOfZone.cpp index e50768c..a813e3f 100644 --- a/src/sound/RBAAllInstanceOfZone.cpp +++ b/src/sound/RBAAllInstanceOfZone.cpp @@ -20,7 +20,7 @@ #include "RBAAllInstanceOfZone.hpp" #include "RBAZoneImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBAModelImpl.hpp" #include "RBAModelElementType.hpp" @@ -46,7 +46,7 @@ RBAAllInstanceOfZone::getModelElementType() const const RBARuleObject* RBAAllInstanceOfZone::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { return &allZoneSet_; } diff --git a/src/sound/RBAAllInstanceOfZone.hpp b/src/sound/RBAAllInstanceOfZone.hpp index 73f15a4..679d9a8 100644 --- a/src/sound/RBAAllInstanceOfZone.hpp +++ b/src/sound/RBAAllInstanceOfZone.hpp @@ -41,7 +41,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setZones(const std::list<const RBAZoneImpl*> zones); // Log diff --git a/src/sound/RBAIsAttenuated.cpp b/src/sound/RBAIsAttenuated.cpp index cf55890..49b6538 100644 --- a/src/sound/RBAIsAttenuated.cpp +++ b/src/sound/RBAIsAttenuated.cpp @@ -19,7 +19,7 @@ #include "RBAExpression.hpp" #include "RBAZoneImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBAResultImpl.hpp" #include "RBALogManager.hpp" @@ -44,7 +44,7 @@ RBAIsAttenuated::getModelElementType() const bool RBAIsAttenuated::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; LOG_addHierarchy(LOG_getSymbol()); diff --git a/src/sound/RBAIsAttenuated.hpp b/src/sound/RBAIsAttenuated.hpp index 2ed62b2..05dead5 100644 --- a/src/sound/RBAIsAttenuated.hpp +++ b/src/sound/RBAIsAttenuated.hpp @@ -40,7 +40,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/sound/RBAIsMuted.cpp b/src/sound/RBAIsMuted.cpp index 1555137..e2f4671 100644 --- a/src/sound/RBAIsMuted.cpp +++ b/src/sound/RBAIsMuted.cpp @@ -16,7 +16,7 @@ /// IsMuted class #include "RBAIsMuted.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAResultImpl.hpp" #include "RBAAllocatable.hpp" #include "RBAExpressionVisitor.hpp" @@ -42,7 +42,7 @@ RBAIsMuted::getModelElementType() const bool RBAIsMuted::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/sound/RBAIsMuted.hpp b/src/sound/RBAIsMuted.hpp index 71b9d94..d48443f 100644 --- a/src/sound/RBAIsMuted.hpp +++ b/src/sound/RBAIsMuted.hpp @@ -41,7 +41,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/sound/RBAIsOutputted.cpp b/src/sound/RBAIsOutputted.cpp index f99d8d5..860673d 100644 --- a/src/sound/RBAIsOutputted.cpp +++ b/src/sound/RBAIsOutputted.cpp @@ -16,7 +16,7 @@ /// IsOutputted class #include "RBAIsOutputted.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAZoneImpl.hpp" #include "RBAResultImpl.hpp" #include "RBAContentState.hpp" @@ -44,7 +44,7 @@ RBAIsOutputted::getModelElementType() const bool RBAIsOutputted::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/sound/RBAIsOutputted.hpp b/src/sound/RBAIsOutputted.hpp index 995527c..ef891af 100644 --- a/src/sound/RBAIsOutputted.hpp +++ b/src/sound/RBAIsOutputted.hpp @@ -41,7 +41,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/sound/RBAIsSounding.cpp b/src/sound/RBAIsSounding.cpp index a4ab4c4..7e51b65 100644 --- a/src/sound/RBAIsSounding.cpp +++ b/src/sound/RBAIsSounding.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include "RBAAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAContentState.hpp" @@ -47,7 +47,7 @@ RBAIsSounding::getModelElementType() const bool RBAIsSounding::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage diff --git a/src/sound/RBAIsSounding.hpp b/src/sound/RBAIsSounding.hpp index 45aa0ed..a99925f 100644 --- a/src/sound/RBAIsSounding.hpp +++ b/src/sound/RBAIsSounding.hpp @@ -37,7 +37,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/sound/RBAOutputtingSound.cpp b/src/sound/RBAOutputtingSound.cpp index 14d1567..18c65d7 100644 --- a/src/sound/RBAOutputtingSound.cpp +++ b/src/sound/RBAOutputtingSound.cpp @@ -19,7 +19,7 @@ #include "RBAOutputtingSound.hpp" #include "RBAAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAContent.hpp" #include "RBAContentState.hpp" #include "RBAExpressionVisitor.hpp" @@ -50,7 +50,7 @@ RBAOutputtingSound::getModelElementType() const const RBARuleObject* RBAOutputtingSound::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { const RBARuleObject* object {nullptr}; const auto leftInfo = info->getChild(0U); diff --git a/src/sound/RBAOutputtingSound.hpp b/src/sound/RBAOutputtingSound.hpp index dd2e67e..775763b 100644 --- a/src/sound/RBAOutputtingSound.hpp +++ b/src/sound/RBAOutputtingSound.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/view/RBAAllInstanceOfArea.cpp b/src/view/RBAAllInstanceOfArea.cpp index 032cc90..2b43baf 100644 --- a/src/view/RBAAllInstanceOfArea.cpp +++ b/src/view/RBAAllInstanceOfArea.cpp @@ -20,7 +20,7 @@ #include "RBAAllInstanceOfArea.hpp" #include "RBAAreaImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBAModelImpl.hpp" #include "RBAModelElementType.hpp" @@ -45,7 +45,7 @@ RBAAllInstanceOfArea::getModelElementType() const const RBARuleObject* RBAAllInstanceOfArea::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { return &allAreaSet_; } diff --git a/src/view/RBAAllInstanceOfArea.hpp b/src/view/RBAAllInstanceOfArea.hpp index b2ffaa7..aa04f0b 100644 --- a/src/view/RBAAllInstanceOfArea.hpp +++ b/src/view/RBAAllInstanceOfArea.hpp @@ -39,7 +39,7 @@ class DLL_EXPORT RBAAllInstanceOfArea : public RBASetExpression void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setAreas(const std::list<const RBAAreaImpl*>& areas); // Log diff --git a/src/view/RBAAllInstanceOfViewContent.cpp b/src/view/RBAAllInstanceOfViewContent.cpp index 7620410..9e036ac 100644 --- a/src/view/RBAAllInstanceOfViewContent.cpp +++ b/src/view/RBAAllInstanceOfViewContent.cpp @@ -19,7 +19,7 @@ #include "RBAAllInstanceOfViewContent.hpp" #include "RBAViewContentImpl.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAExpressionVisitor.hpp" #include "RBAModelImpl.hpp" #include "RBAModelElementType.hpp" @@ -44,7 +44,7 @@ RBAAllInstanceOfViewContent::getModelElementType() const const RBARuleObject* RBAAllInstanceOfViewContent::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { return &allViewContentSet_; } diff --git a/src/view/RBAAllInstanceOfViewContent.hpp b/src/view/RBAAllInstanceOfViewContent.hpp index 214a070..3758bbe 100644 --- a/src/view/RBAAllInstanceOfViewContent.hpp +++ b/src/view/RBAAllInstanceOfViewContent.hpp @@ -39,7 +39,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; void setContents(const std::list<const RBAViewContentImpl*>& contents); // Log diff --git a/src/view/RBADisplayingContent.cpp b/src/view/RBADisplayingContent.cpp index 003e3c3..b91d4bc 100644 --- a/src/view/RBADisplayingContent.cpp +++ b/src/view/RBADisplayingContent.cpp @@ -19,7 +19,7 @@ #include "RBADisplayingContent.hpp" #include "RBAAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAContent.hpp" #include "RBAContentState.hpp" #include "RBAExpressionVisitor.hpp" @@ -49,7 +49,7 @@ RBADisplayingContent::getModelElementType() const const RBARuleObject* RBADisplayingContent::getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { const RBARuleObject* object {nullptr}; const auto leftInfo = info->getChild(0U); diff --git a/src/view/RBADisplayingContent.hpp b/src/view/RBADisplayingContent.hpp index 0bcbf5a..582d849 100644 --- a/src/view/RBADisplayingContent.hpp +++ b/src/view/RBADisplayingContent.hpp @@ -40,7 +40,7 @@ public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; const RBARuleObject* getReferenceObjectCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const override; + RBAArbitratorImpl* arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/view/RBAIsDisplayed.cpp b/src/view/RBAIsDisplayed.cpp index 34a445d..7658d71 100644 --- a/src/view/RBAIsDisplayed.cpp +++ b/src/view/RBAIsDisplayed.cpp @@ -21,7 +21,7 @@ #include "RBAAllocatable.hpp" #include "RBARuleObject.hpp" #include "RBAContentState.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAResultImpl.hpp" #include "RBAContent.hpp" #include "RBAExpressionVisitor.hpp" @@ -46,7 +46,7 @@ RBAIsDisplayed::getModelElementType() const bool RBAIsDisplayed::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage. diff --git a/src/view/RBAIsDisplayed.hpp b/src/view/RBAIsDisplayed.hpp index a991588..f265e9c 100644 --- a/src/view/RBAIsDisplayed.hpp +++ b/src/view/RBAIsDisplayed.hpp @@ -38,7 +38,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/view/RBAIsHidden.cpp b/src/view/RBAIsHidden.cpp index f33c3ed..eeea2ab 100644 --- a/src/view/RBAIsHidden.cpp +++ b/src/view/RBAIsHidden.cpp @@ -17,7 +17,7 @@ #include "RBAIsHidden.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAAllocatable.hpp" #include "RBAExpressionVisitor.hpp" #include "RBAResultImpl.hpp" @@ -42,7 +42,7 @@ RBAIsHidden::getModelElementType() const bool RBAIsHidden::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage. diff --git a/src/view/RBAIsHidden.hpp b/src/view/RBAIsHidden.hpp index ab33826..fa06cf6 100644 --- a/src/view/RBAIsHidden.hpp +++ b/src/view/RBAIsHidden.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG diff --git a/src/view/RBAIsVisible.cpp b/src/view/RBAIsVisible.cpp index 8ebfac7..432a3ad 100644 --- a/src/view/RBAIsVisible.cpp +++ b/src/view/RBAIsVisible.cpp @@ -16,7 +16,7 @@ /// IsVisible class #include "RBAAllocatable.hpp" -#include "RBAArbitrator.hpp" +#include "RBAArbitratorImpl.hpp" #include "RBAConstraintInfo.hpp" #include "RBAContent.hpp" #include "RBAContentState.hpp" @@ -44,7 +44,7 @@ RBAIsVisible::getModelElementType() const bool RBAIsVisible::executeCore(RBAConstraintInfo* info, - RBAArbitrator* arb) const + RBAArbitratorImpl* arb) const { bool isPassed {false}; // Add itself to the constraint hierarchy for coverage. diff --git a/src/view/RBAIsVisible.hpp b/src/view/RBAIsVisible.hpp index a919519..8faee67 100644 --- a/src/view/RBAIsVisible.hpp +++ b/src/view/RBAIsVisible.hpp @@ -39,7 +39,7 @@ public: public: void accept(RBAExpressionVisitor& visitor) override; RBAModelElementType getModelElementType() const override; - bool executeCore(RBAConstraintInfo* info, RBAArbitrator * arb) const override; + bool executeCore(RBAConstraintInfo* info, RBAArbitratorImpl * arb) const override; // Log #ifdef RBA_USE_LOG |