github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-16 02:02:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pre-Unit conversion work refactor, replace category with categoryID (#1260)

Browse source 
Removed category as key in category to unit vector map and replaced with category id to reduce memory footprint.
This commit is contained in:
Quentin Al-Timimi 2020-06-04 10:51:06 -05:00 • committed by GitHub
parent c7b0baaeda
commit 54d81721cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 37 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
View file

@ -220,14 +220,14 @@ void CurrencyDataLoader::LoadData()
};
#pragma optimize("", on)
vector<UCM::Category> CurrencyDataLoader::LoadOrderedCategories()
vector<UCM::Category> CurrencyDataLoader::GetOrderedCategories()
{
// This function should not be called
// The model will use the categories from UnitConverterDataLoader
return vector<UCM::Category>();
}
vector<UCM::Unit> CurrencyDataLoader::LoadOrderedUnits(const UCM::Category& /*category*/)
vector<UCM::Unit> CurrencyDataLoader::GetOrderedUnits(const UCM::Category& /*category*/)
{
lock_guard<mutex> lock(m_currencyUnitsMutex);
return m_currencyUnits;

6
src/CalcViewModel/DataLoaders/CurrencyDataLoader.h
View file

@ -1,4 +1,4 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
#pragma once
@ -63,8 +63,8 @@ namespace CalculatorApp
// IConverterDataLoader
void LoadData() override;
std::vector<UCM::Category> LoadOrderedCategories() override;
std::vector<UCM::Unit> LoadOrderedUnits(const UCM::Category& category) override;
std::vector<UCM::Category> GetOrderedCategories() override;
std::vector<UCM::Unit> GetOrderedUnits(const UCM::Category& category) override;
std::unordered_map<UCM::Unit, UCM::ConversionData, UCM::UnitHash> LoadOrderedRatios(const UCM::Unit& unit) override;
bool SupportsCategory(const UnitConversionManager::Category& target) override;
// IConverterDataLoader

16
src/CalcViewModel/DataLoaders/UnitConverterDataLoader.cpp
View file

@ -22,18 +22,18 @@ UnitConverterDataLoader::UnitConverterDataLoader(GeographicRegion ^ region)
: m_currentRegionCode(region->CodeTwoLetter)
{
m_categoryList = make_shared<vector<UCM::Category>>();
m_categoryToUnits = make_shared<UCM::CategoryToUnitVectorMap>();
m_categoryIDToUnitsMap = make_shared<UCM::CategoryToUnitVectorMap>();
m_ratioMap = make_shared<UCM::UnitToUnitToConversionDataMap>();
}
vector<UCM::Category> UnitConverterDataLoader::LoadOrderedCategories()
vector<UCM::Category> UnitConverterDataLoader::GetOrderedCategories()
{
return *m_categoryList;
}
vector<UCM::Unit> UnitConverterDataLoader::LoadOrderedUnits(const UCM::Category& category)
vector<UCM::Unit> UnitConverterDataLoader::GetOrderedUnits(const UCM::Category& category)
{
return m_categoryToUnits->at(category);
return this->m_categoryIDToUnitsMap->at(category.id);
}
unordered_map<UCM::Unit, UCM::ConversionData, UCM::UnitHash> UnitConverterDataLoader::LoadOrderedRatios(const UCM::Unit& unit)
@ -75,8 +75,8 @@ void UnitConverterDataLoader::LoadData()
GetConversionData(categoryToUnitConversionDataMap);
GetExplicitConversionData(explicitConversionData); // This is needed for temperature conversions
m_categoryToUnits->clear();
m_ratioMap->clear();
this->m_categoryIDToUnitsMap->clear();
this->m_ratioMap->clear();
for (UCM::Category objectCategory : *m_categoryList)
{
ViewMode categoryViewMode = NavCategory::Deserialize(objectCategory.id);
@ -86,7 +86,7 @@ void UnitConverterDataLoader::LoadData()
// Currency is an ordered category but we do not want to process it here
// because this function is not thread-safe and currency data is asynchronously
// loaded.
m_categoryToUnits->insert(pair<UCM::Category, std::vector<UCM::Unit>>(objectCategory, {}));
this->m_categoryIDToUnitsMap->insert(pair<int, std::vector<UCM::Unit>>(objectCategory.id, {}));
continue;
}
@ -103,7 +103,7 @@ void UnitConverterDataLoader::LoadData()
}
// Save units per category
m_categoryToUnits->insert(pair<UCM::Category, std::vector<UCM::Unit>>(objectCategory, unitList));
this->m_categoryIDToUnitsMap->insert(pair<int, std::vector<UCM::Unit>>(objectCategory.id, unitList));
// For each unit, populate the conversion data
for (UCM::Unit unit : unitList)

6
src/CalcViewModel/DataLoaders/UnitConverterDataLoader.h
View file

@ -71,8 +71,8 @@ namespace CalculatorApp
private:
// IConverterDataLoader
void LoadData() override;
std::vector<UnitConversionManager::Category> LoadOrderedCategories() override;
std::vector<UnitConversionManager::Unit> LoadOrderedUnits(const UnitConversionManager::Category& c) override;
std::vector<UnitConversionManager::Category> GetOrderedCategories() override;
std::vector<UnitConversionManager::Unit> GetOrderedUnits(const UnitConversionManager::Category& c) override;
std::unordered_map<UnitConversionManager::Unit, UnitConversionManager::ConversionData, UnitConversionManager::UnitHash>
LoadOrderedRatios(const UnitConversionManager::Unit& unit) override;
bool SupportsCategory(const UnitConversionManager::Category& target) override;
@ -87,7 +87,7 @@ namespace CalculatorApp
std::wstring GetLocalizedStringName(_In_ Platform::String ^ stringId);
std::shared_ptr<std::vector<UnitConversionManager::Category>> m_categoryList;
std::shared_ptr<UnitConversionManager::CategoryToUnitVectorMap> m_categoryToUnits;
std::shared_ptr<UnitConversionManager::CategoryToUnitVectorMap> m_categoryIDToUnitsMap;
std::shared_ptr<UnitConversionManager::UnitToUnitToConversionDataMap> m_ratioMap;
Platform::String ^ m_currentRegionCode;
};