diff --git a/apps/probability/Makefile b/apps/probability/Makefile index 059a36387..c66d45e14 100644 --- a/apps/probability/Makefile +++ b/apps/probability/Makefile @@ -14,7 +14,6 @@ app_objs += $(addprefix apps/probability/,\ law/uniform_law.o\ law_controller.o\ law_curve_view.o\ - local_context.o\ parameters_controller.o\ ) diff --git a/apps/probability/app.h b/apps/probability/app.h index 0da8214a4..f31113f50 100644 --- a/apps/probability/app.h +++ b/apps/probability/app.h @@ -4,7 +4,6 @@ #include #include #include "law_controller.h" -#include "local_context.h" #include "../expression_text_field_delegate.h" namespace Probability { diff --git a/apps/probability/local_context.cpp b/apps/probability/local_context.cpp deleted file mode 100644 index daa573ce8..000000000 --- a/apps/probability/local_context.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "local_context.h" -#include - -namespace Probability { - -LocalContext::LocalContext(::Context * parentContext) : - m_tValue(Float(0.0f)), - m_aValue(Float(0.0f)), - m_bValue(Float(0.0f)), - m_parentContext(parentContext) -{ -} - - -void LocalContext::setExpressionForSymbolName(Expression * expression, const Symbol * symbol) { - // TODO: Add syntax error if expression is a matrix? - if (symbol->name() == 't') { - m_tValue = Float(expression->approximate(*m_parentContext)); - return; - } - if (symbol->name() == 'a') { - m_aValue = Float(expression->approximate(*m_parentContext)); - return; - } - if (symbol->name() == 'b') { - m_bValue = Float(expression->approximate(*m_parentContext)); - return; - } - m_parentContext->setExpressionForSymbolName(expression, symbol); -} - -const Expression * LocalContext::expressionForSymbol(const Symbol * symbol) { - if (symbol->name() == 't') { - return &m_tValue; - } - if (symbol->name() == 'a') { - return &m_aValue; - } - if (symbol->name() == 'b') { - return &m_bValue; - } - return m_parentContext->expressionForSymbol(symbol); -} - -} diff --git a/apps/probability/local_context.h b/apps/probability/local_context.h deleted file mode 100644 index 7cfbef1c1..000000000 --- a/apps/probability/local_context.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef PROBABILITY_LOCAL_CONTEXT_H -#define PROBABILITY_LOCAL_CONTEXT_H - -#include - -namespace Probability { - -class LocalContext : public Context { -public: - LocalContext(Context * parentContext); - void setExpressionForSymbolName(Expression * expression, const Symbol * symbol) override; - const Expression * expressionForSymbol(const Symbol * symbol) override; -private: - Float m_tValue; - Float m_aValue; - Float m_bValue; - Context * m_parentContext; -}; - -} - -#endif \ No newline at end of file