chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Calc: Minor tweaks

Browse Source
This commit is contained in:
Birunthan Mohanathas 2013-12-08 13:41:19 +02:00
parent 3383713853
commit 1eb46ae448
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/MeasureCalc.cpp
View File

@ -199,11 +199,9 @@ bool MeasureCalc::GetMeasureValue(const WCHAR* str, int len, double* value, void
int MeasureCalc::GetRandom() int MeasureCalc::GetRandom()
{ {
int value = 0; if (m_LowBound == m_HighBound)
if (m_LowBound == m_HighBound || m_LowBound > m_HighBound)
{ {
value = m_LowBound; return m_LowBound;
} }
else if (m_UniqueRandom) else if (m_UniqueRandom)
{ {
@ -212,27 +210,26 @@ int MeasureCalc::GetRandom()
UpdateUniqueNumberList(); UpdateUniqueNumberList();
} }
value = m_UniqueNumbers.back(); const int value = m_UniqueNumbers.back();
m_UniqueNumbers.pop_back(); m_UniqueNumbers.pop_back();
return value;
} }
else else
{ {
const std::uniform_int_distribution<int> distribution(m_LowBound, m_HighBound); const std::uniform_int_distribution<int> distribution(m_LowBound, m_HighBound);
return distribution(c_RandomEngine); return distribution(c_RandomEngine);
} }
return value;
} }
void MeasureCalc::UpdateUniqueNumberList() void MeasureCalc::UpdateUniqueNumberList()
{ {
m_UniqueNumbers.clear(); const size_t range = (m_HighBound - m_LowBound) + 1;
m_UniqueNumbers.resize(range);
for (int i = m_LowBound; i <= m_HighBound; ++i) for (size_t i = 0; i < range; ++i)
{ {
m_UniqueNumbers.push_back(i); m_UniqueNumbers[i] = m_LowBound + i;
} }
std::shuffle(m_UniqueNumbers.begin(), m_UniqueNumbers.end(), c_RandomEngine); std::shuffle(m_UniqueNumbers.begin(), m_UniqueNumbers.end(), c_RandomEngine);
m_UniqueNumbers.shrink_to_fit();
} }