From 2bb5f3f4c3c347a2474392993c17cc62653dd133 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sun, 19 Oct 2014 05:24:21 -0400 Subject: stop switch to boost serialization for hypergraph IO --- decoder/forest_writer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'decoder/forest_writer.cc') diff --git a/decoder/forest_writer.cc b/decoder/forest_writer.cc index 6e4cccb3..c072e599 100644 --- a/decoder/forest_writer.cc +++ b/decoder/forest_writer.cc @@ -11,13 +11,13 @@ using namespace std; ForestWriter::ForestWriter(const std::string& path, int num) : - fname_(path + '/' + boost::lexical_cast(num) + ".json.gz"), used_(false) {} + fname_(path + '/' + boost::lexical_cast(num) + ".bin.gz"), used_(false) {} bool ForestWriter::Write(const Hypergraph& forest, bool minimal_rules) { assert(!used_); used_ = true; cerr << " Writing forest to " << fname_ << endl; WriteFile wf(fname_); - return HypergraphIO::WriteToJSON(forest, minimal_rules, wf.stream()); + return HypergraphIO::WriteToBinary(forest, wf.stream()); } -- cgit v1.2.3 From e02b6af6b7cd8b224b1082123df8969532f4ce07 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Sat, 25 Oct 2014 14:28:37 -0400 Subject: remove unused arg --- decoder/decoder.cc | 8 ++++---- decoder/forest_writer.cc | 2 +- decoder/forest_writer.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'decoder/forest_writer.cc') diff --git a/decoder/decoder.cc b/decoder/decoder.cc index f8214f5f..737201e7 100644 --- a/decoder/decoder.cc +++ b/decoder/decoder.cc @@ -934,10 +934,10 @@ bool DecoderImpl::Decode(const string& input, DecoderObserver* o) { if (!succeeded) abort(); } HG::Union(forest, &new_hg); - bool succeeded = writer.Write(new_hg, false); + bool succeeded = writer.Write(new_hg); if (!succeeded) abort(); } else { - bool succeeded = writer.Write(forest, false); + bool succeeded = writer.Write(forest); if (!succeeded) abort(); } } @@ -1027,10 +1027,10 @@ bool DecoderImpl::Decode(const string& input, DecoderObserver* o) { if (!succeeded) abort(); } HG::Union(forest, &new_hg); - bool succeeded = writer.Write(new_hg, false); + bool succeeded = writer.Write(new_hg); if (!succeeded) abort(); } else { - bool succeeded = writer.Write(forest, false); + bool succeeded = writer.Write(forest); if (!succeeded) abort(); } } diff --git a/decoder/forest_writer.cc b/decoder/forest_writer.cc index c072e599..cc9094d7 100644 --- a/decoder/forest_writer.cc +++ b/decoder/forest_writer.cc @@ -13,7 +13,7 @@ using namespace std; ForestWriter::ForestWriter(const std::string& path, int num) : fname_(path + '/' + boost::lexical_cast(num) + ".bin.gz"), used_(false) {} -bool ForestWriter::Write(const Hypergraph& forest, bool minimal_rules) { +bool ForestWriter::Write(const Hypergraph& forest) { assert(!used_); used_ = true; cerr << " Writing forest to " << fname_ << endl; diff --git a/decoder/forest_writer.h b/decoder/forest_writer.h index 4d28de77..54e83470 100644 --- a/decoder/forest_writer.h +++ b/decoder/forest_writer.h @@ -7,7 +7,7 @@ class Hypergraph; struct ForestWriter { ForestWriter(const std::string& path, int num); - bool Write(const Hypergraph& forest, bool minimal_rules); + bool Write(const Hypergraph& forest); const std::string fname_; bool used_; -- cgit v1.2.3