From b6f9634e346e746517792367d8065d06d3900e82 Mon Sep 17 00:00:00 2001 From: Scott Freeman Date: Tue, 10 Dec 2019 17:32:00 -0500 Subject: [PATCH] Removing unused serialization code in CalculatorManager (#858) --- src/CalcManager/CalculatorManager.cpp | 92 --------------------------- src/CalcManager/CalculatorManager.h | 6 -- 2 files changed, 98 deletions(-) diff --git a/src/CalcManager/CalculatorManager.cpp b/src/CalcManager/CalculatorManager.cpp index e6d1f9b..8d6f1e5 100644 --- a/src/CalcManager/CalculatorManager.cpp +++ b/src/CalcManager/CalculatorManager.cpp @@ -681,96 +681,4 @@ namespace CalculationManager { m_inHistoryItemLoadMode = isHistoryItemLoadMode; } - - /// - /// Serialize Rational to vector of long - /// How Rational is serialized : - /// Serialized Rational.P(Number) + Serialized Rational.Q(Number) - /// How Number is saved : - /// [0] = Rational.P.Sign - /// [1] = Rational.P.Mantissa.size - /// [2] = Rational.P.Exp - /// [3] = Rational.P.Mantissa[0] - /// [4] = Rational.P.Mantissa[1] - /// ... - /// [2 + Rational.P.Mantissa.size] = Rational.P.Mantissa[size - 1] - /// - /// Rational number to be serialized - vector CalculatorManager::SerializeRational(Rational const& rat) - { - vector serializedRational{}; - - auto serialP = SerializeNumber(rat.P()); - serializedRational.insert(serializedRational.end(), serialP.begin(), serialP.end()); - - auto serialQ = SerializeNumber(rat.Q()); - serializedRational.insert(serializedRational.end(), serialQ.begin(), serialQ.end()); - - return serializedRational; - } - - /// - /// DeserializeRational vector and construct a Rational - /// How Rational is serialized : - /// Serialized Rational.P(Number) + Serialized Rational.Q(Number) - /// - Rational CalculatorManager::DeSerializeRational(vector::const_iterator itr) - { - auto p = DeSerializeNumber(itr); - auto q = DeSerializeNumber(itr + SERIALIZED_NUMBER_MINSIZE + p.Mantissa().size()); - - return Rational(p, q); - } - - /// - /// Serialize Number to vector of long - /// How Number is saved : - /// [0] = Number.Sign - /// [1] = Number.Mantissa.size - /// [2] = Number.Exp - /// [3] = Number.Mantissa[0] - /// [4] = Number.Mantissa[1] - /// ... - /// [2 + Number.Mantissa.size] = Number.Mantissa[size - 1] - /// - /// Number to be serialized - vector CalculatorManager::SerializeNumber(Number const& num) - { - vector serializedNumber{}; - - serializedNumber.push_back(num.Sign()); - serializedNumber.push_back(static_cast(num.Mantissa().size())); - serializedNumber.push_back(num.Exp()); - for (auto const& digit : num.Mantissa()) - { - serializedNumber.push_back(digit); - } - - return serializedNumber; - } - - /// - /// DeserializeNumber vector and construct a Number - /// How Number is saved : - /// [0] = Number.Sign - /// [1] = Number.Mantissa.size - /// [2] = Number.Exp - /// [3] = Number.Mantissa[0] - /// [4] = Number.Mantissa[1] - /// ... - /// [2 + Number.Mantissa.size] = Number.Mantissa[size - 1] - /// - Number CalculatorManager::DeSerializeNumber(vector::const_iterator itr) - { - int32_t sign = *itr; - uint32_t size = *(itr + 1); - int32_t exp = *(itr + 2); - vector mant{}; - for (size_t i = 0; i < size; ++i) - { - mant.emplace_back(*(itr + 3 + i)); - } - - return Number{ sign, exp, mant }; - } } diff --git a/src/CalcManager/CalculatorManager.h b/src/CalcManager/CalculatorManager.h index 9b38242..dd30c16 100644 --- a/src/CalcManager/CalculatorManager.h +++ b/src/CalcManager/CalculatorManager.h @@ -76,12 +76,6 @@ namespace CalculationManager void LoadPersistedPrimaryValue(); - static std::vector SerializeRational(CalcEngine::Rational const& rat); - static CalcEngine::Rational DeSerializeRational(std::vector::const_iterator itr); - - static std::vector SerializeNumber(CalcEngine::Number const& num); - static CalcEngine::Number DeSerializeNumber(std::vector::const_iterator itr); - std::shared_ptr m_pStdHistory; std::shared_ptr m_pSciHistory; CalculatorHistory* m_pHistory;