Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CalcEngine: Convert NumObj* functions to use Rationals and move under CalcEngine::RationalMath namespace #12

Merged
merged 9 commits into from
Feb 19, 2019
Merged

CalcEngine: Convert NumObj* functions to use Rationals and move under CalcEngine::RationalMath namespace #12

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
22257ab
Convert NumObj* functions to use Rationals and move under CalcEngine:…
joshkoon Jan 29, 2019
8706804
Move Operator functions from RationalMath namespace into member funct…
joshkoon Jan 31, 2019
bc544ab
Remove unnecessary 'using' statements.
joshkoon Jan 31, 2019
d041f38
Merge branch 'master' into rational-math
joshkoon Feb 7, 2019
874f15a
Merge branch 'master' into rational-math
joshkoon Feb 15, 2019
f63b694
Whitespace between functions. Remove unnecessary default init.
joshkoon Feb 18, 2019
b5e4248
Fix member function access on m_memoryValue.
joshkoon Feb 18, 2019
b1a2cc1
Use implicit conversion of 0 to Rational
joshkoon Feb 18, 2019
9f1db6d
Merge branch 'rational-math' of https://github.com/joshkoon/calculato…
joshkoon Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
405 changes: 405 additions & 0 deletions src/CalcManager/CEngine/Rational.cpp
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 6 additions & 40 deletions src/CalcManager/CEngine/calc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

/**************************************************************************\
*** SCICALC Scientific Calculator for Windows 3.00.12
*** (c)1989 Microsoft Corporation. All Rights Reserved.
***
*** scimain.c
***
*** Definitions of all globals, WinMain procedure
***
*** Last modification
*** Fri 22-Nov-1996
***
*** 22-Nov-1996
*** Converted Calc from floating point to infinite precision.
*** The new math engine is in ..\ratpak
***
***
*** 05-Jan-1990
*** Calc did not have a floating point exception signal handler. This
*** would cause CALC to be forced to exit on a FP exception as that's
*** the default.
*** The signal handler is defined in SCIFUNC.C, in WinMain we hook the
*** the signal.
\**************************************************************************/
#include "pch.h"
#include "Header Files/CalcEngine.h"

Expand All @@ -46,9 +23,7 @@ static constexpr wstring_view DEFAULT_GRP_STR = L"3;0";
static constexpr wstring_view DEFAULT_NUMBER_STR = L"0";

// Read strings for keys, errors, trig types, etc.
// These will be copied from the resources to local memory. A larger
// than needed block is allocated first and then reallocated once we
// know how much is actually used.
// These will be copied from the resources to local memory.

array<wstring, CSTRINGSENGMAX> CCalcEngine::s_engineStrings;

Expand Down Expand Up @@ -111,7 +86,7 @@ CCalcEngine::CCalcEngine(bool fPrecedence, bool fIntegerMode, CalculationManager
m_numberString(DEFAULT_NUMBER_STR),
m_nOp(),
m_nPrecOp(),
m_memoryValue{make_unique<Rational>()},
m_memoryValue{ make_unique<Rational>() },
m_holdVal{},
m_currentVal{},
m_lastVal{}
Expand All @@ -120,12 +95,7 @@ CCalcEngine::CCalcEngine(bool fPrecedence, bool fIntegerMode, CalculationManager

m_dwWordBitWidth = DwWordBitWidthFromeNumWidth(m_numwidth);

PRAT maxTrig = longtorat(10L);
PRAT hundred = longtorat(100L);
powrat(&maxTrig, hundred, m_radix, m_precision);
m_maxTrigonometricNum = Rational{ maxTrig };
destroyrat(maxTrig);
destroyrat(hundred);
m_maxTrigonometricNum = RationalMath::Pow(10, 100, m_radix, m_precision);

SetRadixTypeAndNumWidth(DEC_RADIX, m_numwidth);
SettingsChanged();
Expand All @@ -147,14 +117,10 @@ void CCalcEngine::InitChopNumbers()
assert(m_chopNumbers.size() == m_maxDecimalValueStrings.size());
for (size_t i = 0; i < m_chopNumbers.size(); i++)
{
PRAT hno = m_chopNumbers[i].ToPRAT();
auto maxVal = m_chopNumbers[i].Div(2, m_precision);
maxVal = RationalMath::Integer(maxVal, m_radix, m_precision);

divrat(&hno, rat_two, m_precision);
intrat(&hno, m_radix, m_precision);

m_maxDecimalValueStrings[i] = NumObjToString(hno, 10, FMT_FLOAT, m_precision);

NumObjDestroy(&hno);
m_maxDecimalValueStrings[i] = maxVal.ToString(10, FMT_FLOAT, m_precision);
}
}

Expand Down
Loading