diff options
| author | Arnur Nigmetov <nigmetov@tugraz.at> | 2020-02-19 17:42:41 +0100 |
|---|---|---|
| committer | Arnur Nigmetov <nigmetov@tugraz.at> | 2020-02-19 17:42:41 +0100 |
| commit | f62d98e76b9dff173f9144caddff1217d0bb81a9 (patch) | |
| tree | 4ea6a6d894114c0d98c91079edfcc59d0611eb14 /matching/include | |
| parent | be93a006a3f2c630abf9d0169a70e6292ac7504f (diff) | |
Require first file line specify the format.
1. Input format must be in the first line
of input file, as in RIVET.
2. Disable more unnecessary output.
3. Get rid of some warnings.
Diffstat (limited to 'matching/include')
| -rw-r--r-- | matching/include/bifiltration.h | 4 | ||||
| -rw-r--r-- | matching/include/common_defs.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/matching/include/bifiltration.h b/matching/include/bifiltration.h index bdb7a4e..f505ed9 100644 --- a/matching/include/bifiltration.h +++ b/matching/include/bifiltration.h @@ -27,9 +27,7 @@ namespace md { Bifiltration& operator=(Bifiltration&& other) = default; - Bifiltration(const std::string& fname, - BifiltrationFormat input_format = BifiltrationFormat::rivet); // read from file - + Bifiltration(const std::string& fname); // read from file template<class Iter> Bifiltration(Iter begin, Iter end) diff --git a/matching/include/common_defs.h b/matching/include/common_defs.h index 4a71615..3f3d937 100644 --- a/matching/include/common_defs.h +++ b/matching/include/common_defs.h @@ -7,5 +7,4 @@ //#define MD_DO_CHECKS //#define MD_DO_FULL_CHECK - #endif //MATCHING_DISTANCE_DEF_DEBUG_H |