github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Matt Cooley 2021-11-15 10:47:05 -08:00
commit 8cf3fcce36
8 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/CalcManager/CEngine/scicomm.cpp
View file

@ -18,7 +18,6 @@
#include <sstream> #include <sstream>
#include "Header Files/CalcEngine.h" #include "Header Files/CalcEngine.h"
#include "Header Files/CalcUtils.h" #include "Header Files/CalcUtils.h"
#include "NumberFormattingUtils.h"
using namespace std; using namespace std;
using namespace CalcEngine; using namespace CalcEngine;

2
src/CalcManager/NumberFormattingUtils.cpp
View file

@ -3,7 +3,7 @@
using namespace std; using namespace std;
namespace CalcManager::NumberFormattingUtils namespace UnitConversionManager::NumberFormattingUtils
{ {
/// <summary> /// <summary>
/// Trims out any trailing zeros or decimals in the given input string /// Trims out any trailing zeros or decimals in the given input string

2
src/CalcManager/NumberFormattingUtils.h
View file

@ -6,7 +6,7 @@
#include <string> #include <string>
#include "sal_cross_platform.h" #include "sal_cross_platform.h"
namespace CalcManager::NumberFormattingUtils namespace UnitConversionManager::NumberFormattingUtils
{ {
void TrimTrailingZeros(_Inout_ std::wstring& input); void TrimTrailingZeros(_Inout_ std::wstring& input);
unsigned int GetNumberDigits(std::wstring value); unsigned int GetNumberDigits(std::wstring value);

2
src/CalcManager/UnitConverter.cpp
View file

@ -11,7 +11,7 @@
using namespace std; using namespace std;
using namespace UnitConversionManager; using namespace UnitConversionManager;
using namespace CalcManager::NumberFormattingUtils; using namespace UnitConversionManager::NumberFormattingUtils;
static constexpr uint32_t EXPECTEDSERIALIZEDCATEGORYTOKENCOUNT = 3U; static constexpr uint32_t EXPECTEDSERIALIZEDCATEGORYTOKENCOUNT = 3U;
static constexpr uint32_t EXPECTEDSERIALIZEDUNITTOKENCOUNT = 6U; static constexpr uint32_t EXPECTEDSERIALIZEDUNITTOKENCOUNT = 6U;

1
src/CalcViewModel/Common/Utils.cpp
View file

@ -13,7 +13,6 @@
#include "Common/AppResourceProvider.h" #include "Common/AppResourceProvider.h"
#include "Common/ExpressionCommandSerializer.h" #include "Common/ExpressionCommandSerializer.h"
#include "Common/ExpressionCommandDeserializer.h" #include "Common/ExpressionCommandDeserializer.h"
#include "CalcManager/NumberFormattingUtils.h"
using namespace CalculatorApp; using namespace CalculatorApp;
using namespace CalculatorApp::ViewModel::Common; using namespace CalculatorApp::ViewModel::Common;

8
src/CalcViewModel/GraphingCalculator/GraphingSettingsViewModel.h
View file

@ -53,7 +53,7 @@ namespace CalculatorApp::ViewModel
{ {
std::wistringstream input(value->Data()); std::wistringstream input(value->Data());
double number; double number;
if (input >> number) if (input >> number && input.eof())
{ {
m_Graph->XAxisMin = m_XMinValue = number; m_Graph->XAxisMin = m_XMinValue = number;
XMinError = false; XMinError = false;
@ -87,7 +87,7 @@ namespace CalculatorApp::ViewModel
{ {
std::wistringstream input(value->Data()); std::wistringstream input(value->Data());
double number; double number;
if (input >> number) if (input >> number && input.eof())
{ {
m_Graph->XAxisMax = m_XMaxValue = number; m_Graph->XAxisMax = m_XMaxValue = number;
XMaxError = false; XMaxError = false;
@ -121,7 +121,7 @@ namespace CalculatorApp::ViewModel
{ {
std::wistringstream input(value->Data()); std::wistringstream input(value->Data());
double number; double number;
if (input >> number) if (input >> number && input.eof())
{ {
m_Graph->YAxisMin = m_YMinValue = number; m_Graph->YAxisMin = m_YMinValue = number;
YMinError = false; YMinError = false;
@ -155,7 +155,7 @@ namespace CalculatorApp::ViewModel
{ {
std::wistringstream input(value->Data()); std::wistringstream input(value->Data());
double number; double number;
if (input >> number) if (input >> number && input.eof())
{ {
m_Graph->YAxisMax = m_YMaxValue = number; m_Graph->YAxisMax = m_YMaxValue = number;
YMaxError = false; YMaxError = false;

2
src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml.cs
View file

@ -12,9 +12,7 @@ using CalculatorApp.ViewModel.Common.Automation;
using CalculatorApp.Controls; using CalculatorApp.Controls;
using CalculatorApp.Utils; using CalculatorApp.Utils;
using CalculatorApp.ViewModel; using CalculatorApp.ViewModel;
//using CalcManager.NumberFormattingUtils;
using GraphControl; using GraphControl;
//using Utils;
using Windows.ApplicationModel.DataTransfer; using Windows.ApplicationModel.DataTransfer;
using Windows.ApplicationModel.Resources; using Windows.ApplicationModel.Resources;
using Windows.Foundation; using Windows.Foundation;

22
src/CalculatorUnitTests/CalculatorManagerTest.cpp
View file

@ -12,7 +12,7 @@
using namespace CalculatorApp; using namespace CalculatorApp;
using namespace CalculatorApp::ViewModel::Common; using namespace CalculatorApp::ViewModel::Common;
using namespace CalculationManager; using namespace CalculationManager;
using namespace CalcManager::NumberFormattingUtils; using namespace UnitConversionManager::NumberFormattingUtils;
using namespace Platform; using namespace Platform;
using namespace std; using namespace std;
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
@ -191,11 +191,11 @@ namespace CalculatorManagerTest
TEST_METHOD(CalculatorManagerTestMaxDigitsReached_LeadingDecimal); TEST_METHOD(CalculatorManagerTestMaxDigitsReached_LeadingDecimal);
TEST_METHOD(CalculatorManagerTestMaxDigitsReached_TrailingDecimal); TEST_METHOD(CalculatorManagerTestMaxDigitsReached_TrailingDecimal);
TEST_METHOD(CalculatorManagerNumberFormattingUtils_TrimTrailingZeros); TEST_METHOD(UnitConversionManagerNumberFormattingUtils_TrimTrailingZeros);
TEST_METHOD(CalculatorManagerNumberFormattingUtils_GetNumberDigits); TEST_METHOD(UnitConversionManagerNumberFormattingUtils_GetNumberDigits);
TEST_METHOD(CalculatorManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart); TEST_METHOD(UnitConversionManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart);
TEST_METHOD(CalculatorManagerNumberFormattingUtils_RoundSignificantDigits); TEST_METHOD(UnitConversionManagerNumberFormattingUtils_RoundSignificantDigits);
TEST_METHOD(CalculatorManagerNumberFormattingUtils_ToScientificNumber); TEST_METHOD(UnitConversionManagerNumberFormattingUtils_ToScientificNumber);
TEST_METHOD(CalculatorManagerTestBinaryOperatorReceived); TEST_METHOD(CalculatorManagerTestBinaryOperatorReceived);
TEST_METHOD(CalculatorManagerTestBinaryOperatorReceived_Multiple); TEST_METHOD(CalculatorManagerTestBinaryOperatorReceived_Multiple);
@ -917,7 +917,7 @@ namespace CalculatorManagerTest
TestMaxDigitsReachedScenario(L"123,456,789,101,112.13"); TestMaxDigitsReachedScenario(L"123,456,789,101,112.13");
} }
void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_TrimTrailingZeros() void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_TrimTrailingZeros()
{ {
wstring number = L"2.1032100000000"; wstring number = L"2.1032100000000";
TrimTrailingZeros(number); TrimTrailingZeros(number);
@ -942,7 +942,7 @@ namespace CalculatorManagerTest
VERIFY_ARE_EQUAL(number, L"322423"); VERIFY_ARE_EQUAL(number, L"322423");
} }
void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_GetNumberDigits() void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_GetNumberDigits()
{ {
wstring number = L"2.10321"; wstring number = L"2.10321";
unsigned int digitsCount = GetNumberDigits(number); unsigned int digitsCount = GetNumberDigits(number);
@ -961,7 +961,7 @@ namespace CalculatorManagerTest
VERIFY_ARE_EQUAL(digitsCount, 8); VERIFY_ARE_EQUAL(digitsCount, 8);
} }
void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart() void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_GetNumberDigitsWholeNumberPart()
{ {
unsigned int digitsCount = GetNumberDigitsWholeNumberPart(2.10321); unsigned int digitsCount = GetNumberDigitsWholeNumberPart(2.10321);
VERIFY_ARE_EQUAL(digitsCount, 1); VERIFY_ARE_EQUAL(digitsCount, 1);
@ -981,7 +981,7 @@ namespace CalculatorManagerTest
VERIFY_ARE_EQUAL(digitsCount, 1); VERIFY_ARE_EQUAL(digitsCount, 1);
} }
void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_RoundSignificantDigits() void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_RoundSignificantDigits()
{ {
wstring result = RoundSignificantDigits(12.342343242, 3); wstring result = RoundSignificantDigits(12.342343242, 3);
VERIFY_ARE_EQUAL(result, L"12.342"); VERIFY_ARE_EQUAL(result, L"12.342");
@ -997,7 +997,7 @@ namespace CalculatorManagerTest
VERIFY_ARE_EQUAL(result, L"0.3423000"); VERIFY_ARE_EQUAL(result, L"0.3423000");
} }
void CalculatorManagerTest::CalculatorManagerNumberFormattingUtils_ToScientificNumber() void CalculatorManagerTest::UnitConversionManagerNumberFormattingUtils_ToScientificNumber()
{ {
wstring result = ToScientificNumber(3423); wstring result = ToScientificNumber(3423);
VERIFY_ARE_EQUAL(result, L"3.423000e+03"); VERIFY_ARE_EQUAL(result, L"3.423000e+03");