[mathicgb] 151/393: Same thing as last commit, now with ColumnPrinter::percent.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Fri Apr 3 15:58:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.
commit 6336cbff47b71922c8093927837f73da95a0dbb7
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date: Tue Feb 5 13:32:50 2013 +0100
Same thing as last commit, now with ColumnPrinter::percent.
---
src/mathicgb/BuchbergerAlg.cpp | 34 ++++++++++++++++----------------
src/mathicgb/LogDomainSet.cpp | 4 ++--
src/mathicgb/PolyHashTable.cpp | 3 ++-
src/mathicgb/QuadMatrix.cpp | 9 +++++----
src/mathicgb/SignatureGB.cpp | 44 +++++++++++++++++++++---------------------
src/mathicgb/SparseMatrix.cpp | 4 ++--
6 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/src/mathicgb/BuchbergerAlg.cpp b/src/mathicgb/BuchbergerAlg.cpp
index 072be89..6196fa9 100755
--- a/src/mathicgb/BuchbergerAlg.cpp
+++ b/src/mathicgb/BuchbergerAlg.cpp
@@ -350,14 +350,14 @@ void BuchbergerAlg::printStats(std::ostream& out) const {
const size_t minLeadCount = mBasis.minimalLeadCount();
name << "Minimum lead terms:\n";
value << mic::ColumnPrinter::commafy(minLeadCount) << '\n';
- extra << mic::ColumnPrinter::percent(minLeadCount, basisSize)
+ extra << mic::ColumnPrinter::percentInteger(minLeadCount, basisSize)
<< " basis ele have min lead\n";
const size_t lastMinLead = mBasis.maxIndexMinimalLead() + 1;
const size_t timeSinceLastMinLead = basisSize - lastMinLead;
name << "Index of last min lead:\n";
value << mic::ColumnPrinter::commafy(lastMinLead) << '\n';
- extra << mic::ColumnPrinter::percent(timeSinceLastMinLead, basisSize)
+ extra << mic::ColumnPrinter::percentInteger(timeSinceLastMinLead, basisSize)
<< " of basis added since then\n";
const unsigned long long considered =
@@ -368,7 +368,7 @@ void BuchbergerAlg::printStats(std::ostream& out) const {
name << "S-pairs pending:\n";
value << mic::ColumnPrinter::commafy(pending) << '\n';
- extra << mic::ColumnPrinter::percent(pending, considered)
+ extra << mic::ColumnPrinter::percentInteger(pending, considered)
<< " of considered\n";
unsigned long long const reductions = sPolyReductionCount();
@@ -382,27 +382,27 @@ void BuchbergerAlg::printStats(std::ostream& out) const {
unsigned long long const primeElim = sPairStats.relativelyPrimeHits;
name << "Rel.prime sp eliminated:\n";
value << mic::ColumnPrinter::commafy(primeElim) << '\n';
- extra << mic::ColumnPrinter::percent(primeElim, reductions)
+ extra << mic::ColumnPrinter::percentInteger(primeElim, reductions)
<< " of late eliminations\n";
const unsigned long long singularReductions =
reducerStats.singularReductions;
name << "Singular reductions:\n";
value << mic::ColumnPrinter::commafy(singularReductions) << '\n';
- extra << mic::ColumnPrinter::percent(singularReductions, reductions)
+ extra << mic::ColumnPrinter::percentInteger(singularReductions, reductions)
<< " of reductions\n";
const unsigned long long zeroReductions = reducerStats.zeroReductions;
name << "Reductions to zero:\n";
value << mic::ColumnPrinter::commafy(zeroReductions) << '\n';
- extra << mic::ColumnPrinter::percent(zeroReductions, reductions)
+ extra << mic::ColumnPrinter::percentInteger(zeroReductions, reductions)
<< " of reductions\n";
const unsigned long long newReductions =
reductions - singularReductions - zeroReductions;
name << "Reductions to new ele:\n";
value << mic::ColumnPrinter::commafy(newReductions) << '\n';
- extra << mic::ColumnPrinter::percent(newReductions, reductions)
+ extra << mic::ColumnPrinter::percentInteger(newReductions, reductions)
<< " of reductions\n";
const unsigned long long redSteps = reducerStats.steps;
@@ -441,21 +441,21 @@ void BuchbergerAlg::printStats(std::ostream& out) const {
unsigned long long const primeHits = sPairStats.relativelyPrimeHits;
name << "Buchb relatively prime:\n";
value << mic::ColumnPrinter::commafy(primeHits) << '\n';
- extra << mic::ColumnPrinter::percent(primeHits, marginal) <<
+ extra << mic::ColumnPrinter::percentInteger(primeHits, marginal) <<
" of S-pairs\n";
marginal -= primeHits;
unsigned long long const simpleHits = sPairStats.buchbergerLcmSimpleHits;
name << "Buchb lcm simple hits:\n";
value << mic::ColumnPrinter::commafy(simpleHits) << '\n';
- extra << mic::ColumnPrinter::percent(simpleHits, marginal) <<
+ extra << mic::ColumnPrinter::percentInteger(simpleHits, marginal) <<
" of remaining S-pairs\n";
marginal -= simpleHits;
unsigned long long const simpleHitsLate = sPairStats.buchbergerLcmSimpleHitsLate;
name << "Buchb late lcm simple hits:\n";
value << mic::ColumnPrinter::commafy(simpleHitsLate) << '\n';
- extra << mic::ColumnPrinter::percent(simpleHitsLate, marginal) <<
+ extra << mic::ColumnPrinter::percentInteger(simpleHitsLate, marginal) <<
" of remaining S-pairs\n";
marginal -= simpleHitsLate;
@@ -463,19 +463,19 @@ void BuchbergerAlg::printStats(std::ostream& out) const {
sPairStats.buchbergerLcmAdvancedHits;
name << "Buchb lcm adv hits:\n";
value << mic::ColumnPrinter::commafy(buchAdvHits) << '\n';
- extra << mic::ColumnPrinter::percent(buchAdvHits, marginal) <<
+ extra << mic::ColumnPrinter::percentInteger(buchAdvHits, marginal) <<
" of remaining S-pairs\n";
const unsigned long long buchCache = sPairStats.buchbergerLcmCacheHits;
name << "Buchb lcm cache hits:\n";
value << mic::ColumnPrinter::commafy(buchCache) << '\n';
- extra << mic::ColumnPrinter::percent(buchCache, simpleHits) <<
+ extra << mic::ColumnPrinter::percentInteger(buchCache, simpleHits) <<
" of simple hits\n";
const unsigned long long buchCacheLate = sPairStats.buchbergerLcmCacheHitsLate;
name << "Buchb late lcm cache hits:\n";
value << mic::ColumnPrinter::commafy(buchCacheLate) << '\n';
- extra << mic::ColumnPrinter::percent(buchCacheLate, simpleHits) <<
+ extra << mic::ColumnPrinter::percentInteger(buchCacheLate, simpleHits) <<
" of simple hits\n";
out << "***** Classic Buchberger algorithm statistics *****\n"
@@ -499,25 +499,25 @@ void BuchbergerAlg::printMemoryUse(std::ostream& out) const
const size_t basisMem = mBasis.getMemoryUse();
name << "Grobner basis:\n";
value << mic::ColumnPrinter::bytesInUnit(basisMem) << '\n';
- extra << mic::ColumnPrinter::percent(basisMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(basisMem, total) << '\n';
}
{ // Spairs
const size_t sPairMem = mSPairs.getMemoryUse();
name << "S-pairs:\n";
value << mic::ColumnPrinter::bytesInUnit(sPairMem) << '\n';
- extra << mic::ColumnPrinter::percent(sPairMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(sPairMem, total) << '\n';
}
{ // Reducer
const size_t reducerMem = mReducer.getMemoryUse();
name << "Reducer:\n";
value << mic::ColumnPrinter::bytesInUnit(reducerMem) << '\n';
- extra << mic::ColumnPrinter::percent(reducerMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(reducerMem, total) << '\n';
}
{ // Signatures
const size_t sigMem = mRing.getMonomialPool().getMemoryUse();
name << "Monomials:\n";
value << mic::ColumnPrinter::bytesInUnit(sigMem) << '\n';
- extra << mic::ColumnPrinter::percent(sigMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(sigMem, total) << '\n';
}
// total
name << "-------------\n";
diff --git a/src/mathicgb/LogDomainSet.cpp b/src/mathicgb/LogDomainSet.cpp
index f7ef8dd..01712c1 100644
--- a/src/mathicgb/LogDomainSet.cpp
+++ b/src/mathicgb/LogDomainSet.cpp
@@ -49,14 +49,14 @@ void LogDomainSet::printReport(std::ostream& out) const {
timeSum += logTime;
names << log.name() << '\n';
times << logTime << '\n';
- ratios << mathic::ColumnPrinter::percent(logTime, allTime) << '\n';
+ ratios << mathic::ColumnPrinter::percentDouble(logTime, allTime) << '\n';
}
if (!somethingToReport)
return;
pr.repeatToEndOfLine('-');
names << "sum\n";
times << timeSum;
- ratios << mathic::ColumnPrinter::percent(timeSum, allTime) << '\n';
+ ratios << mathic::ColumnPrinter::percentDouble(timeSum, allTime) << '\n';
const auto oldFlags = out.flags();
const auto oldPrecision = out.precision();
diff --git a/src/mathicgb/PolyHashTable.cpp b/src/mathicgb/PolyHashTable.cpp
index 3222b78..2083995 100755
--- a/src/mathicgb/PolyHashTable.cpp
+++ b/src/mathicgb/PolyHashTable.cpp
@@ -416,7 +416,8 @@ void PolyHashTable::dump(int level) const
name << "max # nonempty bins:\n";
value << mic::ColumnPrinter::commafy(mStats.n_nonempty_bins) << '\n';
- extra << mic::ColumnPrinter::percent(mStats.n_nonempty_bins, mTableSize) << " used\n";
+ extra << mic::ColumnPrinter::
+ percentInteger(mStats.n_nonempty_bins, mTableSize) << " used\n";
name << "max chain length ever:\n";
value << mic::ColumnPrinter::commafy(mStats.max_chain_len_ever) << '\n';
diff --git a/src/mathicgb/QuadMatrix.cpp b/src/mathicgb/QuadMatrix.cpp
index a39395f..885c057 100755
--- a/src/mathicgb/QuadMatrix.cpp
+++ b/src/mathicgb/QuadMatrix.cpp
@@ -139,10 +139,11 @@ void QuadMatrix::printStatistics(std::ostream& out) const {
const auto memory = matrix.memoryUse();
out << ColPr::withSIPrefix(entryCount) << " -"
- << ColPr::percentFixed(entryCount, area) << " \n"
+ << ColPr::percentIntegerFixed(entryCount, area) << " \n"
<< ColPr::bytesInUnit(memory) << " -"
- << ColPr::percentFixed(matrix.memoryUseTrimmed(), memory) << " \n"
- << ColPr::percent(memory, totalMemory) << " \n";
+ << ColPr::percentIntegerFixed(matrix.memoryUseTrimmed(), memory)
+ << " \n"
+ << ColPr::percentInteger(memory, totalMemory) << " \n";
};
out << ColPr::commafy(colCount) << " \n";
@@ -168,7 +169,7 @@ void QuadMatrix::printStatistics(std::ostream& out) const {
out << '\n' << pr
<< " Total memory: " << ColPr::bytesInUnit(memoryUse()) << " ("
- << ColPr::percent(memoryUseTrimmed(), totalMemory)
+ << ColPr::percentInteger(memoryUseTrimmed(), totalMemory)
<< " used)\n\n";
}
diff --git a/src/mathicgb/SignatureGB.cpp b/src/mathicgb/SignatureGB.cpp
index bc16076..0106659 100755
--- a/src/mathicgb/SignatureGB.cpp
+++ b/src/mathicgb/SignatureGB.cpp
@@ -492,14 +492,14 @@ void SignatureGB::displaySomeStats(std::ostream& out) const {
const size_t minLeadCount = GB->basis().minimalLeadCount();
name << "Minimum lead terms:\n";
value << mic::ColumnPrinter::commafy(minLeadCount) << '\n';
- extra << mic::ColumnPrinter::percent(minLeadCount, basisSize)
+ extra << mic::ColumnPrinter::percentInteger(minLeadCount, basisSize)
<< " basis ele have min lead\n";
const size_t lastMinLead = GB->basis().maxIndexMinimalLead() + 1;
const size_t timeSinceLastMinLead = basisSize - lastMinLead;
name << "Index of last min lead:\n";
value << mic::ColumnPrinter::commafy(lastMinLead) << '\n';
- extra << mic::ColumnPrinter::percent(timeSinceLastMinLead, basisSize)
+ extra << mic::ColumnPrinter::percentInteger(timeSinceLastMinLead, basisSize)
<< " of basis added since then\n";
const size_t minSyz = Hsyz->n_elems();
@@ -531,45 +531,45 @@ void SignatureGB::displaySomeStats(std::ostream& out) const {
name << "S-pairs not early elim:\n";
value << mic::ColumnPrinter::commafy(earlyNonElim) << '\n';
- extra << mic::ColumnPrinter::percent(earlyNonElim, considered)
+ extra << mic::ColumnPrinter::percentInteger(earlyNonElim, considered)
<< " of considered\n";
name << "Syz module S-pair elim:\n";
value << mic::ColumnPrinter::commafy(syzElim) << '\n';
- extra << mic::ColumnPrinter::percent(syzElim, considered)
+ extra << mic::ColumnPrinter::percentInteger(syzElim, considered)
<< " of considered\n";
name << "Low bdiv S-pair elim:\n";
value << mic::ColumnPrinter::commafy(lowElim) << '\n';
- extra << mic::ColumnPrinter::percent(lowElim, considered)
+ extra << mic::ColumnPrinter::percentInteger(lowElim, considered)
<< " of considered\n";
name << "High bdiv S-pair elim:\n";
value << mic::ColumnPrinter::commafy(highElim) << '\n';
- extra << mic::ColumnPrinter::percent(highElim, considered)
+ extra << mic::ColumnPrinter::percentInteger(highElim, considered)
<< " of considered\n";
const unsigned long long hadLow = stats.hasLowBaseDivisor;
name << "Basis ele had low bdiv:\n";
value << mic::ColumnPrinter::commafy(hadLow) << '\n';
- extra << mic::ColumnPrinter::percent(hadLow, basisSize)
+ extra << mic::ColumnPrinter::percentInteger(hadLow, basisSize)
<< " of basis ele\n";
const unsigned long long hadHigh = stats.hasHighBaseDivisor;
name << "Basis ele had high bdiv:\n";
value << mic::ColumnPrinter::commafy(hadHigh) << '\n';
- extra << mic::ColumnPrinter::percent(hadHigh, basisSize)
+ extra << mic::ColumnPrinter::percentInteger(hadHigh, basisSize)
<< " of basis ele\n";
name << "S-pairs pending:\n";
value << mic::ColumnPrinter::commafy(pending) << '\n';
- extra << mic::ColumnPrinter::percent(pending, considered)
+ extra << mic::ColumnPrinter::percentInteger(pending, considered)
<< " of considered\n";
const size_t done = stats_sPairsDone;
name << "S pairs done:\n";
value << mic::ColumnPrinter::commafy(done) << '\n';
- extra << mic::ColumnPrinter::percent(done, earlyNonElim)
+ extra << mic::ColumnPrinter::percentInteger(done, earlyNonElim)
<< " of not early elim\n";
const size_t sigsDone = stats_sPairSignaturesDone;
@@ -585,38 +585,38 @@ void SignatureGB::displaySomeStats(std::ostream& out) const {
const size_t koszulElim = stats_koszulEliminated;
name << "Koszul sp eliminated:\n";
value << mic::ColumnPrinter::commafy(koszulElim) << '\n';
- extra << mic::ColumnPrinter::percent(koszulElim, sigsDone - reductions)
+ extra << mic::ColumnPrinter::percentInteger(koszulElim, sigsDone - reductions)
<< " of late eliminations\n";
const size_t primeElim = stats_relativelyPrimeEliminated;
name << "Rel.prime sp eliminated:\n";
value << mic::ColumnPrinter::commafy(primeElim) << '\n';
- extra << mic::ColumnPrinter::percent(primeElim, sigsDone - reductions)
+ extra << mic::ColumnPrinter::percentInteger(primeElim, sigsDone - reductions)
<< " of late eliminations\n";
name << "Signature reductions:\n";
value << mic::ColumnPrinter::commafy(reductions) << '\n';
- extra << mic::ColumnPrinter::percent(reductions, sigsDone)
+ extra << mic::ColumnPrinter::percentInteger(reductions, sigsDone)
<< " of S-pairs are reduced\n";
const unsigned long long singularReductions =
reducerStats.singularReductions;
name << "Singular reductions:\n";
value << mic::ColumnPrinter::commafy(singularReductions) << '\n';
- extra << mic::ColumnPrinter::percent(singularReductions, reductions)
+ extra << mic::ColumnPrinter::percentInteger(singularReductions, reductions)
<< " of reductions\n";
const unsigned long long zeroReductions = reducerStats.zeroReductions;
name << "Reductions to zero:\n";
value << mic::ColumnPrinter::commafy(zeroReductions) << '\n';
- extra << mic::ColumnPrinter::percent(zeroReductions, reductions)
+ extra << mic::ColumnPrinter::percentInteger(zeroReductions, reductions)
<< " of reductions\n";
const unsigned long long newReductions =
reductions - singularReductions - zeroReductions;
name << "Reductions to new ele:\n";
value << mic::ColumnPrinter::commafy(newReductions) << '\n';
- extra << mic::ColumnPrinter::percent(newReductions, reductions)
+ extra << mic::ColumnPrinter::percentInteger(newReductions, reductions)
<< " of reductions\n";
const unsigned long long redSteps = reducerStats.steps;
@@ -670,13 +670,13 @@ void SignatureGB::displayMemoryUse(std::ostream& out) const
const size_t basisMem = GB->getMemoryUse();
name << "Grobner basis:\n";
value << mic::ColumnPrinter::bytesInUnit(basisMem) << '\n';
- extra << mic::ColumnPrinter::percent(basisMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(basisMem, total) << '\n';
}
{ // Spairs
const size_t sPairMem = SP->getMemoryUse();
name << "S-pairs:\n";
value << mic::ColumnPrinter::bytesInUnit(sPairMem) << '\n';
- extra << mic::ColumnPrinter::percent(sPairMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(sPairMem, total) << '\n';
const size_t knownSyzygyMem = SP->getKnownSyzygyBitsMemoryUse();
name << " Known syzygy bits:\n";
@@ -687,25 +687,25 @@ void SignatureGB::displayMemoryUse(std::ostream& out) const
const size_t syzMem = Hsyz->getMemoryUse();
name << "Minimal syzygies:\n";
value << mic::ColumnPrinter::bytesInUnit(syzMem) << '\n';
- extra << mic::ColumnPrinter::percent(syzMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(syzMem, total) << '\n';
}
{ // Koszul queue
const size_t syzQueueMem = mKoszuls->getMemoryUse();
name << "Koszul queue:\n";
value << mic::ColumnPrinter::bytesInUnit(syzQueueMem) << '\n';
- extra << mic::ColumnPrinter::percent(syzQueueMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(syzQueueMem, total) << '\n';
}
{ // Reducer
const size_t reducerMem = reducer->getMemoryUse();
name << "Reducer:\n";
value << mic::ColumnPrinter::bytesInUnit(reducerMem) << '\n';
- extra << mic::ColumnPrinter::percent(reducerMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(reducerMem, total) << '\n';
}
{ // Signatures
const size_t sigMem = R->getMonomialPool().getMemoryUse();
name << "Signatures:\n";
value << mic::ColumnPrinter::bytesInUnit(sigMem) << '\n';
- extra << mic::ColumnPrinter::percent(sigMem, total) << '\n';
+ extra << mic::ColumnPrinter::percentInteger(sigMem, total) << '\n';
}
// total
name << "-------------\n";
diff --git a/src/mathicgb/SparseMatrix.cpp b/src/mathicgb/SparseMatrix.cpp
index 9957500..ca5d661 100755
--- a/src/mathicgb/SparseMatrix.cpp
+++ b/src/mathicgb/SparseMatrix.cpp
@@ -129,9 +129,9 @@ void SparseMatrix::printStatistics(std::ostream& out) const {
pr[1] << ColPr::commafy(colCount) << " \n"
<< line
<< ColPr::withSIPrefix(entryCount) << " -"
- << ColPr::percentFixed(entryCount, area) << " \n"
+ << ColPr::percentIntegerFixed(entryCount, area) << " \n"
<< ColPr::bytesInUnit(memory) << " -"
- << ColPr::percentFixed(memoryUseTrimmed(), memory) << " \n"
+ << ColPr::percentIntegerFixed(memoryUseTrimmed(), memory) << " \n"
<< line;
pr[2] << " columns\n\\\n| non-zero (density)\n| memory (used)\n/\n";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git
More information about the debian-science-commits
mailing list