[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 9cbda7d 2/4: Simplify
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 9cbda7d 2/4: Simplify |
Date: |
Fri, 5 Oct 2018 08:58:03 -0400 (EDT) |
branch: master
commit 9cbda7d244a0e920f5cac401b06bfd8ce33d9928
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Simplify
See the immediately preceding commit.
---
ledger_evaluator.cpp | 9 +++------
ledger_evaluator.hpp | 4 +---
ledger_pdf_generator_wx.cpp | 2 +-
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ledger_evaluator.cpp b/ledger_evaluator.cpp
index 78b5cd8..f2598d0 100644
--- a/ledger_evaluator.cpp
+++ b/ledger_evaluator.cpp
@@ -1000,14 +1000,10 @@ std::string ledger_evaluator::operator()
void ledger_evaluator::write_tsv
(fs::path const& // pdf_out_file
- ,Ledger const& ledger
) const
{
- int const length = value_cast<int>(operator()("GreatestLapseDuration"));
- LMI_ASSERT(ledger.is_composite() == ("1" == operator()("Composite")));
- LMI_ASSERT(ledger.greatest_lapse_dur() == length);
if
- ( !ledger.is_composite()
+ ( !("1" == operator()("Composite"))
|| !contains(global_settings::instance().pyx(), "values_tsv")
)
{
@@ -1035,7 +1031,8 @@ void ledger_evaluator::write_tsv
}
ofs << '\n';
- for(int i = 0; i < ledger.greatest_lapse_dur(); ++i)
+ int const length = value_cast<int>(operator()("GreatestLapseDuration"));
+ for(int i = 0; i < length; ++i)
{
for(auto const& j : sorted_vectors)
{
diff --git a/ledger_evaluator.hpp b/ledger_evaluator.hpp
index d4b6909..e7ef979 100644
--- a/ledger_evaluator.hpp
+++ b/ledger_evaluator.hpp
@@ -32,8 +32,6 @@
#include <unordered_map>
#include <vector>
-class Ledger;
-
/// Class allowing to retrieve the string representation of any scalar or
/// vector stored in a ledger.
@@ -49,7 +47,7 @@ class LMI_SO ledger_evaluator
std::string operator()(std::string const& scalar) const;
std::string operator()(std::string const& vector, int index) const;
- void write_tsv(fs::path const&, Ledger const&) const;
+ void write_tsv(fs::path const&) const;
private:
// Constructible only by friends: see Ledger::make_evaluator().
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 59570de..efa66a1 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -790,7 +790,7 @@ class pdf_illustration : protected html_interpolator,
protected pdf_writer_wx
// Render all pages to the specified PDF file.
void render_all()
{
- evaluator().write_tsv(pdf_out_file_, ledger_);
+ evaluator().write_tsv(pdf_out_file_);
// PDF !! Apparently this is some sort of quasi-global object?
html_cell_for_pdf_output::pdf_context_setter the_pdf_context