diff options
author | Patrick Simianer <p@simianer.de> | 2015-01-19 14:39:14 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2015-01-19 14:39:14 +0100 |
commit | 0673fb55c6af8bc94c9f3e577c514160faf736d3 (patch) | |
tree | ff4edd0e1e816f4d412601689ab510b2d0aaccf7 /training/dpmert/mr_dpmert_map.cc | |
parent | cb9fb7088dde35881516c088db402abe747d49fa (diff) | |
parent | 1bce604809399a0adc581fb0102bff11decf3436 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'training/dpmert/mr_dpmert_map.cc')
-rw-r--r-- | training/dpmert/mr_dpmert_map.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/training/dpmert/mr_dpmert_map.cc b/training/dpmert/mr_dpmert_map.cc index d1efcf96..2bf3f8fc 100644 --- a/training/dpmert/mr_dpmert_map.cc +++ b/training/dpmert/mr_dpmert_map.cc @@ -83,7 +83,7 @@ int main(int argc, char** argv) { istringstream is(line); int sent_id; string file, s_origin, s_direction; - // path-to-file (JSON) sent_ed starting-point search-direction + // path-to-file sent_ed starting-point search-direction is >> file >> sent_id >> s_origin >> s_direction; SparseVector<double> origin; ReadSparseVectorString(s_origin, &origin); @@ -93,7 +93,7 @@ int main(int argc, char** argv) { if (last_file != file) { last_file = file; ReadFile rf(file); - HypergraphIO::ReadFromJSON(rf.stream(), &hg); + HypergraphIO::ReadFromBinary(rf.stream(), &hg); } const ConvexHullWeightFunction wf(origin, direction); const ConvexHull hull = Inside<ConvexHull, ConvexHullWeightFunction>(hg, NULL, wf); |