From 29f4a70c60fc7fa00eff4d610bc9e9a53c9fed7a Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Mon, 15 Feb 2016 16:11:21 +0100
Subject: [PATCH] fix merge
---
aarbology2/src/aarbology.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/aarbology2/src/aarbology.cpp b/aarbology2/src/aarbology.cpp
index eadd53859d..1fd4a1323d 100644
--- a/aarbology2/src/aarbology.cpp
+++ b/aarbology2/src/aarbology.cpp
@@ -172,15 +172,15 @@ int main ( int argc, char * argv[] ) {
tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) );
tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) );
- std::chrono::measurements::end ( );
- std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN );
+ measurements::end ( );
+ measurements::start ( "Algorithm", measurements::Type::MAIN );
std::set < unsigned > res = arbology::exact::ReversedBoyerMooreHorspool::match ( subject, pattern );
if( ends.isSet ( ) )
res = arbology::transform::BeginToEndIndex::transform(subject, res);
- std::chrono::measurements::end ( );
- std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY );
+ measurements::end ( );
+ measurements::start ( "Output write", measurements::Type::AUXILIARY );
alib::XmlDataFactory::toStdout ( res );
} else if ( algorithm.getValue ( ) == "knuthMorrisPratt" ) {
@@ -202,15 +202,15 @@ int main ( int argc, char * argv[] ) {
tree::Tree subject = alib::XmlDataFactory::fromTokens < tree::Tree > ( subjectTokens.front ( ) );
tree::Tree pattern = alib::XmlDataFactory::fromTokens < tree::Tree > ( patternTokens.front ( ) );
- std::chrono::measurements::end ( );
- std::chrono::measurements::start ( "Algorithm", std::chrono::measurements::Type::MAIN );
+ measurements::end ( );
+ measurements::start ( "Algorithm", measurements::Type::MAIN );
std::set < unsigned > res = arbology::exact::DeadZoneUsingBadCharacterShiftAndBorderArray::match ( subject, pattern );
if( ends.isSet ( ) )
res = arbology::transform::BeginToEndIndex::transform(subject, res);
- std::chrono::measurements::end ( );
- std::chrono::measurements::start ( "Output write", std::chrono::measurements::Type::AUXILARY );
+ measurements::end ( );
+ measurements::start ( "Output write", measurements::Type::AUXILIARY );
alib::XmlDataFactory::toStdout ( res );
} else if ( algorithm.getValue ( ) == "exactSubtreeMatchingAutomaton" ) {
--
GitLab