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

[poincare] Improve logarithm layout

Browse Source 
Change-Id: I0bd84672b5e24389308e7d1fd8609056f25cf2d4
This commit is contained in:
Émilie Feral
2017-01-13 16:12:01 +01:00
parent 4007c6ef82
commit 8eed045315
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
poincare/include/poincare/function.h
View File

@@ -21,7 +21,6 @@ public:
protected:
Expression ** m_args;
int m_numberOfArguments;
private:
const char * m_name;
};

1
poincare/include/poincare/logarithm.h
View File

@@ -10,6 +10,7 @@ public:
Type type() const override;
Expression * cloneWithDifferentOperands(Expression ** newOperands,
int numberOfOperands, bool cloneOperands = true) const override;
ExpressionLayout * createLayout() const override;
};
#endif

15
poincare/src/logarithm.cpp
View File

@@ -2,7 +2,12 @@
extern "C" {
#include <assert.h>
#include <math.h>
#include <stdlib.h>
}
#include "layout/horizontal_layout.h"
#include "layout/parenthesis_layout.h"
#include "layout/string_layout.h"
#include "layout/subscript_layout.h"
Logarithm::Logarithm() :
Function("log")
@@ -28,3 +33,13 @@ float Logarithm::approximate(Context& context) const {
}
return log10f(m_args[1]->approximate(context))/log10f(m_args[0]->approximate(context));
}
ExpressionLayout * Logarithm::createLayout() const {
if (m_numberOfArguments == 1) {
return Function::createLayout();
}
ExpressionLayout ** childrenLayouts = (ExpressionLayout **)malloc(2*sizeof(ExpressionLayout *));
childrenLayouts[0] = new SubscriptLayout(new StringLayout(m_name, strlen(m_name)), m_args[0]->createLayout());
childrenLayouts[1] = new ParenthesisLayout(m_args[1]->createLayout());
return new HorizontalLayout(childrenLayouts, 2);
}