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

Symbolic Calculation

Browse Source
This commit is contained in:
Quentin Guidée
2019-08-10 09:45:51 +02:00
parent c7566cadf9
commit fb4e174cd0
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -24,3 +24,7 @@ We welcome contributions. For smaller changes just open a pull request straight
## License ## License
NumWorks Epsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode). NumWorks is a registered trademark. NumWorks Epsilon is released under a [CC BY-NC-SA License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode). NumWorks is a registered trademark.
# Personal Changelog
- Revert: https://github.com/numworks/epsilon/commit/267d27f1145922b61b6171e14284534fa2256f0c

4
apps/calculation/calculation.cpp
View File

@@ -55,7 +55,7 @@ void Calculation::setContent(const char * c, Context * context, Expression ansEx
} }
Expression exactOutput; Expression exactOutput;
Expression approximateOutput; Expression approximateOutput;
PoincareHelpers::ParseAndSimplifyAndApproximate(m_inputText, &exactOutput, &approximateOutput, *context, false); PoincareHelpers::ParseAndSimplifyAndApproximate(m_inputText, &exactOutput, &approximateOutput, *context); /// FALSE TO DISABLE LITERAL CALCULATION
PoincareHelpers::Serialize(exactOutput, m_exactOutputText, sizeof(m_exactOutputText)); PoincareHelpers::Serialize(exactOutput, m_exactOutputText, sizeof(m_exactOutputText));
PoincareHelpers::Serialize(approximateOutput, m_approximateOutputText, sizeof(m_approximateOutputText)); PoincareHelpers::Serialize(approximateOutput, m_approximateOutputText, sizeof(m_approximateOutputText));
} }
@@ -214,7 +214,7 @@ Calculation::EqualSign Calculation::exactAndApproximateDisplayedOutputsAreEqual(
constexpr int bufferSize = Constant::MaxSerializedExpressionSize; constexpr int bufferSize = Constant::MaxSerializedExpressionSize;
char buffer[bufferSize]; char buffer[bufferSize];
Preferences * preferences = Preferences::sharedPreferences(); Preferences * preferences = Preferences::sharedPreferences();
Expression exactOutputExpression = PoincareHelpers::ParseAndSimplify(m_exactOutputText, *context, false); Expression exactOutputExpression = PoincareHelpers::ParseAndSimplify(m_exactOutputText, *context); /// FALSE TO DISABLE LITERAL CALCULATION
if (exactOutputExpression.isUninitialized()) { if (exactOutputExpression.isUninitialized()) {
exactOutputExpression = Undefined::Builder(); exactOutputExpression = Undefined::Builder();
} }

BIN
epsilon.elf Executable file
View File

Binary file not shown.

2
scripts/targets.device.mak
View File

@@ -34,7 +34,7 @@
@echo "===============================" @echo "==============================="
.PHONY: %_flash .PHONY: %_flash
%_flash: %.bin %_flash: ./build/device/%.bin
@echo "DFU $@" @echo "DFU $@"
@echo "INFO About to flash your device. Please plug your device to your computer" @echo "INFO About to flash your device. Please plug your device to your computer"
@echo " using an USB cable and press the RESET button the back of your device." @echo " using an USB cable and press the RESET button the back of your device."