UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-27 01:29:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Build all apps

Browse Source
This commit is contained in:
Léa Saviot
2018-10-10 17:22:06 +02:00
committed by Émilie Feral
parent 8ec6673aee
commit 21b214e60f
10 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/regression/regression_context.cpp
View File

@@ -23,9 +23,9 @@ const Expression RegressionContext::expressionForSymbol(const SymbolAbstract & s
assert(m_seriesPairIndex >= 0);
assert(m_seriesPairIndex < m_store->numberOfPairsOfSeries(series));
return Float<double>(m_store->get(series, storeI, m_seriesPairIndex));
} else {
return m_parentContext->expressionForSymbol(symbol);
}
} else {
return m_parentContext->expressionForSymbol(symbol);
}
}

2
apps/regression/regression_context.h
View File

@@ -9,7 +9,7 @@ namespace Regression {
class RegressionContext : public Shared::StoreContext {
public:
using Shared::StoreContext::StoreContext;
const Poincare::Expression expressionForSymbol(const Poincare::Symbol & symbol) override;
const Poincare::Expression expressionForSymbol(const Poincare::SymbolAbstract & symbol) override;
};
}

3
apps/sequence/cache_context.cpp
View File

@@ -21,7 +21,8 @@ const Expression CacheContext<T>::expressionForSymbol(const SymbolAbstract & sym
&& (symbol.name()[0] == SequenceStore::k_sequenceNames[0][0] || symbol.name()[0] == SequenceStore::k_sequenceNames[1][0])
&& (strcmp(symbol.name()+1, "(n)") == 0 || strcmp(symbol.name()+1, "(n+1)") == 0))
{
return Float<T>(m_values[nameIndexForSymbol(symbol)][rankIndexForSymbol(symbol)]);
Symbol s = const_cast<Symbol &>(static_cast<const Symbol &>(symbol));
return Float<T>(m_values[nameIndexForSymbol(s)][rankIndexForSymbol(s)]);
}
return VariableContext::expressionForSymbol(symbol);
}

2
apps/sequence/cache_context.h
View File

@@ -13,7 +13,7 @@ template<typename T>
class CacheContext : public Poincare::VariableContext {
public:
CacheContext(Poincare::Context * parentContext);
const Poincare::Expression expressionForSymbol(const Poincare::Symbol & symbol) override;
const Poincare::Expression expressionForSymbol(const Poincare::SymbolAbstract & symbol) override;
void setValueForSymbol(T value, const Poincare::Symbol & symbol);
private:
int nameIndexForSymbol(const Poincare::Symbol & symbol);

2
apps/sequence/list/list_controller.cpp
View File

@@ -174,7 +174,7 @@ int ListController::maxNumberOfRows() {
return k_maxNumberOfRows;
}
HighlightCell * ListController::titleCells(int index) {
FunctionTitleCell * ListController::titleCells(int index) {
assert(index >= 0 && index < k_maxNumberOfRows);
return &m_sequenceTitleCells[index];
}

2
apps/sequence/list/list_parameter_controller.cpp
View File

@@ -113,7 +113,7 @@ void ListParameterController::willDisplayCellForIndex(HighlightCell * cell, int
return;
}
char buffer[Sequence::k_initialRankNumberOfDigits+1];
Integer(m_sequence->initialRank()).serialize(buffer, Sequence::k_initialRankNumberOfDigits+1);
Poincare::Integer(m_sequence->initialRank()).serialize(buffer, Sequence::k_initialRankNumberOfDigits+1);
myCell->setAccessoryText(buffer);
}
}

4
apps/sequence/sequence_context.h
View File

@@ -45,10 +45,10 @@ public:
* context respective methods. Indeed, special chars like n, u(n), u(n+1),
* v(n), v(n+1) are taken into accound only when evaluating sequences which
* is done in another context. */
const Poincare::Expression expressionForSymbol(const Poincare::Symbol & symbol) override {
const Poincare::Expression expressionForSymbol(const Poincare::SymbolAbstract & symbol) override {
return m_parentContext->expressionForSymbol(symbol);
}
void setExpressionForSymbol(const Poincare::Expression & expression, const Poincare::Symbol & symbol, Poincare::Context & context) override {
void setExpressionForSymbol(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol, Poincare::Context & context) override {
m_parentContext->setExpressionForSymbol(expression, symbol, context);
}
template<typename T> T valueOfSequenceAtPreviousRank(int sequenceIndex, int rank) const {

4
apps/sequence/sequence_title_cell.h
View File

@@ -2,6 +2,7 @@
#define SEQUENCE_SEQUENCE_TITLE_CELL_H
#include "../shared/function_title_cell.h"
#include <poincare_layouts.h>
namespace Sequence {
@@ -12,6 +13,9 @@ public:
void setEven(bool even) override;
void setHighlighted(bool highlight) override;
void setColor(KDColor color) override;
KDText::FontSize fontSize() const override {
return Poincare::CharLayoutNode::k_defaultFontSize;
}
Poincare::Layout layout() const override {
return m_titleTextView.layout();
}

2
apps/statistics/statistics_context.h
View File

@@ -8,7 +8,7 @@ namespace Statistics {
class StatisticsContext : public Shared::StoreContext {
public:
using Shared::StoreContext::StoreContext;
const Poincare::Expression expressionForSymbol(const Poincare::Symbol & symbol) override;
const Poincare::Expression expressionForSymbol(const Poincare::SymbolAbstract & symbol) override;
};
}

3
poincare/include/poincare/char_layout.h
View File

@@ -9,7 +9,8 @@ namespace Poincare {
class CharLayoutNode final : public LayoutNode {
public:
CharLayoutNode(char c = Ion::Charset::Empty, const KDFont * font = KDFont::LargeFont) :
static constexpr KDFont * k_defaultFontSize = KDFont::LargeFont;
CharLayoutNode(char c = Ion::Charset::Empty, const KDFont * font = k_defaultFontSize) :
LayoutNode(),
m_char(c),
m_font(font)